diff options
| author | 2019-07-16 09:30:16 -0700 | |
|---|---|---|
| committer | 2019-07-16 09:30:16 -0700 | |
| commit | 60d8434884f7f1b7bd78a75f901b13e5bbc55f78 (patch) | |
| tree | cfab1eba5caf33b19c66e4208ec3351c09e6b239 | |
| parent | 972793ea2093a6e639a1b0b2d66b853f59393e9b (diff) | |
| parent | 2ac934280c5104d4395c1c34236fdf98d6e03837 (diff) | |
Merge "AM: make isHighEndGfx TestApi" into qt-dev
am: 2ac934280c
Change-Id: I6a9c2ce91b4971cab32cabdd5d25e9edc29e64b5
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index a3ef9c41d5d2..87295fa7caba 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -54,6 +54,7 @@ package android.app { method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getPackageImportance(String); method public long getTotalRam(); method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidImportance(int); + method public static boolean isHighEndGfx(); method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener); method public static void resumeAppSwitches() throws android.os.RemoteException; method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int); diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 17368b789645..91b98c71a613 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -925,7 +925,7 @@ public class ActivityManager { * (which tends to consume a lot more RAM). * @hide */ - @UnsupportedAppUsage + @TestApi static public boolean isHighEndGfx() { return !isLowRamDeviceStatic() && !RoSystemProperties.CONFIG_AVOID_GFX_ACCEL |