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

Commit f40fd8ad authored by Vincent Wang's avatar Vincent Wang Committed by Android (Google) Code Review
Browse files

Merge "Add screen_off_udfps_enabled into secure.proto" into main

parents 767ff220 7b04ac5d

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

+3 −1
Original line number Diff line number Diff line
@@ -567,6 +567,8 @@ message SecureSettingsProto { 
    // value.

    optional SettingProto rtt_calling_mode = 69 [ (android.privacy).dest = DEST_AUTOMATIC ];



    optional SettingProto screen_off_udfps_enabled = 104 [ (android.privacy).dest = DEST_AUTOMATIC ];



    message Screensaver {

        option (android.msg_privacy).dest = DEST_EXPLICIT;
@@ -744,5 +746,5 @@ message SecureSettingsProto { 


    // Please insert fields in alphabetical order and group them into messages

    // if possible (to avoid reaching the method limit).

    // Next tag = 104;

    // Next tag = 105;

}

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

+7 −0
Original line number Diff line number Diff line
@@ -2520,6 +2520,13 @@ class SettingsProtoDumpUtil { 
                Settings.Secure.RTT_CALLING_MODE,

                SecureSettingsProto.RTT_CALLING_MODE);



        final long screenoffudfpsenabledToken = p.start(

                SecureSettingsProto.SCREEN_OFF_UDFPS_ENABLED);

        dumpSetting(s, p,

                Settings.Secure.SCREEN_OFF_UNLOCK_UDFPS_ENABLED,

                SecureSettingsProto.SCREEN_OFF_UDFPS_ENABLED);

        p.end(screenoffudfpsenabledToken);



        final long screensaverToken = p.start(SecureSettingsProto.SCREENSAVER);

        dumpSetting(s, p,

                Settings.Secure.SCREENSAVER_ENABLED,