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

Merge "Implement dual-permission model for storage."

Browse Source
This commit is contained in:
Jeff Sharkey
2019-03-20 23:49:08 +00:00
committed by Android (Google) Code Review
parent 4d5206ebe5 c94ba820fb
commit 8c6eee1124
9 changed files with 271 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/AppOpsManager.java
View File

@@ -48,7 +48,6 @@ import android.util.LongSparseLongArray;
import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.Immutable;
import com.android.internal.app.IAppOpsActiveCallback;
import com.android.internal.app.IAppOpsCallback;
@@ -1098,6 +1097,8 @@ public class AppOpsManager {
/** @hide Write media of image type. */
public static final String OPSTR_WRITE_MEDIA_IMAGES = "android:write_media_images";
/** @hide Has a legacy (non-isolated) view of storage. */
@TestApi
@SystemApi
public static final String OPSTR_LEGACY_STORAGE = "android:legacy_storage";
/** @hide Interact with accessibility. */
@SystemApi

13
core/java/android/content/pm/PackageManager.java
View File

@@ -3064,6 +3064,15 @@ public abstract class PackageManager {
@SystemApi
public static final int FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED = 1 << 9;
/**
* Permission flag: The permission should not be shown in the UI.
*
* @hide
*/
@SystemApi
@TestApi
public static final int FLAG_PERMISSION_HIDDEN = 1 << 10;
/**
* Mask for all permission flags present in Android P
*
@@ -3082,7 +3091,7 @@ public abstract class PackageManager {
*
* @hide
*/
public static final int MASK_PERMISSION_FLAGS_ALL = 0x3FF;
public static final int MASK_PERMISSION_FLAGS_ALL = 0x7FF;
/**
* Injected activity in app that forwards user to setting activity of that app.
@@ -3793,6 +3802,7 @@ public abstract class PackageManager {
FLAG_PERMISSION_GRANTED_BY_DEFAULT,
FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED,
FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED,
FLAG_PERMISSION_HIDDEN,
/*
FLAG_PERMISSION_REVOKE_WHEN_REQUESED
*/
@@ -6586,6 +6596,7 @@ public abstract class PackageManager {
case FLAG_PERMISSION_REVOKE_WHEN_REQUESTED: return "REVOKE_WHEN_REQUESTED";
case FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED: return "USER_SENSITIVE_WHEN_GRANTED";
case FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED: return "USER_SENSITIVE_WHEN_DENIED";
case FLAG_PERMISSION_HIDDEN: return "HIDDEN";
default: return Integer.toString(flag);
}
}