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

Merge "hiddenapi: Add constants for 'greylist-max-p'"

Browse Source
This commit is contained in:
David Brazdil
2018-12-04 10:07:59 +00:00
committed by Gerrit Code Review
parent 08cbafefdc 5cd148fc7a
commit ec62f08f8c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1766,7 +1766,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
* is on the package whitelist. * is on the package whitelist.
* *
* @param policy configured policy for this app, or {@link #HIDDEN_API_ENFORCEMENT_DEFAULT} * @param policy configured policy for this app, or {@link #HIDDEN_API_ENFORCEMENT_DEFAULT}
* if nothing configured. * if nothing configured.
* @hide * @hide
*/ */
public void maybeUpdateHiddenApiEnforcementPolicy(@HiddenApiEnforcementPolicy int policy) { public void maybeUpdateHiddenApiEnforcementPolicy(@HiddenApiEnforcementPolicy int policy) {

2
tools/hiddenapi/generate_hiddenapi_lists.py
View File

@@ -26,6 +26,7 @@ FLAG_WHITELIST = "whitelist"
FLAG_GREYLIST = "greylist" FLAG_GREYLIST = "greylist"
FLAG_BLACKLIST = "blacklist" FLAG_BLACKLIST = "blacklist"
FLAG_GREYLIST_MAX_O = "greylist-max-o" FLAG_GREYLIST_MAX_O = "greylist-max-o"
FLAG_GREYLIST_MAX_P = "greylist-max-p"
# List of all known flags. # List of all known flags.
FLAGS = [ FLAGS = [
@@ -33,6 +34,7 @@ FLAGS = [
FLAG_GREYLIST, FLAG_GREYLIST,
FLAG_BLACKLIST, FLAG_BLACKLIST,
FLAG_GREYLIST_MAX_O, FLAG_GREYLIST_MAX_O,
FLAG_GREYLIST_MAX_P,
] ]
FLAGS_SET = set(FLAGS) FLAGS_SET = set(FLAGS)