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

Commit 07bbe0c5 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Remove hard-coded NetworkStack package name"

parents 4abf31ae 1e3eb37e

src/com/android/server/connectivity/NetworkMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ public class NetworkMonitor extends StateMachine { 


    private void showProvisioningNotification(String action) {

        try {

            mCallback.showProvisioningNotification(action);

            mCallback.showProvisioningNotification(action, mContext.getPackageName());

        } catch (RemoteException e) {

            Log.e(TAG, "Error showing provisioning notification", e);

        }

tests/src/com/android/server/connectivity/NetworkMonitorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ public class NetworkMonitorTest { 
        nm.notifyNetworkConnected();



        verify(mCallbacks, timeout(HANDLER_TIMEOUT_MS).times(1))

                .showProvisioningNotification(any());

                .showProvisioningNotification(any(), any());



        // Check that startCaptivePortalApp sends the expected intent.

        nm.launchCaptivePortalApp();