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

Commit 452dc837 authored by Aaron Huang's avatar Aaron Huang Committed by Gerrit Code Review
Browse files

Merge "Handle null pointer cases in ConnectivityService"

parents 40fa3f58 abbee6e7

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -6142,6 +6142,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    @Override

    @Override

    public int registerNetworkProvider(Messenger messenger, String name) {

    public int registerNetworkProvider(Messenger messenger, String name) {

        enforceNetworkFactoryOrSettingsPermission();

        enforceNetworkFactoryOrSettingsPermission();

        Objects.requireNonNull(messenger, "messenger must be non-null");

        NetworkProviderInfo npi = new NetworkProviderInfo(name, messenger,

        NetworkProviderInfo npi = new NetworkProviderInfo(name, messenger,

                nextNetworkProviderId(), () -> unregisterNetworkProvider(messenger));

                nextNetworkProviderId(), () -> unregisterNetworkProvider(messenger));

        mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_PROVIDER, npi));

        mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_PROVIDER, npi));
@@ -9074,6 +9075,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    @Override

    @Override

    public void unregisterConnectivityDiagnosticsCallback(

    public void unregisterConnectivityDiagnosticsCallback(

            @NonNull IConnectivityDiagnosticsCallback callback) {

            @NonNull IConnectivityDiagnosticsCallback callback) {

        Objects.requireNonNull(callback, "callback must be non-null");

        mConnectivityDiagnosticsHandler.sendMessage(

        mConnectivityDiagnosticsHandler.sendMessage(

                mConnectivityDiagnosticsHandler.obtainMessage(

                mConnectivityDiagnosticsHandler.obtainMessage(

                        ConnectivityDiagnosticsHandler

                        ConnectivityDiagnosticsHandler
@@ -9444,6 +9446,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
     */

     */

    @Override

    @Override

    public void unregisterQosCallback(@NonNull final IQosCallback callback) {

    public void unregisterQosCallback(@NonNull final IQosCallback callback) {

        Objects.requireNonNull(callback, "callback must be non-null");

        mQosCallbackTracker.unregisterCallback(callback);

        mQosCallbackTracker.unregisterCallback(callback);

    }

    }