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

Commit c9e15f6e authored by Martijn Coenen's avatar Martijn Coenen Committed by Android Git Automerger
Browse files

am 54d7c4c8: am 619b37a3: am ef3614eb: am c16fd06a: am 50184147: Merge... 

am 54d7c4c8: am 619b37a3: am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev

* commit '54d7c4c8':
  Resource for setting default NFC payment component.
parents 09109567 54d7c4c8

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.