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

Commit 5bc4949f authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Turn on enforcing mode for Q-based location APIs"

parents 9102b10a c54582e1

telephony/java/android/telephony/LocationAccessPolicy.java

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import java.util.List; 
public final class LocationAccessPolicy {

    private static final String TAG = "LocationAccessPolicy";

    private static final boolean DBG = false;

    public static final int MAX_SDK_FOR_ANY_ENFORCEMENT = Build.VERSION_CODES.P;

    public static final int MAX_SDK_FOR_ANY_ENFORCEMENT = Build.VERSION_CODES.CUR_DEVELOPMENT;



    public enum LocationPermissionResult {

        ALLOWED,
@@ -198,14 +198,14 @@ public final class LocationAccessPolicy { 
        // If the app fails for some reason, see if it should be allowed to proceed.

        if (minSdkVersion > MAX_SDK_FOR_ANY_ENFORCEMENT) {

            String errorMsg = "Allowing " + query.callingPackage + " " + locationTypeForLog

                    + " because we're not enforcing API " + query.minSdkVersionForFine + " yet."

                    + " because we're not enforcing API " + minSdkVersion + " yet."

                    + " Please fix this app because it will break in the future. Called from "

                    + query.method;

            logError(context, errorMsg);

            return null;

        } else if (!isAppAtLeastSdkVersion(context, query.callingPackage, minSdkVersion)) {

            String errorMsg = "Allowing " + query.callingPackage + " " + locationTypeForLog

                    + " because it doesn't target API " + query.minSdkVersionForFine + " yet."

                    + " because it doesn't target API " + minSdkVersion + " yet."

                    + " Please fix this app. Called from " + query.method;

            logError(context, errorMsg);

            return null;