PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash in non-indexable keys collection" into pi-dev am: 66e6e637a4

Browse Source 
am: acc93635c3

Change-Id: I78aab2e3b7bc6f621e2425a88f3787e29f6ec2ff
This commit is contained in:
Matthew Fritze
2018-04-04 17:20:54 -07:00
committed by android-build-merger
parent 8a485f0ada acc93635c3
commit 688ad64e00
4 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
View File

@@ -47,6 +47,9 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
@Override
public int getAvailabilityStatus() {
if (mConfig == null) {
mConfig = new AmbientDisplayConfiguration(mContext);
}
return isAvailable(mConfig) ? AVAILABLE : DISABLED_UNSUPPORTED;
}

3
src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
View File

@@ -81,6 +81,9 @@ public class AmbientDisplayNotificationsPreferenceController extends
@Override
public int getAvailabilityStatus() {
if (mConfig == null) {
mConfig = new AmbientDisplayConfiguration(mContext);
}
return mConfig.pulseOnNotificationAvailable() ? AVAILABLE : DISABLED_UNSUPPORTED;
}