Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update exception type thrown when NetworkStack is missing" into qt-dev

Browse Source
This commit is contained in:
Chiachang Wang
2019-04-25 08:46:01 +00:00
committed by Android (Google) Code Review
parent 5a6f9dc608 f5b7a8547e
commit 533f3bcdba
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 {
nai.networkMonitor().notifyPrivateDnsChanged(cfg.toParcel());
} catch (RemoteException e) {
e.rethrowFromSystemServer();
e.rethrowAsRuntimeException();
}
// With Private DNS bypass support, we can proceed to update the
@@ -3032,7 +3032,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try {
nai.networkMonitor().notifyNetworkDisconnected();
} catch (RemoteException e) {
e.rethrowFromSystemServer();
e.rethrowAsRuntimeException();
}
mNetworkAgentInfos.remove(nai.messenger);
nai.clatd.update();
@@ -3421,7 +3421,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try {
nai.networkMonitor().setAcceptPartialConnectivity();
} catch (RemoteException e) {
e.rethrowFromSystemServer();
e.rethrowAsRuntimeException();
}
}
}
@@ -3457,7 +3457,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try {
nai.networkMonitor().launchCaptivePortalApp();
} catch (RemoteException e) {
e.rethrowFromSystemServer();
e.rethrowAsRuntimeException();
}
});
}
@@ -4085,7 +4085,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try {
nai.networkMonitor().forceReevaluation(uid);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
e.rethrowAsRuntimeException();
}
}
@@ -5458,7 +5458,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try {
networkMonitor.start();
} catch (RemoteException e) {
e.rethrowFromSystemServer();
e.rethrowAsRuntimeException();
}
nai.asyncChannel.connect(mContext, mTrackerHandler, nai.messenger);
NetworkInfo networkInfo = nai.networkInfo;
@@ -5515,7 +5515,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try {
networkAgent.networkMonitor().notifyLinkPropertiesChanged(newLp);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
e.rethrowAsRuntimeException();
}
if (networkAgent.everConnected) {
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);
@@ -6521,7 +6521,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
networkAgent.networkMonitor().notifyNetworkConnected(
networkAgent.linkProperties, networkAgent.networkCapabilities);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
e.rethrowAsRuntimeException();
}
scheduleUnvalidatedPrompt(networkAgent);