Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5b7a854 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Update exception type thrown when NetworkStack is missing 

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 7f581219)
parent bf8aec37

services/core/java/com/android/server/ConnectivityService.java

+8 −8
Original line number Diff line number Diff line
@@ -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);