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

Commit 55ff960b authored by Annie Chin's avatar Annie Chin Committed by Android Git Automerger
Browse files

am 2ed04c67: Add AlarmInstance null check in AlarmActivity.onResume. 

* commit '2ed04c67':
  Add AlarmInstance null check in AlarmActivity.onResume.
parents 3923198f 2ed04c67

src/com/android/deskclock/alarms/AlarmActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -250,6 +250,12 @@ public class AlarmActivity extends AppCompatActivity 
        final long instanceId = AlarmInstance.getId(getIntent().getData());

        mAlarmInstance = AlarmInstance.getInstance(getContentResolver(), instanceId);



        if (mAlarmInstance == null) {

            LogUtils.i(LOGTAG, "No alarm instance for instanceId: %d", instanceId);

            finish();

            return;

        }



        // Verify that the alarm is still firing before showing the activity

        if (mAlarmInstance.mAlarmState != AlarmInstance.FIRED_STATE) {

            LogUtils.i(LOGTAG, "Skip displaying alarm for instance: %s", mAlarmInstance);