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

Commit 7ab4b7fd authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Resource for setting default NFC payment component. 

Bug: 22756856
Change-Id: If97e0faead995fb95893a128c1890b61bbe86ce5
parent 7fe86c47

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
@@ -1847,7 +1847,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;
@@ -1979,6 +1979,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.