diff options
| author | John Spurlock <jspurlock@google.com> | 2014-01-16 10:46:36 -0500 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-01-16 10:46:36 -0500 |
| commit | 5d2eeb111a6e1e46a1fd25c73f55caa408fa8303 (patch) | |
| tree | c98da176de35e96ca5b3d1e39664fcbc84cc6541 /services/core/java | |
| parent | c46809e9979204aa9a131d8933da23d298411441 (diff) | |
| download | frameworks_base-5d2eeb111a6e1e46a1fd25c73f55caa408fa8303.zip frameworks_base-5d2eeb111a6e1e46a1fd25c73f55caa408fa8303.tar.gz frameworks_base-5d2eeb111a6e1e46a1fd25c73f55caa408fa8303.tar.bz2 | |
Defend against malformed broadcast in NotificationManager.
Bug:12583158
Change-Id: I4b10e19b9a23ff8e950006b3b3496bd6800346ea
Diffstat (limited to 'services/core/java')
| -rw-r--r-- | services/core/java/com/android/server/notification/NotificationManagerService.java | 4 |
1 files 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 db4cf31d..e4ea033 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); |