diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-03-05 17:52:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-05 17:52:21 +0000 |
| commit | be331a3809b9cf921c6ad65e1d671b24e97dded9 (patch) | |
| tree | 0203406ea2aaec451e0775263139faf890e2e11a /api | |
| parent | d833ba8d4e6d93744b3cd06a87b57b0a17864501 (diff) | |
| parent | 1c3754a35c434e4102c7ac3dceb887fa137b153b (diff) | |
| download | frameworks_base-be331a3809b9cf921c6ad65e1d671b24e97dded9.zip frameworks_base-be331a3809b9cf921c6ad65e1d671b24e97dded9.tar.gz frameworks_base-be331a3809b9cf921c6ad65e1d671b24e97dded9.tar.bz2 | |
Merge "Add security check for clearDeviceInitializer in the service."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
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); |