Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resolve merge conflicts of 58db550 to master"

Browse Source
This commit is contained in:
Jeff Sharkey
2016-05-27 16:14:08 +00:00
committed by Android (Google) Code Review
parent 059dc7a1bf 9b34b66b66
commit ae25115690
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/os/storage/StorageManager.java
View File

@@ -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
.asInterface(ServiceManager.getService("mount"));
if (mount == null) {
if (sMountService == null) {
sMountService = IMountService.Stub
.asInterface(ServiceManager.getService("mount"));
}
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 {