Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev

Browse Source 
* commit 'c16fd06ae462f79d3f13eb5e29db3227c0e64985':
  Resource for setting default NFC payment component.
This commit is contained in:
Martijn Coenen
2015-07-29 10:06:14 +00:00
committed by Android Git Automerger
parent 5b0656556a c16fd06ae4
commit ef3614ebb9
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -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>

20
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -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.