diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-02-05 16:34:43 -0800 |
|---|---|---|
| committer | Julia Reynolds <juliacr@google.com> | 2019-02-19 19:27:12 +0000 |
| commit | 8a39bb142b3955053591e390371e7617485006cb (patch) | |
| tree | f0a4b989739a5116ea240b7a1cf1866460ca785b /rs/java/android/renderscript/ProgramStore.java | |
| parent | efa1d2653830a3e8f76ef441215939dfe3615e68 (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)
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions