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

Commit 0f2b7fd2 authored by Alan Stokes's avatar Alan Stokes Committed by Android (Google) Code Review
Browse files

Merge "Delete PACKAGE_VERIFIER_USER_CONSENT from Settings."

parents 07dc98a7 31eb1596

core/java/android/provider/Settings.java

+0 −10
Original line number Diff line number Diff line
@@ -7178,16 +7178,6 @@ public final class Settings { 
        @UnsupportedAppUsage

        public static final String VOICE_RECOGNITION_SERVICE = "voice_recognition_service";













        /**













         * Stores whether an user has consented to have apps verified through PAM.













         * The value is boolean (1 or 0).













         *













         * @hide













         */













        @UnsupportedAppUsage













        public static final String PACKAGE_VERIFIER_USER_CONSENT =













            "package_verifier_user_consent";



























        /**















         * The {@link ComponentName} string of the selected spell checker service which is















         * one of the services managed by the text service manager.

































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



+0
−6




























Original line number
Diff line number
Diff line








@@ -2248,12 +2248,6 @@ class SettingsProtoDumpUtil {













                SecureSettingsProto.Notification.IN_CALL_NOTIFICATION_ENABLED);















        p.end(notificationToken);





























        final long packageVerifierToken = p.start(SecureSettingsProto.PACKAGE_VERIFIER);













        dumpSetting(s, p,













                Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,













                SecureSettingsProto.PackageVerifier.USER_CONSENT);













        p.end(packageVerifierToken);





























        final long parentalControlToken = p.start(SecureSettingsProto.PARENTAL_CONTROL);















        dumpSetting(s, p,















                Settings.Secure.PARENTAL_CONTROL_ENABLED,

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








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













                 Settings.Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,















                 Settings.Secure.NUM_ROTATION_SUGGESTIONS_ACCEPTED,















                 Settings.Secure.ODI_CAPTIONS_ENABLED,













                 Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,















                 Settings.Secure.PARENTAL_CONTROL_LAST_UPDATE,















                 Settings.Secure.PAYMENT_SERVICE_SEARCH_URI,















                 Settings.Secure.PRINT_SERVICE_SEARCH_URI,