Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 268c6c6c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 682ff556 949d8137

src/com/android/settings/notification/ZenModeRuleSettingsBase.java

+9 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.notification;



import android.app.Activity;

import android.app.AlertDialog;

import android.app.AutomaticZenRule;

import android.app.NotificationManager;
@@ -262,8 +263,14 @@ public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase 
    }



    private void updateRuleName() {

        getActivity().setTitle(mRule.getName());

        Activity activity = getActivity();

        if (activity != null) {

            activity.setTitle(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() {