Merge "Fix null intent handling" into nyc-dev

am: 8adf99d607

* commit '8adf99d607e2ee41513fa63a4b8a7118b22ab928':
  Fix null intent handling

Change-Id: Ifb1c23c65842e42df2c20c84ad0ee1181939beed

1 files changed, 7 insertions, 4 deletions

diff --git a/service/java/com/android/server/wifi/WifiTrafficPoller.java b/service/java/com/android/server/wifi/WifiTrafficPoller.java
index 38ec1a5b6..336e0d786 100644
--- a/service/java/com/android/server/wifi/WifiTrafficPoller.java
+++ b/service/java/com/android/server/wifi/WifiTrafficPoller.java
@@ -84,13 +84,16 @@ final class WifiTrafficPoller {
                 new BroadcastReceiver() {
                     @Override
                     public void onReceive(Context context, Intent intent) {
-                        if (intent.getAction().equals(
-                                WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
+                        if (intent == null) {
+                            return;
+                        }
+                        if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(
+                                intent.getAction())) {
                             mNetworkInfo = (NetworkInfo) intent.getParcelableExtra(
                                     WifiManager.EXTRA_NETWORK_INFO);
-                        } else if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) {
+                        } else if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) {
                             mScreenOn.set(false);
-                        } else if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) {
+                        } else if (Intent.ACTION_SCREEN_ON.equals(intent.getAction())) {
                             mScreenOn.set(true);
                         }
                         evaluateTrafficStatsPolling();