diff options
| author | Cody Kesting <ckesting@google.com> | 2021-02-17 18:49:23 -0800 |
|---|---|---|
| committer | Cody Kesting <ckesting@google.com> | 2021-02-18 16:40:54 -0800 |
| commit | a4c27eea1a8e023d013917c076c5540098d7d49a (patch) | |
| tree | a9338f0600a9ccb323e859d7e1d2dee5fbf5d9f5 | |
| parent | 901dc86e4b8f43163ba425d244271595c1d0b664 (diff) | |
Change Exception class references to use Class.getName().
This CL updates references to fully qualified Exception names (such as
"java.lang.RuntimeException") to get the Exception name through the
Exception's Class Object (e.g. RuntimeException.class.getName()).
Bug: 163433613
Test: atest FrameworksVcntests
Change-Id: I1ceccedda0a513a8c41caaef752d9f0005eceac0
| -rw-r--r-- | services/core/java/com/android/server/vcn/VcnGatewayConnection.java | 6 | ||||
| -rw-r--r-- | tests/vcn/java/android/net/vcn/VcnManagerTest.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java index 9ee072ee7ce5..06748a3aa2d1 100644 --- a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java +++ b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java @@ -969,7 +969,7 @@ public class VcnGatewayConnection extends StateMachine { mGatewayStatusCallback.onGatewayConnectionError( mConnectionConfig.getRequiredUnderlyingCapabilities(), VCN_ERROR_CODE_INTERNAL_ERROR, - "java.lang.RuntimeException", + RuntimeException.class.getName(), "Received " + exception.getClass().getSimpleName() + " with message: " @@ -991,11 +991,11 @@ public class VcnGatewayConnection extends StateMachine { } else if (exception instanceof IkeInternalException && exception.getCause() instanceof IOException) { errorCode = VCN_ERROR_CODE_NETWORK_ERROR; - exceptionClass = "java.io.IOException"; + exceptionClass = IOException.class.getName(); exceptionMessage = exception.getCause().getMessage(); } else { errorCode = VCN_ERROR_CODE_INTERNAL_ERROR; - exceptionClass = "java.lang.RuntimeException"; + exceptionClass = RuntimeException.class.getName(); exceptionMessage = "Received " + exception.getClass().getSimpleName() diff --git a/tests/vcn/java/android/net/vcn/VcnManagerTest.java b/tests/vcn/java/android/net/vcn/VcnManagerTest.java index 708767605508..ce8a898de2ed 100644 --- a/tests/vcn/java/android/net/vcn/VcnManagerTest.java +++ b/tests/vcn/java/android/net/vcn/VcnManagerTest.java @@ -207,7 +207,7 @@ public class VcnManagerTest { cbBinder.onGatewayConnectionError( UNDERLYING_NETWORK_CAPABILITIES, VcnManager.VCN_ERROR_CODE_NETWORK_ERROR, - "java.net.UnknownHostException", + UnknownHostException.class.getName(), "exception_message"); verify(mMockStatusCallback) .onGatewayConnectionError( |