commit e5d998f9fb7d00efb92ee7a0f242a4b13d9e87ed
author Philip P. Moltmann <moltmann@google.com> Fri Mar 01 09:42:53 2019 -0800
committer Philip P. Moltmann <moltmann@google.com> Wed Mar 06 19:50:32 2019 -0800
tree 2f1b46c7e1bb82e0dd988cb556e776e8e02aa756
parent 319c4ee45c9307c245781af9a1de4531c0f3e64d

Control revoke-on-upgrade behavior for loc perm

By default: Revoke on upgrade, but can be disabled by setting the
location_permissions_upgrade_to_Q_mode to anything but 0.

Fixes: 127285709
Test: Upgraded from P to Q with and without
      location_permissions_upgrade_to_Q_mode set
      atest --test-mapping frameworks/base/core/java/android/provider:presubmit
Change-Id: I4dd1772e78f46c881a5f747fcf61583beec2d6a2

core/tests/coretests/src/android/provider/SettingsBackupTest.java

diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index ad1403d..9d34b11 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -643,6 +643,7 @@
                  Settings.Secure.LAST_SETUP_SHOWN,
                  Settings.Secure.LOCATION_CHANGER,
                  Settings.Secure.LOCATION_MODE,
+                 Settings.Secure.LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE,
                  Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT, // Candidate?
                  Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT,
                  Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,