diff options
| author | 2019-07-16 09:41:21 -0700 | |
|---|---|---|
| committer | 2019-07-16 09:41:21 -0700 | |
| commit | 56b89eff84eb0a68c186ea5a6b3b0b80c8079141 (patch) | |
| tree | a076c17c397e54d0b017e6e538c8f39c1a6cdf6c | |
| parent | bbb6d4d72b54e179e6bbd61c70a29c4b40116576 (diff) | |
| parent | 1b027edda124a35060952ca7026d0385f853d3a2 (diff) | |
Merge "AM: make isHighEndGfx TestApi" into qt-dev am: 2ac934280c
am: 1b027edda1
Change-Id: I2ac2395e2c2814285e940f937c80f641fac31e44
| -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 59bd80a190ee..361477484676 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 |