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

Commit 40bcb1d3 authored by Nate Myren's avatar Nate Myren Committed by android-build-merger
Browse files

Merge "set RuntimePermissionPresentationInfo, getAppPermissions, and... 

Merge "set RuntimePermissionPresentationInfo, getAppPermissions, and OnGetAppPermissions as Test Api, added Get Runtime Permissions to shell" into qt-dev
am: 1ce99831

Change-Id: I572a474338a50d5242d7a5fc89c10549764d42c6
parents 8319755b 1ce99831

api/test-current.txt

+15 −0
Original line number Diff line number Diff line
@@ -2163,6 +2163,7 @@ package android.os.strictmode { 
package android.permission {



  public final class PermissionControllerManager {

    method @RequiresPermission("android.permission.GET_RUNTIME_PERMISSIONS") public void getAppPermissions(@NonNull String, @NonNull android.permission.PermissionControllerManager.OnGetAppPermissionResultCallback, @Nullable android.os.Handler);

    method @RequiresPermission("android.permission.REVOKE_RUNTIME_PERMISSIONS") public void revokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull java.util.concurrent.Executor, @NonNull android.permission.PermissionControllerManager.OnRevokeRuntimePermissionsCallback);

    field public static final int COUNT_ONLY_WHEN_GRANTED = 1; // 0x1

    field public static final int COUNT_WHEN_SYSTEM = 2; // 0x2
@@ -2170,11 +2171,25 @@ package android.permission { 
    field public static final int REASON_MALWARE = 1; // 0x1

  }



  public static interface PermissionControllerManager.OnGetAppPermissionResultCallback {

    method public void onGetAppPermissions(@NonNull java.util.List<android.permission.RuntimePermissionPresentationInfo>);

  }



  public abstract static class PermissionControllerManager.OnRevokeRuntimePermissionsCallback {

    ctor public PermissionControllerManager.OnRevokeRuntimePermissionsCallback();

    method public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>);

  }



  public final class RuntimePermissionPresentationInfo implements android.os.Parcelable {

    ctor public RuntimePermissionPresentationInfo(@NonNull CharSequence, boolean, boolean);

    method public int describeContents();

    method @NonNull public CharSequence getLabel();

    method public boolean isGranted();

    method public boolean isStandard();

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.permission.RuntimePermissionPresentationInfo> CREATOR;

  }



}



package android.print {

core/java/android/permission/PermissionControllerManager.java

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ public final class PermissionControllerManager { 
     *

     * @hide

     */

    @TestApi

    public interface OnGetAppPermissionResultCallback {

        /**

         * The result for {@link #getAppPermissions(String, OnGetAppPermissionResultCallback,
@@ -385,6 +386,7 @@ public final class PermissionControllerManager { 
     *

     * @hide

     */

    @TestApi

    @RequiresPermission(Manifest.permission.GET_RUNTIME_PERMISSIONS)

    public void getAppPermissions(@NonNull String packageName,

            @NonNull OnGetAppPermissionResultCallback callback, @Nullable Handler handler) {

core/java/android/permission/RuntimePermissionPresentationInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.permission; 


import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -32,6 +33,7 @@ import com.android.internal.util.Preconditions; 
 *

 * @hide

 */

@TestApi

@SystemApi

public final class RuntimePermissionPresentationInfo implements Parcelable {

    private static final int FLAG_GRANTED = 1 << 0;

packages/Shell/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
        >



        <!-- Standard permissions granted to the shell. -->

    <uses-permission android:name="android.permission.GET_RUNTIME_PERMISSIONS" />

    <uses-permission android:name="android.permission.SEND_SMS" />

    <uses-permission android:name="android.permission.READ_SMS" />

    <uses-permission android:name="android.permission.CALL_PHONE" />