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

Merge "Address API council feedback" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-24 04:29:32 +00:00
committed by Android (Google) Code Review
parent 949266a388 2224cb827f
commit f8c904958b
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -1714,7 +1714,6 @@ package android.content.pm {
field public static final int MATCH_ANY_USER = 4194304; // 0x400000 field public static final int MATCH_ANY_USER = 4194304; // 0x400000
field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000 field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000
field public static final int MATCH_INSTANT = 8388608; // 0x800000 field public static final int MATCH_INSTANT = 8388608; // 0x800000
field public static boolean RESTRICTED_PERMISSIONS_ENABLED;
field public static final int RESTRICTION_HIDE_FROM_SUGGESTIONS = 1; // 0x1 field public static final int RESTRICTION_HIDE_FROM_SUGGESTIONS = 1; // 0x1
field public static final int RESTRICTION_HIDE_NOTIFICATIONS = 2; // 0x2 field public static final int RESTRICTION_HIDE_NOTIFICATIONS = 2; // 0x2
field public static final int RESTRICTION_NONE = 0; // 0x0 field public static final int RESTRICTION_NONE = 0; // 0x0

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

@@ -87,8 +87,8 @@ public abstract class PackageManager {
public static final boolean APPLY_DEFAULT_TO_DEVICE_PROTECTED_STORAGE = true; public static final boolean APPLY_DEFAULT_TO_DEVICE_PROTECTED_STORAGE = true;
/** {@hide} */ /** {@hide} */
@SystemApi
@TestApi @TestApi
// STOPSHIP: Remove this once we get a Play prebuilt.
public static boolean RESTRICTED_PERMISSIONS_ENABLED = false; public static boolean RESTRICTED_PERMISSIONS_ENABLED = false;
/** /**