summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
diff options
context:
space:
mode:
authorMatthew Fritze <mfritze@google.com>2017-07-24 14:58:36 -0700
committerMatthew Fritze <mfritze@google.com>2017-07-25 10:44:15 -0700
commit458bb887e130926f36d8926ea8462ecfbfd1e0ef (patch)
treebadceab470f37d8f195b2502c1af89a086842e9a /src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
parent96a14ff07e7997d560235ed271076ee4b7087c33 (diff)
downloadpackages_apps_Settings-458bb887e130926f36d8926ea8462ecfbfd1e0ef.tar.gz
packages_apps_Settings-458bb887e130926f36d8926ea8462ecfbfd1e0ef.tar.bz2
packages_apps_Settings-458bb887e130926f36d8926ea8462ecfbfd1e0ef.zip
Add default value to inline payloads
If we try to set an inline result when it has not yet been accessed in settings, nothing is read from Settings. Thus, include a default value for a fallback. Manual merge for: ag/2588219/ Change-Id: I3b8eea4f82764852cea642db4455ba57f10a7d37 Fixes: 63955012 Test: robotests
Diffstat (limited to 'src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java')
-rw-r--r--src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index 161e63e518..53898e876b 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -87,6 +87,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends
mContext.getString(R.string.ambient_display_screen_title));
return new InlineSwitchPayload(Settings.Secure.DOZE_ALWAYS_ON,
- ResultPayload.SettingsSource.SECURE, ON, intent, isAvailable());
+ ResultPayload.SettingsSource.SECURE, ON /* onValue */, intent, isAvailable(),
+ ON /* defaultValue */);
}
}