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

Commit 6477215e authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Handle null pointer cases in ConnectivityService" am: 452dc837 am:... 

Merge "Handle null pointer cases in ConnectivityService" am: 452dc837 am: b3087508 am: dddb56c9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669646

Change-Id: I8460ed44fb1bc72a8533d2e57012ccc623f8ca73
parents 0c526ae8 dddb56c9

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

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

    public int registerNetworkProvider(Messenger messenger, String name) {

        enforceNetworkFactoryOrSettingsPermission();

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

        NetworkProviderInfo npi = new NetworkProviderInfo(name, messenger,

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

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

    public void unregisterConnectivityDiagnosticsCallback(

            @NonNull IConnectivityDiagnosticsCallback callback) {

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

        mConnectivityDiagnosticsHandler.sendMessage(

                mConnectivityDiagnosticsHandler.obtainMessage(

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

    @Override

    public void unregisterQosCallback(@NonNull final IQosCallback callback) {

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

        mQosCallbackTracker.unregisterCallback(callback);

    }