| commit | 59defa3c9ea3b47685c935d1b558fafe1561cedd | [log] [tgz] |
|---|---|---|
| author | Raman Tenneti <rtenneti@google.com> | Tue Feb 05 16:34:43 2019 -0800 |
| committer | Alistair Strachan <astrachan@google.com> | Thu May 23 21:48:27 2019 +0000 |
| tree | bd9f80c53832b08bfaa84562348adb1b2cb04e16 | |
| parent | 6e0a87dd56ae8139c3c4f7fb05180fed72fdfee6 [diff] |
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 33a11bd0e3c29937af311bc55bbbe36ee63608f4)