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

Merge "Work around buggy DMAgent." into nyc-dev

Browse Source 
am: 5d4b11e

* commit '5d4b11ef18cd3a78fa985d953ccd366772dab037':
  Work around buggy DMAgent.
This commit is contained in:
Jeff Sharkey
2016-03-28 16:42:20 +00:00
committed by android-build-merger
parent c15288facf 5d4b11ef18
commit 312c7d0da8
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4868,10 +4868,24 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
// we start using it for different purposes.
ensureCallerPackage(callerPackage);
final ApplicationInfo ai;
try {
ai = mContext.getPackageManager().getApplicationInfo(callerPackage, 0);
} catch (NameNotFoundException e) {
throw new SecurityException(e);
}
boolean legacyApp = false;
if (ai.targetSdkVersion <= Build.VERSION_CODES.M) {
legacyApp = true;
} else if ("com.google.android.apps.enterprise.dmagent".equals(ai.packageName)
&& ai.versionCode == 697) {
// TODO: remove this once a new prebuilt is dropped
legacyApp = true;
}
final int rawStatus = getEncryptionStatus();
if ((rawStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER)
&& (callerPackage != null)
&& (getTargetSdk(callerPackage, userHandle) <= VERSION_CODES.M)) {
if ((rawStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER) && legacyApp) {
return DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE;
}
return rawStatus;