diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-05-05 15:34:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 15:34:10 +0000 |
| commit | 4a64b19f239b6bff82a032329ce5781681843044 (patch) | |
| tree | 48825ac2d4386ea450d3c6581b6979307268d5b7 /api | |
| parent | c64b3fab95cff6f33cba524f1b9c540cfb75c73b (diff) | |
| parent | 019d2304998f3ed77c0a608df6cf4bea1138f8dc (diff) | |
| download | frameworks_base-4a64b19f239b6bff82a032329ce5781681843044.zip frameworks_base-4a64b19f239b6bff82a032329ce5781681843044.tar.gz frameworks_base-4a64b19f239b6bff82a032329ce5781681843044.tar.bz2 | |
Merge "Permission UI - legacy apps support" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/system-current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 2880446..e068a40 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -110,6 +110,7 @@ package android { field public static final java.lang.String INTERNET = "android.permission.INTERNET"; field public static final java.lang.String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP"; field public static final java.lang.String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES"; + field public static final java.lang.String KILL_UID = "android.permission.KILL_UID"; field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE"; field public static final java.lang.String LOOP_RADIO = "android.permission.LOOP_RADIO"; field public static final java.lang.String MANAGE_ACCOUNTS = "android.permission.MANAGE_ACCOUNTS"; @@ -3670,6 +3671,7 @@ package android.app { method public static boolean isRunningInTestHarness(); method public static boolean isUserAMonkey(); method public void killBackgroundProcesses(java.lang.String); + method public void killUid(int, java.lang.String); method public void moveTaskToFront(int, int); method public void moveTaskToFront(int, int, android.os.Bundle); method public deprecated void restartPackage(java.lang.String); |