diff options
| author | 2019-07-16 09:57:25 -0700 | |
|---|---|---|
| committer | 2019-07-16 09:57:25 -0700 | |
| commit | e3edd21eec3a977002a66acfa7367dab694bb9c0 (patch) | |
| tree | a186eb21776ab5cd75389a6a76443b2e53ba2dfc | |
| parent | 248aac9f3b29895457bbff235e3bfbb5367fe4f4 (diff) | |
| parent | 04824c59f4f6f77ce1ad69d8c41e5f1d032a7129 (diff) | |
Merge "Merge "AM: make isHighEndGfx TestApi" into qt-dev am: 2ac934280c am: 1b027edda1" into qt-r1-dev-plus-aosp
am: 04824c59f4
Change-Id: I291f1704bbc760e786da6f90f9681d79a9cd7915
| -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 050ec520059c..fe4a5c0cc465 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 |