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

Commit 8bc4eafd authored by David Nelloms's avatar David Nelloms Committed by Android (Google) Code Review
Browse files

Merge "Correct null check for end button behavior."

parents 328099b0 edb31e13

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

+2 −2
Original line number Diff line number Diff line
@@ -3285,8 +3285,8 @@ public class SettingsProvider extends ContentProvider { 
                if (currentVersion == 133) {

                    // Version 133: Add default end button behavior

                    final SettingsState systemSettings = getSystemSettingsLocked(userId);

                    if (systemSettings.getSettingLocked(Settings.System.END_BUTTON_BEHAVIOR) ==

                            null) {

                    if (systemSettings.getSettingLocked(Settings.System.END_BUTTON_BEHAVIOR)

                            .isNull()) {

                        String defaultEndButtonBehavior = Integer.toString(getContext()

                                .getResources().getInteger(R.integer.def_end_button_behavior));

                        systemSettings.insertSettingLocked(Settings.System.END_BUTTON_BEHAVIOR,