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 oc-dev

Browse Source 
am: 5e4b2b15ec

Change-Id: I54c0be2c389aacb367b3c8c7e749475dced25f3c
This commit is contained in:
Tony Mak
2017-09-11 03:41:57 +00:00
committed by android-build-merger
parent a8e0d5f73a 5e4b2b15ec
commit f1aea743fd
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

@@ -99,6 +99,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageManagerInternal; import android.content.pm.PackageManagerInternal;
import android.content.pm.ParceledListSlice; import android.content.pm.ParceledListSlice;
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.StringParceledListSlice; import android.content.pm.StringParceledListSlice;
@@ -152,6 +153,7 @@ import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.util.Slog; import android.util.Slog;
@@ -9582,6 +9584,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
< android.os.Build.VERSION_CODES.M) { < android.os.Build.VERSION_CODES.M) {
return false; return false;
} }
if (!isRuntimePermission(permission)) {
EventLog.writeEvent(0x534e4554, "62623498", user.getIdentifier(), "");
return false;
}
final PackageManager packageManager = mInjector.getPackageManager(); final PackageManager packageManager = mInjector.getPackageManager();
switch (grantState) { switch (grantState) {
case DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED: { case DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED: {
@@ -9608,6 +9614,8 @@ 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 {
mInjector.binderRestoreCallingIdentity(ident); mInjector.binderRestoreCallingIdentity(ident);
} }
@@ -9657,6 +9665,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
} }
public boolean isRuntimePermission(String permissionName) throws NameNotFoundException {
final PackageManager packageManager = mInjector.getPackageManager();
PermissionInfo permissionInfo = packageManager.getPermissionInfo(permissionName, 0);
return (permissionInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE)
== PermissionInfo.PROTECTION_DANGEROUS;
}
@Override @Override
public boolean isProvisioningAllowed(String action, String packageName) { public boolean isProvisioningAllowed(String action, String packageName) {
Preconditions.checkNotNull(packageName); Preconditions.checkNotNull(packageName);