diff options
| author | 2019-12-02 21:25:07 -0800 | |
|---|---|---|
| committer | 2019-12-02 21:25:07 -0800 | |
| commit | a614e596b1f0cf7d17d06a75f70bc68cf637ccf2 (patch) | |
| tree | 2a6d48ff485fc45324992463a1fe7c0205943866 /api | |
| parent | 3908351777900699e377526b4645f92effbced60 (diff) | |
| parent | 6b30bf8a7f1a56b8db44d9d436d5f7c140bb506a (diff) | |
Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I557701733b49b0f231c89165239ba07c0fa288d2
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 cbc3b6aa3609..eb4fcdb79cc0 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2368,6 +2368,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"; } @@ -2391,7 +2392,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"; |