commit b1ef6f7a8fcade4cce3ef6d4732a1dc8323869ef
author Lorenzo Colitti <lorenzo@google.com> Wed Feb 27 10:35:10 2019 +0900
committer Lorenzo Colitti <lorenzo@google.com> Wed Feb 27 18:21:22 2019 +0900
tree a7af6db5b9b57cbf1c107b991b826bfb17978a6f
parent 714b7865855a7e63d65ad292cd3e22df4b33e915

Catch ServiceSpecificException instead of IllegalStateException.

The old NetworkManagementService methods to start clatd threw
IllegalStateException, but the new netd methods throw
ServiceSpecificException. Update the catch clauses so that if
starting clatd fails, the system doesn't crash.

Also stop logging stack traces but only include the exception
message itself.

Bug: 65674744
Test: atest FrameworksNetTests
Test: connecting/disconnecting to v6-only wifi in a loop does not crash
Change-Id: I4a9ec7f104712fbbe08f4f67e3288df03e8ed873

services/core/java/com/android/server/connectivity/Nat464Xlat.java

diff --git a/services/core/java/com/android/server/connectivity/Nat464Xlat.java b/services/core/java/com/android/server/connectivity/Nat464Xlat.java
index 2ae14a9..2646d76 100644
--- a/services/core/java/com/android/server/connectivity/Nat464Xlat.java
+++ b/services/core/java/com/android/server/connectivity/Nat464Xlat.java
@@ -175,8 +175,8 @@
         String addrStr = null;
         try {
             addrStr = mNetd.clatdStart(baseIface, mNat64Prefix.toString());
-        } catch (RemoteException | IllegalStateException e) {
-            Slog.e(TAG, "Error starting clatd on " + baseIface, e);
+        } catch (RemoteException | ServiceSpecificException e) {
+            Slog.e(TAG, "Error starting clatd on " + baseIface + ": " + e);
         }
         mIface = CLAT_PREFIX + baseIface;
         mBaseIface = baseIface;
@@ -203,7 +203,7 @@
         try {
             mNMService.unregisterObserver(this);
         } catch (RemoteException | IllegalStateException e) {
-            Slog.e(TAG, "Error unregistering clatd observer on " + mBaseIface, e);
+            Slog.e(TAG, "Error unregistering clatd observer on " + mBaseIface + ": " + e);
         }
         mIface = null;
         mBaseIface = null;
@@ -248,8 +248,8 @@
         Slog.i(TAG, "Stopping clatd on " + mBaseIface);
         try {
             mNetd.clatdStop(mBaseIface);
-        } catch (RemoteException | IllegalStateException e) {
-            Slog.e(TAG, "Error stopping clatd on " + mBaseIface, e);
+        } catch (RemoteException | ServiceSpecificException e) {
+            Slog.e(TAG, "Error stopping clatd on " + mBaseIface + ": " + e);
         }
 
         String iface = mIface;
@@ -272,7 +272,7 @@
             mNetd.resolverStartPrefix64Discovery(getNetId());
             mState = State.DISCOVERING;
         } catch (RemoteException | ServiceSpecificException e) {
-            Slog.e(TAG, "Error starting prefix discovery on netId " + getNetId(), e);
+            Slog.e(TAG, "Error starting prefix discovery on netId " + getNetId() + ": " + e);
         }
     }
 
@@ -280,7 +280,7 @@
         try {
             mNetd.resolverStopPrefix64Discovery(getNetId());
         } catch (RemoteException | ServiceSpecificException e) {
-            Slog.e(TAG, "Error stopping prefix discovery on netId " + getNetId(), e);
+            Slog.e(TAG, "Error stopping prefix discovery on netId " + getNetId() + ": " + e);
         }
     }