Merge "resolve merge conflicts of 58db550 to master" (ae251156) · Commits · e / os / android_frameworks_base

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -117,6 +117,8 @@ public class StorageManager {
		/** {@hide} */
		public static final int FLAG_INCLUDE_INVISIBLE = 1 << 10;

		private static volatile IMountService sMountService = null;

		private static final String INTERNAL_STORAGE_SIZE_PATH =
		"/sys/block/mmcblk0/size";
		private static final String INTERNAL_STORAGE_SECTOR_SIZE =
		@@ -1089,15 +1091,17 @@ public class StorageManager {

		/** {@hide} */
		public static boolean isUserKeyUnlocked(int userId) {
		final IMountService mount = IMountService.Stub
		if (sMountService == null) {
		sMountService = IMountService.Stub
		.asInterface(ServiceManager.getService("mount"));
		if (mount == null) {
		}
		if (sMountService == null) {
		Slog.w(TAG, "Early during boot, assuming locked");
		return false;
		}
		final long token = Binder.clearCallingIdentity();
		try {
		return mount.isUserKeyUnlocked(userId);
		return sMountService.isUserKeyUnlocked(userId);
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();
		} finally {