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

MountService: Send UMS_CONNECTED broadcast on boot if UMS connected.

Browse Source 
UMS detection is now done wayyyy before the system is booted, so set a flag
to send our intent broadcast once we've booted.

Signed-off-by: San Mehat <san@google.com>
This commit is contained in:
San Mehat
2010-02-24 17:47:30 -08:00
parent 9b1e9edff5
commit 6a965af2d7
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/java/com/android/server/MountService.java
View File

@@ -115,8 +115,9 @@ class MountService extends IMountService.Stub
private PackageManagerService mPms;
private boolean mUmsEnabling;
private ArrayList<MountServiceBinderListener> mListeners;
private boolean mBooted;
private boolean mReady;
private boolean mBooted = false;
private boolean mReady = false;
private boolean mSendUmsConnectedOnBoot = false;
/**
* Private hash of currently mounted secure containers.
@@ -162,6 +163,14 @@ class MountService extends IMountService.Stub
Log.e(TAG, String.format("Boot-time mount failed (%d)", rc));
}
}
/*
* If UMS is connected in boot, send the connected event
* now that we're up.
*/
if (mSendUmsConnectedOnBoot) {
sendUmsIntent(true);
mSendUmsConnectedOnBoot = false;
}
} catch (Exception ex) {
Log.e(TAG, "Boot-time mount exception", ex);
}
@@ -636,16 +645,17 @@ class MountService extends IMountService.Stub
}
if (mBooted == true) {
Intent intent;
if (avail) {
intent = new Intent(Intent.ACTION_UMS_CONNECTED);
} else {
intent = new Intent(Intent.ACTION_UMS_DISCONNECTED);
}
mContext.sendBroadcast(intent);
sendUmsIntent(avail);
} else {
mSendUmsConnectedOnBoot = avail;
}
}
private void sendUmsIntent(boolean c) {
mContext.sendBroadcast(
new Intent((c ? Intent.ACTION_UMS_CONNECTED : Intent.ACTION_UMS_DISCONNECTED)));
}
private void validatePermission(String perm) {
if (mContext.checkCallingOrSelfPermission(perm) != PackageManager.PERMISSION_GRANTED) {
throw new SecurityException(String.format("Requires %s permission", perm));