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

Commit 1e3eb37e authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Remove hard-coded NetworkStack package name 

Have the network stack pass its package name in
showProvisioningNotification instead.

Bug: 124033493
Test: flashed, WiFi and captive portal works
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I1f3312768ba1fb34e99a827e1fcdaf7510e318a8
parent 7db6a11f

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

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,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();