LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update exception type thrown when NetworkStack is missing

Browse Source 
rethrowFromSystemServer is throwing DeadSystemException which
is different from the original log message. Thus, update the
way to rethrow the same RemoteException.

Bug: 130028724
Test: atest FrameworksNetTest
Test: Kill NetworkStack and check the log message
Change-Id: I60862e276dd4e2d143278b272a9ba54219acce26
Merged-In: Ic1766e839f8f06b539d5f6cfecd29547021fd1d9
Merged-In: I67005a5384888e8acaf1249af79484e2d5ed6f1f
(cherry picked from commit 7f581219e1a4706ea2b4438322a299986847b1c2)
This commit is contained in:
Chiachang Wang
2019-04-24 22:35:58 -07:00
parent f3420c999f
commit 72d5c3fc4e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2862,7 +2862,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try { try {
nai.networkMonitor().notifyPrivateDnsChanged(cfg.toParcel()); nai.networkMonitor().notifyPrivateDnsChanged(cfg.toParcel());
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowAsRuntimeException();
} }
// With Private DNS bypass support, we can proceed to update the // With Private DNS bypass support, we can proceed to update the
@@ -3032,7 +3032,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try { try {
nai.networkMonitor().notifyNetworkDisconnected(); nai.networkMonitor().notifyNetworkDisconnected();
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowAsRuntimeException();
} }
mNetworkAgentInfos.remove(nai.messenger); mNetworkAgentInfos.remove(nai.messenger);
nai.clatd.update(); nai.clatd.update();
@@ -3421,7 +3421,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try { try {
nai.networkMonitor().setAcceptPartialConnectivity(); nai.networkMonitor().setAcceptPartialConnectivity();
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowAsRuntimeException();
} }
} }
} }
@@ -3457,7 +3457,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try { try {
nai.networkMonitor().launchCaptivePortalApp(); nai.networkMonitor().launchCaptivePortalApp();
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowAsRuntimeException();
} }
}); });
} }
@@ -4085,7 +4085,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try { try {
nai.networkMonitor().forceReevaluation(uid); nai.networkMonitor().forceReevaluation(uid);
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowAsRuntimeException();
} }
} }
@@ -5458,7 +5458,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try { try {
networkMonitor.start(); networkMonitor.start();
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowAsRuntimeException();
} }
nai.asyncChannel.connect(mContext, mTrackerHandler, nai.messenger); nai.asyncChannel.connect(mContext, mTrackerHandler, nai.messenger);
NetworkInfo networkInfo = nai.networkInfo; NetworkInfo networkInfo = nai.networkInfo;
@@ -5515,7 +5515,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try { try {
networkAgent.networkMonitor().notifyLinkPropertiesChanged(newLp); networkAgent.networkMonitor().notifyLinkPropertiesChanged(newLp);
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowAsRuntimeException();
} }
if (networkAgent.everConnected) { if (networkAgent.everConnected) {
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED); notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);
@@ -6521,7 +6521,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
networkAgent.networkMonitor().notifyNetworkConnected( networkAgent.networkMonitor().notifyNetworkConnected(
networkAgent.linkProperties, networkAgent.networkCapabilities); networkAgent.linkProperties, networkAgent.networkCapabilities);
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowAsRuntimeException();
} }
scheduleUnvalidatedPrompt(networkAgent); scheduleUnvalidatedPrompt(networkAgent);