summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-03-28 14:58:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-28 14:58:10 +0000
commit744e6f1738336bed5ef1ff8cbd4139b4113b4c0f (patch)
tree5e8c1486b9a12d9d43d99ac20395f4686f4bfedb /core/java
parent95712fe0cb5c93240a9053ca0094f872054b7923 (diff)
parent5e11e5e6cc38242dbf6a6709b1cfc563d3c8dc31 (diff)
Merge "Also allow avoiding gfx acceleration at runtime" into pi-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/ActivityManager.java6
-rw-r--r--core/java/com/android/internal/os/RoSystemProperties.java2
2 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 3047cdb2c240..289a4dd77723 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -959,8 +959,10 @@ public class ActivityManager {
* @hide
*/
static public boolean isHighEndGfx() {
- return !isLowRamDeviceStatic() &&
- !Resources.getSystem().getBoolean(com.android.internal.R.bool.config_avoidGfxAccel);
+ return !isLowRamDeviceStatic()
+ && !RoSystemProperties.CONFIG_AVOID_GFX_ACCEL
+ && !Resources.getSystem()
+ .getBoolean(com.android.internal.R.bool.config_avoidGfxAccel);
}
/**
diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java
index 89a4e17aa976..dc660a452c3b 100644
--- a/core/java/com/android/internal/os/RoSystemProperties.java
+++ b/core/java/com/android/internal/os/RoSystemProperties.java
@@ -31,6 +31,8 @@ public class RoSystemProperties {
SystemProperties.get("ro.control_privapp_permissions");
// ------ ro.config.* -------- //
+ public static final boolean CONFIG_AVOID_GFX_ACCEL =
+ SystemProperties.getBoolean("ro.config.avoid_gfx_accel", false);
public static final boolean CONFIG_LOW_RAM =
SystemProperties.getBoolean("ro.config.low_ram", false);
public static final boolean CONFIG_SMALL_BATTERY =