diff options
| author | 2015-05-13 20:08:12 +0000 | |
|---|---|---|
| committer | 2015-05-13 20:08:13 +0000 | |
| commit | 2817f22d157fd02fe6df14b76b59bac1276b5b86 (patch) | |
| tree | 25ecad29e2c23b4963c34d6b26f4e2905935c304 | |
| parent | 80283cd747d247780a5336bad6b41811175fd282 (diff) | |
| parent | f85ac77f0c2b923ff8d93a731d2a0107c4c57744 (diff) | |
Merge "Hide API not ready for prime time." into mnc-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 64025d017c8e..b46d9a990917 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3572,7 +3572,6 @@ package android.app { method public int getMemoryClass(); method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo); method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo); - method public int getPackageImportance(java.lang.String); method public android.os.Debug.MemoryInfo[] getProcessMemoryInfo(int[]); method public java.util.List<android.app.ActivityManager.ProcessErrorStateInfo> getProcessesInErrorState(); method public deprecated java.util.List<android.app.ActivityManager.RecentTaskInfo> getRecentTasks(int, int) throws java.lang.SecurityException; diff --git a/api/system-current.txt b/api/system-current.txt index 075507b48bca..92316cd98a49 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3660,7 +3660,6 @@ package android.app { method public int getMemoryClass(); method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo); method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo); - method public int getPackageImportance(java.lang.String); method public android.os.Debug.MemoryInfo[] getProcessMemoryInfo(int[]); method public java.util.List<android.app.ActivityManager.ProcessErrorStateInfo> getProcessesInErrorState(); method public deprecated java.util.List<android.app.ActivityManager.RecentTaskInfo> getRecentTasks(int, int) throws java.lang.SecurityException; diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 9bbb4be01a11..9c9909959301 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -2320,6 +2320,8 @@ public class ActivityManager { * in {@link RunningAppProcessInfo}, giving you the highest importance of all the * processes that this package has code running inside of. If there are no processes * running its code, {@link RunningAppProcessInfo#IMPORTANCE_GONE} is returned. + * + * @hide */ public int getPackageImportance(String packageName) { try { |