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

Commit 95dd2538 authored by Richard MacGregor's avatar Richard MacGregor Committed by Android (Google) Code Review
Browse files

Merge "Add global setting for disabling screenshare protections" into main

parents c8e43a1b 7998fd93

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -18160,6 +18160,16 @@ public final class Settings { 
        public static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS =

                "show_notification_channel_warnings";













        /**













         * Whether to disable app and notification screen share protections.













         *













         * The value 1 - enable, 0 - disable













         * @hide













         */













        @Readable













        public static final String DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS =













                "disable_screen_share_protections_for_apps_and_notifications";



























        /**















         * Whether cell is enabled/disabled















         * @hide

























core/proto/android/providers/settings/global.proto



+1
−0




























Original line number
Diff line number
Diff line








@@ -723,6 +723,7 @@ message GlobalSettingsProto {













        // encoded as a key=value list separated by commas.















        optional SettingProto smart_suggestions_in_notifications_flags = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto bubbles = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto disable_screen_share_protections_for_apps_and_notifications = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];















    }















    optional Notification notification = 82;

















































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



+4
−0




























Original line number
Diff line number
Diff line








@@ -1113,6 +1113,10 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS,















                GlobalSettingsProto.Notification.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS);













        dumpSetting(s, p,













                Settings.Global.DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS,













                GlobalSettingsProto.Notification













                        .DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS);















        p.end(notificationToken);































        dumpSetting(s, p,

































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



+1
−0




























Original line number
Diff line number
Diff line








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













                    Settings.Global.DEVELOPMENT_WM_DISPLAY_SETTINGS_PATH,















                    Settings.Global.DEVICE_DEMO_MODE,















                    Settings.Global.DEVICE_IDLE_CONSTANTS,













                    Settings.Global.DISABLE_SCREEN_SHARE_PROTECTIONS_FOR_APPS_AND_NOTIFICATIONS,















                    Settings.Global.DISABLE_WINDOW_BLURS,















                    Settings.Global.BATTERY_SAVER_CONSTANTS,















                    Settings.Global.BATTERY_TIP_CONSTANTS,