commit cd8d052f25b5b912a65e345b52da6eea5bd99736
author Sudheer Shanka <sudheersai@google.com> Mon Jan 18 15:03:57 2016 +0000
committer Sudheer Shanka <sudheersai@google.com> Mon Jan 18 20:15:40 2016 +0000
tree 8eea93a7848eff3357a2b8e93a07d5864f9f8b22
parent 703dae96e163d0928e292105852950ce68adab0e

Check for MANAGE_DEVICE_ADMINS permission instead of uids.

Currently, in ShowAdminSupportDetailsDialog we use uid check to
restrict only system to pass extras. Relaxing that condition to
allow any package with MANAGE_DEVICE_ADMINS permission to pass extras.

Change-Id: I0351c1f82321b2304a61b5831788806636402610

src/com/android/settings/ShowAdminSupportDetailsDialog.java

diff --git a/src/com/android/settings/ShowAdminSupportDetailsDialog.java b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
index 85e90cf..bc7168f 100644
--- a/src/com/android/settings/ShowAdminSupportDetailsDialog.java
+++ b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
@@ -26,6 +26,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -52,16 +53,10 @@
         int userId = UserHandle.myUserId();
         Intent intent = getIntent();
         if (intent != null) {
-            IActivityManager am = ActivityManagerNative.getDefault();
-            try {
-                int uid = am.getLaunchedFromUid(getActivityToken());
-                // Only allow system to specify admin and user.
-                if (UserHandle.isSameApp(uid, android.os.Process.myUid())) {
-                    admin = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
-                    userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
-                }
-            } catch (RemoteException e) {
-                Log.e(TAG, "Could not talk to activity manager.", e);
+            // Only allow apps with MANAGE_DEVICE_ADMINS permission to specify admin and user.
+            if (checkIfCallerHasPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS)) {
+                admin = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
+                userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
             }
         }
 
@@ -76,6 +71,18 @@
                 .show();
     }
 
+    private boolean checkIfCallerHasPermission(String permission) {
+        IActivityManager am = ActivityManagerNative.getDefault();
+        try {
+            final int uid = am.getLaunchedFromUid(getActivityToken());
+            return AppGlobals.getPackageManager().checkUidPermission(permission, uid)
+                    == PackageManager.PERMISSION_GRANTED;
+        } catch (RemoteException e) {
+            Log.e(TAG, "Could not talk to activity manager.", e);
+        }
+        return false;
+    }
+
     private void setAdminSupportDetails(View root, final ComponentName admin, final int userId) {
         if (admin != null) {
             CharSequence supportMessage = mDpm.getShortSupportMessageForUser(admin, userId);