Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 1ce9983162

Change-Id: I572a474338a50d5242d7a5fc89c10549764d42c6
This commit is contained in:
Nate Myren
2019-05-28 09:38:37 -07:00
committed by android-build-merger
parent 8319755b83 1ce9983162
commit 40bcb1d3cd
4 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/test-current.txt
View File

@@ -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 {

2
core/java/android/permission/PermissionControllerManager.java
View File

@@ -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) {

2
core/java/android/permission/RuntimePermissionPresentationInfo.java
View File

@@ -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;

3
packages/Shell/AndroidManifest.xml
View File

@@ -22,7 +22,8 @@
android:sharedUserId="android.uid.shell"
>
<!-- Standard permissions granted to the shell. -->
<!-- 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" />