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

Merge "DPC should not be allowed to grant development permission" into mnc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-11 08:14:19 +00:00
committed by Android (Google) Code Review
parent 5470469d73 2ce5539045
commit 328c129f4c
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -55,6 +55,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager; import android.content.pm.IPackageManager;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PermissionInfo;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
@@ -95,6 +96,7 @@ import android.security.KeyChain;
import android.security.KeyChain.KeyChainConnection; import android.security.KeyChain.KeyChainConnection;
import android.service.persistentdata.PersistentDataBlockManager; import android.service.persistentdata.PersistentDataBlockManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.util.PrintWriterPrinter; import android.util.PrintWriterPrinter;
import android.util.Printer; import android.util.Printer;
@@ -6444,6 +6446,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
if (targetSdkVersion < android.os.Build.VERSION_CODES.M) { if (targetSdkVersion < android.os.Build.VERSION_CODES.M) {
return false; return false;
} }
if (!isRuntimePermission(permission)) {
EventLog.writeEvent(0x534e4554, "62623498", user.getIdentifier(), "");
return false;
}
final PackageManager packageManager = mContext.getPackageManager(); final PackageManager packageManager = mContext.getPackageManager();
switch (grantState) { switch (grantState) {
case DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED: { case DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED: {
@@ -6469,12 +6475,21 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
return true; return true;
} catch (SecurityException se) { } catch (SecurityException se) {
return false; return false;
} catch (NameNotFoundException e) {
return false;
} finally { } finally {
Binder.restoreCallingIdentity(ident); Binder.restoreCallingIdentity(ident);
} }
} }
} }
public boolean isRuntimePermission(String permissionName) throws NameNotFoundException {
final PackageManager packageManager = mContext.getPackageManager();
PermissionInfo permissionInfo = packageManager.getPermissionInfo(permissionName, 0);
return (permissionInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE)
== PermissionInfo.PROTECTION_DANGEROUS;
}
@Override @Override
public int getPermissionGrantState(ComponentName admin, String packageName, public int getPermissionGrantState(ComponentName admin, String packageName,
String permission) throws RemoteException { String permission) throws RemoteException {