diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-31 17:11:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-31 17:11:58 +0000 |
| commit | c1836bb0f1bf3e5ef0911719525da0bab3e53507 (patch) | |
| tree | 616e87b836bf7dc35558971d19743a467e4e665f /services/devicepolicy | |
| parent | d0694da4fb85bb01e7c0ea7989a78a0e635453ac (diff) | |
| parent | 0e3de6cacaffcfeda4d6353be61e2f1f9ed80705 (diff) | |
| download | frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.zip frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.tar.gz frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.tar.bz2 | |
Merge "Change MNC codename to just M." into mnc-dev
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 1e833b1..cd2885b 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -6436,7 +6436,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final ApplicationInfo ai = AppGlobals.getPackageManager() .getApplicationInfo(packageName, 0, user.getIdentifier()); final int targetSdkVersion = ai == null ? 0 : ai.targetSdkVersion; - if (targetSdkVersion < android.os.Build.VERSION_CODES.MNC) { + if (targetSdkVersion < android.os.Build.VERSION_CODES.M) { return false; } final PackageManager packageManager = mContext.getPackageManager(); |