Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69a12ee7 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 35d2a2a4: am b75c945d: am 5d0d1da2: Merge "Change MNC codename to just M." into mnc-dev

* commit '35d2a2a4':
  Change MNC codename to just M.
parents 522354da 35d2a2a4
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -287,11 +287,11 @@ final public class Utils {
                && isAppOppAllowed(appOps, AppOpsManager.OP_COARSE_LOCATION, callingPackage)) {
            return true;
        }
        // Enforce location permission for apps targeting MNC and later versions
        // Enforce location permission for apps targeting M and later versions
        boolean enforceLocationPermission = true;
        try {
            enforceLocationPermission = context.getPackageManager().getApplicationInfo(
                    callingPackage, 0).targetSdkVersion >= Build.VERSION_CODES.MNC;
                    callingPackage, 0).targetSdkVersion >= Build.VERSION_CODES.M;
        } catch (PackageManager.NameNotFoundException e) {
            // In case of exception, enforce permission anyway
        }