From 5d2eeb111a6e1e46a1fd25c73f55caa408fa8303 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Thu, 16 Jan 2014 10:46:36 -0500 Subject: [PATCH] Defend against malformed broadcast in NotificationManager. Bug:12583158 Change-Id: I4b10e19b9a23ff8e950006b3b3496bd6800346ea --- .../server/notification/NotificationManagerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index db4cf31d7dadf..e4ea0338c82c6 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -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);