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

Merge "Fix SecurityException in getStorageEncryptionStatus" into nyc-dev

Browse Source
This commit is contained in:
Rubin Xu
2016-03-29 13:36:48 +00:00
committed by Android (Google) Code Review
parent 82b1a68ed4 81a95700e5
commit 1a981d27e0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4870,8 +4870,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
final ApplicationInfo ai;
try {
ai = mContext.getPackageManager().getApplicationInfo(callerPackage, 0);
} catch (NameNotFoundException e) {
ai = mIPackageManager.getApplicationInfo(callerPackage, 0, userHandle);
} catch (RemoteException e) {
throw new SecurityException(e);
}
@@ -4880,7 +4880,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
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
// TODO: STOPSHIP remove this (revert ag/895987) once a new prebuilt is dropped
legacyApp = true;
}