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

Commit 50184147 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "Resource for setting default NFC payment component." into mnc-dev

parents a7b4d6dc 7ab4b7fd

packages/SettingsProvider/res/values/defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -210,4 +210,6 @@ 
    <!-- Default state of tap to wake -->

    <bool name="def_double_tap_to_wake">true</bool>



    <!-- Default for Settings.Secure.NFC_PAYMENT_COMPONENT -->

    <string name="def_nfc_payment_component"></string>

</resources>

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

+19 −1
Original line number Diff line number Diff line
@@ -1867,7 +1867,7 @@ public class SettingsProvider extends ContentProvider { 
        }



        private final class UpgradeController {

            private static final int SETTINGS_VERSION = 121;

            private static final int SETTINGS_VERSION = 122;



            private final int mUserId;
@@ -1999,6 +1999,24 @@ public class SettingsProvider extends ContentProvider { 
                // here; SettingsState knows how to handle pre-version 120 files.

                currentVersion = 121;



                if (currentVersion == 121) {

                    // Version 122: allow OEMs to set a default payment component in resources.

                    // Note that we only write the default if no default has been set;

                    // if there is, we just leave the default at whatever it currently is.

                    final SettingsState secureSettings = getSecureSettingsLocked(userId);

                    String defaultComponent = (getContext().getResources().getString(

                            R.string.def_nfc_payment_component));

                    Setting currentSetting = secureSettings.getSettingLocked(

                            Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT);

                    if (defaultComponent != null && !defaultComponent.isEmpty() &&

                        currentSetting == null) {

                        secureSettings.insertSettingLocked(

                                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,

                                defaultComponent,

                                SettingsState.SYSTEM_PACKAGE_NAME);

                    }

                    currentVersion = 122;

                }

                // vXXX: Add new settings above this point.



                // Return the current version.