Merge "Schematize vold system properties" (6220baa3) · Commits · e / os / android_frameworks_base

Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -653,6 +653,8 @@ java_defaults {
	"core/java/com/android/server/DropboxLogTags.logtags",		"core/java/com/android/server/DropboxLogTags.logtags",
	"core/java/org/chromium/arc/EventLogTags.logtags",		"core/java/org/chromium/arc/EventLogTags.logtags",

			":platform-properties",

	":framework-statslog-gen",		":framework-statslog-gen",
	],		],

core/java/android/os/storage/StorageManager.java

+3 −2

packages/SystemUI/src/com/android/systemui/statusbar/policy/EncryptionHelper.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	package com.android.systemui.statusbar.policy;		package com.android.systemui.statusbar.policy;

	import android.os.SystemProperties;		import android.sysprop.VoldProperties;

	/**		/**
	* Helper for determining whether the phone is decrypted yet.		* Helper for determining whether the phone is decrypted yet.
	@@ -26,7 +26,7 @@ public class EncryptionHelper {
	public static final boolean IS_DATA_ENCRYPTED = isDataEncrypted();		public static final boolean IS_DATA_ENCRYPTED = isDataEncrypted();

	private static boolean isDataEncrypted() {		private static boolean isDataEncrypted() {
	String voldState = SystemProperties.get("vold.decrypt");		String voldState = VoldProperties.decrypt().orElse("");
	return "1".equals(voldState) \|\| "trigger_restart_min_framework".equals(voldState);		return "1".equals(voldState) \|\| "trigger_restart_min_framework".equals(voldState);
	}		}
	}		}

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -99,6 +99,7 @@ import android.os.storage.VolumeInfo;
	import android.os.storage.VolumeRecord;		import android.os.storage.VolumeRecord;
	import android.provider.MediaStore;		import android.provider.MediaStore;
	import android.provider.Settings;		import android.provider.Settings;
			import android.sysprop.VoldProperties;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.text.format.DateUtils;		import android.text.format.DateUtils;
	import android.util.ArrayMap;		import android.util.ArrayMap;
	@@ -1015,7 +1016,7 @@ class StorageManagerService extends IStorageManager.Stub

	// On an encrypted device we can't see system properties yet, so pull		// On an encrypted device we can't see system properties yet, so pull
	// the system locale out of the mount service.		// the system locale out of the mount service.
	if ("".equals(SystemProperties.get("vold.encrypt_progress"))) {		if ("".equals(VoldProperties.encrypt_progress().orElse(""))) {
	copyLocaleFromMountService();		copyLocaleFromMountService();
	}		}
	}		}

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,7 @@ import android.os.ServiceManager;
	import android.os.ServiceManager.ServiceNotFoundException;		import android.os.ServiceManager.ServiceNotFoundException;
	import android.os.SystemProperties;		import android.os.SystemProperties;
	import android.provider.Settings;		import android.provider.Settings;
			import android.sysprop.VoldProperties;
	import android.system.ErrnoException;		import android.system.ErrnoException;
	import android.system.Os;		import android.system.Os;
	import android.system.OsConstants;		import android.system.OsConstants;
	@@ -1495,7 +1496,7 @@ public class StorageManager {
	* framework, so no service needs to check for changes during their lifespan		* framework, so no service needs to check for changes during their lifespan
	*/		*/
	public static boolean isBlockEncrypting() {		public static boolean isBlockEncrypting() {
	final String state = SystemProperties.get("vold.encrypt_progress", "");		final String state = VoldProperties.encrypt_progress().orElse("");
	return !"".equalsIgnoreCase(state);		return !"".equalsIgnoreCase(state);
	}		}

	@@ -1511,7 +1512,7 @@ public class StorageManager {
	* framework, so no service needs to check for changes during their lifespan		* framework, so no service needs to check for changes during their lifespan
	*/		*/
	public static boolean inCryptKeeperBounce() {		public static boolean inCryptKeeperBounce() {
	final String status = SystemProperties.get("vold.decrypt");		final String status = VoldProperties.decrypt().orElse("");
	return "trigger_restart_min_framework".equals(status);		return "trigger_restart_min_framework".equals(status);
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -272,6 +272,7 @@ import android.os.UserManager;
	import android.os.WorkSource;		import android.os.WorkSource;
	import android.os.storage.StorageManager;		import android.os.storage.StorageManager;
	import android.provider.Settings;		import android.provider.Settings;
			import android.sysprop.VoldProperties;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.text.format.DateUtils;		import android.text.format.DateUtils;
	import android.text.style.SuggestionSpan;		import android.text.style.SuggestionSpan;
	@@ -4807,8 +4808,8 @@ public class ActivityManagerService extends IActivityManager.Stub
	SystemProperties.set("sys.boot_completed", "1");		SystemProperties.set("sys.boot_completed", "1");

	// And trigger dev.bootcomplete if we are not showing encryption progress		// And trigger dev.bootcomplete if we are not showing encryption progress
	if (!"trigger_restart_min_framework".equals(SystemProperties.get("vold.decrypt"))		if (!"trigger_restart_min_framework".equals(VoldProperties.decrypt().orElse(""))
	\|\| "".equals(SystemProperties.get("vold.encrypt_progress"))) {		\|\| "".equals(VoldProperties.encrypt_progress().orElse(""))) {
	SystemProperties.set("dev.bootcomplete", "1");		SystemProperties.set("dev.bootcomplete", "1");
	}		}
	mUserController.sendBootCompleted(		mUserController.sendBootCompleted(