Merge "WifiStateTracker: handle RejectedExecutionException" into oc-dr1-dev

1 files changed, 4 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiStateTracker.java b/service/java/com/android/server/wifi/WifiStateTracker.java
index 317aa262a..479d169ef 100644
--- a/service/java/com/android/server/wifi/WifiStateTracker.java
+++ b/service/java/com/android/server/wifi/WifiStateTracker.java
@@ -22,6 +22,8 @@ import android.util.Log;
 
 import com.android.internal.app.IBatteryStats;
 
+import java.util.concurrent.RejectedExecutionException;
+
 /**
  * This class is used to track WifiState to update BatteryStats
  */
@@ -46,6 +48,8 @@ public class WifiStateTracker {
             mBatteryStats.noteWifiState(state, null);
         } catch (RemoteException e) {
             Log.e(TAG, "Battery stats unreachable " + e.getMessage());
+        } catch (RejectedExecutionException e) {
+            Log.e(TAG, "Battery stats executor is being shutdown " + e.getMessage());
         }
     }