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

Fix regression in OBB key handling

Browse Source 
Change-Id: If583cbdb8be68ffed094a5fde7ee00e1914c5841
This commit is contained in:
Kenny Root
2010-10-01 08:37:20 -07:00
parent 0a69f59760
commit 2942391801
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1599,20 +1599,23 @@ class MountService extends IMountService.Stub
addObbState(obbState); addObbState(obbState);
} }
final MessageDigest md; String hashedKey = null;
try { if (key != null) {
md = MessageDigest.getInstance("MD5"); final MessageDigest md;
} catch (NoSuchAlgorithmException e) {
Slog.e(TAG, "Could not load MD5 algorithm", e);
try { try {
token.onObbResult(filename, Environment.MEDIA_UNMOUNTED); md = MessageDigest.getInstance("MD5");
} catch (RemoteException e1) { } catch (NoSuchAlgorithmException e) {
Slog.d(TAG, "Could not send unmount notification for: " + filename); Slog.e(TAG, "Could not load MD5 algorithm", e);
try {
token.onObbResult(filename, Environment.MEDIA_UNMOUNTED);
} catch (RemoteException e1) {
Slog.d(TAG, "Could not send unmount notification for: " + filename);
}
return;
} }
return;
}
String hashedKey = HexDump.toHexString(md.digest(key.getBytes())); hashedKey = HexDump.toHexString(md.digest(key.getBytes()));
}
ObbAction action = new MountObbAction(obbState, hashedKey); ObbAction action = new MountObbAction(obbState, hashedKey);
mObbActionHandler.sendMessage(mObbActionHandler.obtainMessage(OBB_RUN_ACTION, action)); mObbActionHandler.sendMessage(mObbActionHandler.obtainMessage(OBB_RUN_ACTION, action));
@@ -1956,10 +1959,6 @@ class MountService extends IMountService.Stub
throw new IllegalArgumentException("Caller package does not match OBB file"); throw new IllegalArgumentException("Caller package does not match OBB file");
} }
if (mKey == null) {
mKey = "none";
}
boolean mounted = false; boolean mounted = false;
int rc; int rc;
synchronized (mObbState) { synchronized (mObbState) {