PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog

Browse Source 
Bug: 30582906
Change-Id: I976c354021482b7db4e6270e071f2e513e49009d
This commit is contained in:
Rubin Xu
2016-07-28 14:35:08 +01:00
parent de26061dc9
commit da9f9a0fab
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/ShowAdminSupportDetailsDialog.java
View File

@@ -17,17 +17,14 @@
package com.android.settings; package com.android.settings;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManagerNative;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AppGlobals; import android.app.AppGlobals;
import android.app.IActivityManager;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.os.Process; import android.os.Process;
@@ -47,8 +44,6 @@ public class ShowAdminSupportDetailsDialog extends Activity
private static final String TAG = "AdminSupportDialog"; private static final String TAG = "AdminSupportDialog";
private DevicePolicyManager mDpm;
private EnforcedAdmin mEnforcedAdmin; private EnforcedAdmin mEnforcedAdmin;
private View mDialogView; private View mDialogView;
@@ -56,7 +51,6 @@ public class ShowAdminSupportDetailsDialog extends Activity
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mDpm = getSystemService(DevicePolicyManager.class);
mEnforcedAdmin = getAdminDetailsFromIntent(getIntent()); mEnforcedAdmin = getAdminDetailsFromIntent(getIntent());
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -84,26 +78,11 @@ public class ShowAdminSupportDetailsDialog extends Activity
if (intent == null) { if (intent == null) {
return admin; return admin;
} }
// Only allow apps with MANAGE_DEVICE_ADMINS permission to specify admin and user. admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
if (checkIfCallerHasPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS)) { admin.userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
admin.userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
}
return admin; return admin;
} }
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 initializeDialogViews(View root, ComponentName admin, int userId) { private void initializeDialogViews(View root, ComponentName admin, int userId) {
if (admin != null) { if (admin != null) {
if (!RestrictedLockUtils.isAdminInCurrentUserOrProfile(this, admin) if (!RestrictedLockUtils.isAdminInCurrentUserOrProfile(this, admin)