diff options
author | 2019-10-30 14:33:01 -0700 | |
---|---|---|
committer | 2019-10-30 14:33:01 -0700 | |
commit | 6f48900f503afcc976a079d8aaed4643e37e75cc (patch) | |
tree | ad343070a9ef9cacc84e7e00257665d02a058304 /api | |
parent | 02e3db14995c7da89f1ab57d288fd2a6d31082a3 (diff) | |
parent | c5a675dbaadffa7088766fec9b04d2b21cfb6df4 (diff) |
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
Diffstat (limited to 'api')
-rw-r--r-- | api/Android.bp | 7 | ||||
-rw-r--r-- | api/test-current.txt | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/api/Android.bp b/api/Android.bp new file mode 100644 index 000000000000..54ff82c97e17 --- /dev/null +++ b/api/Android.bp @@ -0,0 +1,7 @@ +genrule { + name: "current-api-xml", + tools: ["metalava"], + srcs: ["current.txt"], + out: ["current.api"], + cmd: "$(location metalava) --no-banner -convert2xmlnostrip $(in) $(out)", +} diff --git a/api/test-current.txt b/api/test-current.txt index 716f0c68dbc3..f40b3246a3df 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2347,6 +2347,7 @@ package android.provider { field public static final String LOCATION_IGNORE_SETTINGS_PACKAGE_WHITELIST = "location_ignore_settings_package_whitelist"; field public static final String LOW_POWER_MODE = "low_power"; field public static final String LOW_POWER_MODE_STICKY = "low_power_sticky"; + field public static final String NOTIFICATION_BUBBLES = "notification_bubbles"; field public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices"; field public static final String USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package"; } @@ -2370,7 +2371,7 @@ package android.provider { field public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis"; field public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis"; field public static final String NOTIFICATION_BADGING = "notification_badging"; - field public static final String NOTIFICATION_BUBBLES = "notification_bubbles"; + field @Deprecated public static final String NOTIFICATION_BUBBLES = "notification_bubbles"; field @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds"; field public static final String USER_SETUP_COMPLETE = "user_setup_complete"; field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service"; |