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

Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-10 20:12:57 +00:00
committed by Android (Google) Code Review
parent b230dd4fe6 f27394ee70
commit d703395fcb
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/test-current.txt
View File

@@ -646,6 +646,7 @@ package android.content {
method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions); method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions);
field public static final String BUGREPORT_SERVICE = "bugreport"; field public static final String BUGREPORT_SERVICE = "bugreport";
field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture"; field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";
field public static final String PERMISSION_SERVICE = "permission";
field public static final String ROLLBACK_SERVICE = "rollback"; field public static final String ROLLBACK_SERVICE = "rollback";
field public static final String STATUS_BAR_SERVICE = "statusbar"; field public static final String STATUS_BAR_SERVICE = "statusbar";
field public static final String TEST_NETWORK_SERVICE = "test_network"; field public static final String TEST_NETWORK_SERVICE = "test_network";
@@ -2214,6 +2215,18 @@ package android.permission {
method public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>); method public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>);
} }
public final class PermissionManager {
method @IntRange(from=0) @RequiresPermission("android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY") public int getRuntimePermissionsVersion();
method @NonNull public java.util.List<android.permission.PermissionManager.SplitPermissionInfo> getSplitPermissions();
method @RequiresPermission("android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY") public void setRuntimePermissionsVersion(@IntRange(from=0) int);
}
public static final class PermissionManager.SplitPermissionInfo {
method @NonNull public java.util.List<java.lang.String> getNewPermissions();
method @NonNull public String getSplitPermission();
method public int getTargetSdk();
}
public final class RuntimePermissionPresentationInfo implements android.os.Parcelable { public final class RuntimePermissionPresentationInfo implements android.os.Parcelable {
ctor public RuntimePermissionPresentationInfo(@NonNull CharSequence, boolean, boolean); ctor public RuntimePermissionPresentationInfo(@NonNull CharSequence, boolean, boolean);
method public int describeContents(); method public int describeContents();

1
core/java/android/content/Context.java
View File

@@ -4126,6 +4126,7 @@ public abstract class Context {
* @see #getSystemService(String) * @see #getSystemService(String)
* @hide * @hide
*/ */
@TestApi
@SystemApi @SystemApi
public static final String PERMISSION_SERVICE = "permission"; public static final String PERMISSION_SERVICE = "permission";

6
core/java/android/permission/PermissionManager.java
View File

@@ -39,6 +39,7 @@ import java.util.Objects;
* *
* @hide * @hide
*/ */
@TestApi
@SystemApi @SystemApi
@SystemService(Context.PERMISSION_SERVICE) @SystemService(Context.PERMISSION_SERVICE)
public final class PermissionManager { public final class PermissionManager {
@@ -140,12 +141,13 @@ public final class PermissionManager {
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
SplitPermissionInfo that = (SplitPermissionInfo) o; SplitPermissionInfo that = (SplitPermissionInfo) o;
return mTargetSdk == that.mTargetSdk return mTargetSdk == that.mTargetSdk
&& Objects.equals(mSplitPerm, that.mSplitPerm); && mSplitPerm.equals(that.mSplitPerm)
&& mNewPerms.equals(that.mNewPerms);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(mSplitPerm, mTargetSdk); return Objects.hash(mSplitPerm, mNewPerms, mTargetSdk);
} }
/** /**