Merge "Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am: c99bcc69f7 am: f713a1960e"
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 8859831..4603eeb 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -30,6 +30,7 @@
import android.graphics.Matrix;
import android.graphics.Point;
import android.os.BatteryStats;
+import android.os.Build;
import android.os.IBinder;
import android.os.ParcelFileDescriptor;
@@ -600,6 +601,9 @@
*/
public static final int COMPAT_MODE_TOGGLE = 2;
+ private static final boolean DEVELOPMENT_FORCE_LOW_RAM =
+ SystemProperties.getBoolean("debug.force_low_ram", false);
+
/** @hide */
public static class StackId {
/** Invalid stack ID. */
@@ -1055,7 +1059,8 @@
/** @hide */
public static boolean isLowRamDeviceStatic() {
- return RoSystemProperties.CONFIG_LOW_RAM;
+ return RoSystemProperties.CONFIG_LOW_RAM ||
+ (Build.IS_DEBUGGABLE && DEVELOPMENT_FORCE_LOW_RAM);
}
/**