commit e5dfa979cb3d94dad69e4245de37b7d5b95be184
author Jeff Schumacher <jeffschu@google.com> Wed Jan 11 22:34:27 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 11 22:34:31 2017 +0000
tree d88a5d085effdf42f059ea5bb0af9216ff9760e5
parent 63ba2d67fb5350a6d6a5745f9360bda46ecb7a35
parent b8cadef3b0b159cb4c84409fb9da8b485ec43bc8

Merge "Made ActivityManager.forceStopPackage a @SystemApi"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index c5e26b2..ba34b5ae 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -3860,6 +3860,7 @@
     method public boolean clearApplicationUserData();
     method public void clearWatchHeapLimit();
     method public void dumpPackageState(java.io.FileDescriptor, java.lang.String);
+    method public void forceStopPackage(java.lang.String);
     method public android.util.Size getAppTaskThumbnailSize();
     method public java.util.List<android.app.ActivityManager.AppTask> getAppTasks();
     method public static int getCurrentUser();

core/java/android/app/ActivityManager.java

diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 48aca8e..9037304 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -3382,6 +3382,8 @@
      * @see #forceStopPackageAsUser(String, int)
      * @hide
      */
+    @SystemApi
+    @RequiresPermission(Manifest.permission.FORCE_STOP_PACKAGES)
     public void forceStopPackage(String packageName) {
         forceStopPackageAsUser(packageName, UserHandle.myUserId());
     }