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

Commit ad954091 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix SettingsIncidentTest#testBasicStructure"

parents e9a69b56 490d671f

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

+2 −1
Original line number Diff line number Diff line
@@ -2185,13 +2185,14 @@ class SettingsProtoDumpUtil { 
                Settings.Secure.NAVIGATION_MODE,

                SecureSettingsProto.NAVIGATION_MODE);



        final long gestureNavToken = p.start(SecureSettingsProto.GESTURE_NAVIGATION);

        dumpSetting(s, p,

                Settings.Secure.BACK_GESTURE_INSET_SCALE_LEFT,

                SecureSettingsProto.GestureNavigation.BACK_GESTURE_INSET_SCALE_LEFT);



        dumpSetting(s, p,

                Settings.Secure.BACK_GESTURE_INSET_SCALE_RIGHT,

                SecureSettingsProto.GestureNavigation.BACK_GESTURE_INSET_SCALE_RIGHT);

        p.end(gestureNavToken);



        final long nfcPaymentToken = p.start(SecureSettingsProto.NFC_PAYMENT);

        dumpSetting(s, p,