drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add permission checks for Verification API calls" into jb-mr1-dev

Browse Source
This commit is contained in:
rich cannings
2012-08-28 15:14:25 -07:00
committed by Android (Google) Code Review
parent b1a1e5ca7d 7e67151b91
commit 2deaa3698d
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@ -76,6 +76,7 @@ package android {
field public static final java.lang.String MOUNT_UNMOUNT_FILESYSTEMS = "android.permission.MOUNT_UNMOUNT_FILESYSTEMS"; field public static final java.lang.String MOUNT_UNMOUNT_FILESYSTEMS = "android.permission.MOUNT_UNMOUNT_FILESYSTEMS";
field public static final java.lang.String NET_TUNNELING = "android.permission.NET_TUNNELING"; field public static final java.lang.String NET_TUNNELING = "android.permission.NET_TUNNELING";
field public static final java.lang.String NFC = "android.permission.NFC"; field public static final java.lang.String NFC = "android.permission.NFC";
field public static final java.lang.String PACKAGE_VERIFICATION_AGENT = "android.permission.PACKAGE_VERIFICATION_AGENT";
field public static final deprecated java.lang.String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY"; field public static final deprecated java.lang.String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";
field public static final java.lang.String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS"; field public static final java.lang.String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
field public static final java.lang.String READ_CALENDAR = "android.permission.READ_CALENDAR"; field public static final java.lang.String READ_CALENDAR = "android.permission.READ_CALENDAR";

7
core/java/android/content/pm/PackageManager.java
View File

@ -2319,6 +2319,9 @@ public abstract class PackageManager {
* {@link PackageManager#EXTRA_VERIFICATION_ID} Intent extra * {@link PackageManager#EXTRA_VERIFICATION_ID} Intent extra
* @param verificationCode either {@link PackageManager#VERIFICATION_ALLOW} * @param verificationCode either {@link PackageManager#VERIFICATION_ALLOW}
* or {@link PackageManager#VERIFICATION_REJECT}. * or {@link PackageManager#VERIFICATION_REJECT}.
* @throws SecurityException if the caller does not have the
* {@link android.Manifest.permission#PACKAGE_VERIFICATION_AGENT}
* permission.
*/ */
public abstract void verifyPendingInstall(int id, int verificationCode); public abstract void verifyPendingInstall(int id, int verificationCode);
@ -2342,9 +2345,11 @@ public abstract class PackageManager {
* @param millisecondsToDelay the amount of time requested for the timeout. * @param millisecondsToDelay the amount of time requested for the timeout.
* Must be positive and less than * Must be positive and less than
* {@link PackageManager#MAXIMUM_VERIFICATION_TIMEOUT}. * {@link PackageManager#MAXIMUM_VERIFICATION_TIMEOUT}.
*
* @throws IllegalArgumentException if {@code millisecondsToDelay} is out * @throws IllegalArgumentException if {@code millisecondsToDelay} is out
* of bounds or {@code verificationCodeAtTimeout} is unknown. * of bounds or {@code verificationCodeAtTimeout} is unknown.
* @throws SecurityException if the caller does not have the
* {@link android.Manifest.permission#PACKAGE_VERIFICATION_AGENT}
* permission.
*/ */
public abstract void extendVerificationTimeout(int id, public abstract void extendVerificationTimeout(int id,
int verificationCodeAtTimeout, long millisecondsToDelay); int verificationCodeAtTimeout, long millisecondsToDelay);

1
core/res/AndroidManifest.xml
View File

@ -1662,7 +1662,6 @@
<!-- Package verifier needs to have this permission before the PackageManager will <!-- Package verifier needs to have this permission before the PackageManager will
trust it to verify packages. trust it to verify packages.
@hide
--> -->
<permission android:name="android.permission.PACKAGE_VERIFICATION_AGENT" <permission android:name="android.permission.PACKAGE_VERIFICATION_AGENT"
android:label="@string/permlab_packageVerificationAgent" android:label="@string/permlab_packageVerificationAgent"

8
services/java/com/android/server/pm/PackageManagerService.java
View File

@ -5578,6 +5578,10 @@ public class PackageManagerService extends IPackageManager.Stub {
@Override @Override
public void verifyPendingInstall(int id, int verificationCode) throws RemoteException { public void verifyPendingInstall(int id, int verificationCode) throws RemoteException {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.PACKAGE_VERIFICATION_AGENT,
"Only package verification agents can verify applications");
final Message msg = mHandler.obtainMessage(PACKAGE_VERIFIED); final Message msg = mHandler.obtainMessage(PACKAGE_VERIFIED);
final PackageVerificationResponse response = new PackageVerificationResponse( final PackageVerificationResponse response = new PackageVerificationResponse(
verificationCode, Binder.getCallingUid()); verificationCode, Binder.getCallingUid());
@ -5589,6 +5593,10 @@ public class PackageManagerService extends IPackageManager.Stub {
@Override @Override
public void extendVerificationTimeout(int id, int verificationCodeAtTimeout, public void extendVerificationTimeout(int id, int verificationCodeAtTimeout,
long millisecondsToDelay) { long millisecondsToDelay) {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.PACKAGE_VERIFICATION_AGENT,
"Only package verification agents can extend verification timeouts");
final PackageVerificationState state = mPendingVerification.get(id); final PackageVerificationState state = mPendingVerification.get(id);
final PackageVerificationResponse response = new PackageVerificationResponse( final PackageVerificationResponse response = new PackageVerificationResponse(
verificationCodeAtTimeout, Binder.getCallingUid()); verificationCodeAtTimeout, Binder.getCallingUid());