commit 7109ffadcf870446f6d606513ac6ca66b2ec83b4
author Ye Wen <ywen@google.com> Tue Oct 06 09:18:55 2015 -0700
committer Ye Wen <ywen@google.com> Tue Oct 06 13:27:14 2015 -0700
tree e9a8c6b141d58200721bd70225b8726afb337b85
parent c26d8195e22a474ecef0e15b9707fa398722a167

Catch exception for ConnectivityManager.unregisterNetworkCallback

It is possible ConnectivityManager.requestNetwork may fail silently due
to RemoteException. When that happens, we may get an invalid
NetworkCallback, which causes an IllegalArgumentexception when we try to
unregisterNetworkCallback. This exception in turn causes
MmsNetworkManager to skip the code to clean up states. Thus MMS service
would get stuck in the bad state until the device restarts. This fix
catches the exception so that state clean up can be executed.

b/24306554

Change-Id: I3c0df8dab9af0f7a7f2e647b38f5df29177b7ff8

src/com/android/mms/service/MmsNetworkManager.java

diff --git a/src/com/android/mms/service/MmsNetworkManager.java b/src/com/android/mms/service/MmsNetworkManager.java
index ea2fa90..ed78258 100644
--- a/src/com/android/mms/service/MmsNetworkManager.java
+++ b/src/com/android/mms/service/MmsNetworkManager.java
@@ -185,7 +185,18 @@
     private void releaseRequestLocked(ConnectivityManager.NetworkCallback callback) {
         if (callback != null) {
             final ConnectivityManager connectivityManager = getConnectivityManager();
-            connectivityManager.unregisterNetworkCallback(callback);
+            try {
+                connectivityManager.unregisterNetworkCallback(callback);
+            } catch (IllegalArgumentException e) {
+                // It is possible ConnectivityManager.requestNetwork may fail silently due
+                // to RemoteException. When that happens, we may get an invalid
+                // NetworkCallback, which causes an IllegalArgumentexception when we try to
+                // unregisterNetworkCallback. This exception in turn causes
+                // MmsNetworkManager to skip resetLocked() in the below. Thus MMS service
+                // would get stuck in the bad state until the device restarts. This fix
+                // catches the exception so that state clean up can be executed.
+                LogUtil.w("Unregister network callback exception", e);
+            }
         }
         resetLocked();
     }