summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2015-03-05 10:06:41 -0500
committerJulia Reynolds <juliacr@google.com>2015-03-05 11:47:14 -0500
commit1c3754a35c434e4102c7ac3dceb887fa137b153b (patch)
treedd71ae5dbf0bd6181abb4ed6cf688be0a39b6b97 /api
parentaf3435481214b839fc462fcfe5e5ff378a31fb91 (diff)
downloadframeworks_base-1c3754a35c434e4102c7ac3dceb887fa137b153b.zip
frameworks_base-1c3754a35c434e4102c7ac3dceb887fa137b153b.tar.gz
frameworks_base-1c3754a35c434e4102c7ac3dceb887fa137b153b.tar.bz2
Add security check for clearDeviceInitializer in the service.
Bug: 19230954 Change-Id: I5c648492bef0d2b579b6f59b91afc890e3092d36
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index b96d241..7a348ea 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5458,7 +5458,7 @@ package android.app.admin {
method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName);
method public void addUserRestriction(android.content.ComponentName, java.lang.String);
method public void clearCrossProfileIntentFilters(android.content.ComponentName);
- method public void clearDeviceInitializerApp();
+ method public void clearDeviceInitializerApp(android.content.ComponentName);
method public void clearDeviceOwnerApp(java.lang.String);
method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);
method public void clearUserRestriction(android.content.ComponentName, java.lang.String);
diff --git a/api/system-current.txt b/api/system-current.txt
index 65df354..4755fe7 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5552,7 +5552,7 @@ package android.app.admin {
method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName);
method public void addUserRestriction(android.content.ComponentName, java.lang.String);
method public void clearCrossProfileIntentFilters(android.content.ComponentName);
- method public void clearDeviceInitializerApp();
+ method public void clearDeviceInitializerApp(android.content.ComponentName);
method public void clearDeviceOwnerApp(java.lang.String);
method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);
method public void clearProfileOwner(android.content.ComponentName);