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

Merge "Add null check to avoid settings crash" into qt-dev

Browse Source 
am: a02cbbf23f

Change-Id: I2f142ae998946dd84fbb4c0e46b3d48b94b0ade3
This commit is contained in:
Beverly
2019-04-30 17:26:59 -07:00
committed by android-build-merger
parent e1a84e5c23 a02cbbf23f
commit 532ba82f14
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
View File

@@ -123,11 +123,14 @@ abstract public class AbstractZenModeAutomaticRulePreferenceController extends
return new ComponentName(ci.packageName, ci.name);
}
// old service backed rule
final String configurationActivity =
ci.metaData.getString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
if (configurationActivity != null) {
return ComponentName.unflattenFromString(configurationActivity);
if (ci.metaData != null) {
final String configurationActivity = ci.metaData.getString(
ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
if (configurationActivity != null) {
return ComponentName.unflattenFromString(configurationActivity);
}
}
return null;
}