Merge "frameworks/base : testNoManagedUsersIfLowRamDevice failure" (fd2e55d8) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/SystemConfig.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -281,6 +281,8 @@ public class SystemConfig {
		if (fname == null) {
		Slog.w(TAG, "<feature> without name at "
		+ parser.getPositionDescription());
		} else if (isLowRamDevice() && "android.software.managed_users".equals(fname)) {
		Slog.w(TAG, "Feature not supported on low memory device "+fname);
		} else {
		//Log.i(TAG, "Got feature " + fname);
		FeatureInfo fi = new FeatureInfo();
		@@ -360,4 +362,8 @@ public class SystemConfig {
		XmlUtils.skipCurrentTag(parser);
		}
		}

		boolean isLowRamDevice() {
		return "true".equals(SystemProperties.get("ro.config.low_ram", "false"));
		}
		}