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

Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev

Browse Source 
am: 268c6c6ca6

Change-Id: Ie87db0cde5fe606c31d4cfd3540adafdd98147ac
This commit is contained in:
Beverly
2017-08-18 14:13:20 +00:00
committed by android-build-merger
parent 2d9251f32f 268c6c6ca6
commit 7ba9e9f849
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/ZenModeRuleSettingsBase.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.notification; package com.android.settings.notification;
import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AutomaticZenRule; import android.app.AutomaticZenRule;
import android.app.NotificationManager; import android.app.NotificationManager;
@@ -262,8 +263,14 @@ public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase
} }
private void updateRuleName() { private void updateRuleName() {
getActivity().setTitle(mRule.getName()); Activity activity = getActivity();
if (activity != null) {
activity.setTitle(mRule.getName());
mRuleName.setSummary(mRule.getName()); mRuleName.setSummary(mRule.getName());
} else {
if (DEBUG) Log.d(TAG, "updateRuleName - activity title and mRuleName "
+ "not updated; getActivity() returned null");
}
} }
private AutomaticZenRule getZenRule() { private AutomaticZenRule getZenRule() {