diff options
| author | 2019-09-12 23:30:52 +0000 | |
|---|---|---|
| committer | 2019-09-12 23:30:52 +0000 | |
| commit | a59e2cd3c49e407cda708d70d25e7cfeffbbf416 (patch) | |
| tree | fa92640ac9acc77e0def7be53508b9f90e47a005 | |
| parent | c0fbdf45d7c9826533186751a03c27e500cac78e (diff) | |
| parent | d9cdb0d92592321069a8701f067fc575e44a3cba (diff) | |
Merge "AM: make isHighEndGfx TestApi" into android10-tests-dev
| -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 6f0b6a809c9c..cb3674ba6706 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 |