Raman Tenneti 31a61f6348 Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev ...

On 9/28 CL https://googleplex-android-review.git.corp.google.com/5116913 was checked into pi-dev. Merge was bad(couple of lines were lost during merge).

  https://b.corp.google.com/issues/35655737#comment34

Adding LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS and LOCK_SCREEN_SHOW_NOTIFICATIONS to SETTINGS_TO_BACKUP array. This fixes apct/framework/presubmit test failure.

Bug: 35655737
Bug: 118674794
Test: presubmit unit tests
Change-Id: I2e9cc95e8827e72ef3c09910d4d3e089bde375e5
Merged-In: I421c7487955ee339f88e3957c973375d0f87e2ff
(cherry picked from commit 33a11bd0e3)

2019-02-19 22:17:12 +00:00

..

AlarmClock.java

…

BaseColumns.java

…

BlockedNumberContract.java

Update BlockedNumberContract to indicate why a call was blocked.

2018-08-20 13:45:36 -07:00

Browser.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

BrowserContract.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

CalendarContract.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

CallLog.java

Add connect time to conference participant.

2019-02-04 10:14:49 -08:00

Contacts.java

…

ContactsContract.java

DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into

2019-02-14 09:48:06 -08:00

ContactsInternal.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

DocumentsContract.java

DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into

2019-02-14 09:48:06 -08:00

DocumentsProvider.java

DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into

2019-02-14 09:48:06 -08:00

Downloads.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

FontRequest.java

…

FontsContract.java

…

LiveFolders.java

…

MediaStore.java

Color aspects keys information stored database

2018-10-23 22:03:30 +00:00

MetadataReader.java

…

OneTimeUseBuilder.java

…

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

docs: fixed instances of typo in 'overridden'

2018-09-13 11:40:59 -07:00

SearchRecentSuggestions.java

…

Settings.java

Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev

2019-02-19 22:17:12 +00:00

SettingsSlicesContract.java

…

SettingsStringUtil.java

…

SettingsValidators.java

Allow restore of settings with nullable components

2018-05-22 11:11:58 +01:00

SyncConstValue.java

…

SyncStateContract.java

…

TimeZoneRulesDataContract.java

…

UserDictionary.java

…

VoicemailContract.java

…