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

Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb

Browse Source
This commit is contained in:
Jason parks
2011-01-21 11:59:15 -08:00
committed by Android (Google) Code Review
parent 0f2ef34b5a 8888c597c4
commit 0512d080a5
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/res/AndroidManifest.xml
View File

@@ -1284,6 +1284,13 @@
android:description="@string/permlab_copyProtectedData"
android:protectionLevel="signature" />
<!-- Internal permission protecting access to the encryption methods
@hide
-->
<permission android:name="android.permission.CRYPT_KEEPER"
android:protectionLevel="signatureOrSystem" />
<!-- C2DM permission.
@hide Used internally.
-->

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

@@ -19,6 +19,7 @@ package com.android.server;
import com.android.internal.app.IMediaContainerService;
import com.android.server.am.ActivityManagerService;
import android.Manifest;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -1635,7 +1636,8 @@ class MountService extends IMountService.Stub implements INativeDaemonConnectorC
throw new IllegalArgumentException("password cannot be null");
}
// TODO: Enforce a permission
mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER,
"no permission to access the crypt keeper");
waitForReady();
@@ -1675,12 +1677,13 @@ class MountService extends IMountService.Stub implements INativeDaemonConnectorC
throw new IllegalArgumentException("password cannot be null");
}
// TODO: Enforce a permission
mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER,
"no permission to access the crypt keeper");
waitForReady();
if (DEBUG_EVENTS) {
Slog.i(TAG, "decrypting storage...");
Slog.i(TAG, "encrypting storage...");
}
try {