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

Commit ac2c9bf4 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Defend against malformed broadcast in NotificationManager."

parents ab864345 5d2eeb11

services/core/java/com/android/server/notification/NotificationManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1045,8 +1045,8 @@ public class NotificationManagerService extends SystemService { 
            } else if (action.equals(Intent.ACTION_SCREEN_OFF)) {

                mScreenOn = false;

            } else if (action.equals(TelephonyManager.ACTION_PHONE_STATE_CHANGED)) {

                mInCall = (intent.getStringExtra(TelephonyManager.EXTRA_STATE).equals(

                        TelephonyManager.EXTRA_STATE_OFFHOOK));

                mInCall = TelephonyManager.EXTRA_STATE_OFFHOOK

                        .equals(intent.getStringExtra(TelephonyManager.EXTRA_STATE));

                updateNotificationPulse();

            } else if (action.equals(Intent.ACTION_USER_STOPPED)) {

                int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1);