Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 279e8469 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revokeLocOnUpgrade" 

* changes:
  Control revoke-on-upgrade behavior for loc perm
  Revoke location permissions on upgrade from Pre-Q
  No special case for location permission
  Inherit flags when inheriting permission state
parents 07454cc7 e5d998f9

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6117,6 +6117,7 @@ package android.provider { 
    field public static final String LAST_SETUP_SHOWN = "last_setup_shown";

    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 LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE = "location_permissions_upgrade_to_q_mode";

    field public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications";

    field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";

    field public static final String MANUAL_RINGER_TOGGLE_COUNT = "manual_ringer_toggle_count";

core/java/android/provider/Settings.java

+13 −0
Original line number Diff line number Diff line
@@ -8563,6 +8563,19 @@ public final class Settings { 
        public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS =

                "location_access_check_delay_millis";













        /**













         * What should happen to the location permissions when upgraded to Android Q.













         *













         * <ul>













         *     <li>0/unset == revoke permissions</li>













         *     <li>anything else == Don't do anything</li>













         * </ul>













         *













         * @hide













         */













        @SystemApi













        public static final String LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE =













                "location_permissions_upgrade_to_q_mode";





























        /**















         * Comma separated list of enabled overlay packages for all android.theme.customization.*

































core/proto/android/providers/settings/secure.proto



+4
−0






























Original line number
Diff line number
Diff line








@@ -235,6 +235,10 @@ message SecureSettingsProto {













        optional SettingProto mode = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];















        // The App or module that changes the location mode.















        optional SettingProto changer = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];



























        // What should happen to the location permissions when upgraded to Android Q.













        // 0 == revoke permissions. Anything else == do nothing.













        optional SettingProto permissions_upgrade_to_q_mode = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];















    }















    optional Location location = 31;

















































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



+1
−0






























Original line number
Diff line number
Diff line








@@ -643,6 +643,7 @@ public class SettingsBackupTest {













                 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,

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+3
−0






























Original line number
Diff line number
Diff line








@@ -1977,6 +1977,9 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Secure.LOCATION_CHANGER,















                SecureSettingsProto.Location.CHANGER);













        dumpSetting(s, p,













                Settings.Secure.LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE,













                SecureSettingsProto.Location.PERMISSIONS_UPGRADE_TO_Q_MODE);















        p.end(locationToken);































        final long locationAccessCheckToken = p.start(SecureSettingsProto.LOCATION_ACCESS_CHECK);