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

Commit 3d579a3c authored by Howard Chen's avatar Howard Chen Committed by android-build-merger
Browse files

Merge "Remove the Build.VERSION_CODES.P0" into qt-dev 

am: e1925ee3

Change-Id: Ied801ae0792b54dc1f8cfcb0fb09ab291f872745
parents 0c107d5c e1925ee3

core/java/android/os/Build.java

+0 −5
Original line number Diff line number Diff line
@@ -979,11 +979,6 @@ public class Build { 
         */

        public static final int Q = CUR_DEVELOPMENT;



        /**

         * Stub for a potential new API level after P.

         * @hide

         */

        public static final int P0 = Q;

    }



    /** The type of build, like "user" or "eng". */

core/java/android/permission/PermissionManager.java

+3 −6
Original line number Diff line number Diff line
@@ -23,11 +23,8 @@ import android.annotation.RequiresPermission; 
import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.content.pm.PermissionInfo;

import android.os.RemoteException;



import com.android.internal.annotations.Immutable;
@@ -107,11 +104,11 @@ public final class PermissionManager { 
    /**

     * Get set of permissions that have been split into more granular or dependent permissions.

     *

     * <p>E.g. before {@link android.os.Build.VERSION_CODES#P0} an app that was granted

     * <p>E.g. before {@link android.os.Build.VERSION_CODES#Q} an app that was granted

     * {@link Manifest.permission#ACCESS_COARSE_LOCATION} could access he location while it was in

     * foreground and background. On platforms after {@link android.os.Build.VERSION_CODES#P0}

     * foreground and background. On platforms after {@link android.os.Build.VERSION_CODES#Q}

     * the location permission only grants location access while the app is in foreground. This

     * would break apps that target before {@link android.os.Build.VERSION_CODES#P0}. Hence whenever

     * would break apps that target before {@link android.os.Build.VERSION_CODES#Q}. Hence whenever

     * such an old app asks for a location permission (i.e. the

     * {@link SplitPermissionInfo#getSplitPermission()}), then the

     * {@link Manifest.permission#ACCESS_BACKGROUND_LOCATION} permission (inside