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

Commit 819a6d6a authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Always review permissions before <M app is started the first time"

parents 521a897a 6c644e62

api/system-removed.txt

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ package android.net.wifi { 
package android.os {



  public class Build {

    field public static final boolean PERMISSIONS_REVIEW_REQUIRED;

    field public static final boolean PERMISSIONS_REVIEW_REQUIRED = true;

  }



  public final class PowerManager {

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ package android.content.pm { 
  }



  public abstract class PackageManager {

    method public abstract boolean arePermissionsIndividuallyControlled();

    method public abstract java.lang.String getDefaultBrowserPackageNameAsUser(int);

    method public abstract int getInstallReason(java.lang.String, android.os.UserHandle);

    method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int);
@@ -275,7 +276,6 @@ package android.content.pm { 
    method public abstract java.lang.String getServicesSystemSharedLibraryPackageName();

    method public abstract java.lang.String getSharedSystemSharedLibraryPackageName();

    method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);

    method public abstract boolean isPermissionReviewModeEnabled();

    method public abstract void revokeRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);

    field public static final java.lang.String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage";

    field public static final java.lang.String FEATURE_FILE_BASED_ENCRYPTION = "android.software.file_based_encryption";

core/java/android/app/ApplicationPackageManager.java

+8 −2
Original line number Diff line number Diff line
@@ -342,9 +342,15 @@ public class ApplicationPackageManager extends PackageManager { 
    }



    @Override

    public boolean isPermissionReviewModeEnabled() {

    public boolean arePermissionsIndividuallyControlled() {

        return mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_permissionReviewRequired);

                com.android.internal.R.bool.config_permissionsIndividuallyControlled);

    }



    @Override

    public boolean isWirelessConsentModeEnabled() {

        return mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_wirelessConsentRequired);

    }



    @Override

core/java/android/content/pm/PackageManager.java

+9 −2
Original line number Diff line number Diff line
@@ -3269,12 +3269,19 @@ public abstract class PackageManager { 
            @PermissionInfoFlags int flags) throws NameNotFoundException;



    /**

     * Returns true if Permission Review Mode is enabled, false otherwise.

     * Returns true if some permissions are individually controlled

     *

     * @hide

     */

    @TestApi

    public abstract boolean isPermissionReviewModeEnabled();

    public abstract boolean arePermissionsIndividuallyControlled();



    /**

     * Returns true if wireless consent mode is enabled

     *

     * @hide

     */

    public abstract boolean isWirelessConsentModeEnabled();



    /**

     * Retrieve all of the information we know about a particular group of

core/java/android/os/Build.java

+1 −2
Original line number Diff line number Diff line
@@ -1114,8 +1114,7 @@ public class Build { 
     * @removed

     */

    @SystemApi

    public static final boolean PERMISSIONS_REVIEW_REQUIRED =

            SystemProperties.getInt("ro.permission_review_required", 0) == 1;

    public static final boolean PERMISSIONS_REVIEW_REQUIRED = true;



    /**

     * Returns the version string for the radio firmware.  May return