summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-08-07 15:27:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-07 15:27:49 +0000
commit38d30dc547825bdde2756f588692063a28749e8d (patch)
treee726b4391558137e67920dac25e342bdccd3f0f8 /api
parent77566dd1e15353eb062503767c6e4a354303fd09 (diff)
parentaa41add33b8d7d318387cc74c34e3d347d245211 (diff)
downloadframeworks_base-38d30dc547825bdde2756f588692063a28749e8d.zip
frameworks_base-38d30dc547825bdde2756f588692063a28749e8d.tar.gz
frameworks_base-38d30dc547825bdde2756f588692063a28749e8d.tar.bz2
Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/system-current.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 7987803..001a242 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -115,7 +115,6 @@ 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 LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS";
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";
@@ -3654,7 +3653,6 @@ 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);