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

Merge "Correct null check for end button behavior."

Browse Source
This commit is contained in:
David Nelloms
2018-09-27 20:54:32 +00:00
committed by Android (Google) Code Review
parent 328099b0ad edb31e130e
commit 8bc4eafd8e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3285,8 +3285,8 @@ public class SettingsProvider extends ContentProvider {
if (currentVersion == 133) {
// Version 133: Add default end button behavior
final SettingsState systemSettings = getSystemSettingsLocked(userId);
if (systemSettings.getSettingLocked(Settings.System.END_BUTTON_BEHAVIOR) ==
null) {
if (systemSettings.getSettingLocked(Settings.System.END_BUTTON_BEHAVIOR)
.isNull()) {
String defaultEndButtonBehavior = Integer.toString(getContext()
.getResources().getInteger(R.integer.def_end_button_behavior));
systemSettings.insertSettingLocked(Settings.System.END_BUTTON_BEHAVIOR,