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

Commit d49230d8 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Remove hard-coded NetworkStack package name" 

am: e765e8b7

Change-Id: I0e67a5e857d4f5ba2af1f0928be6d97c0f4ce94f
parents 7282c21b e765e8b7

core/java/android/net/INetworkMonitorCallbacks.aidl

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ oneway interface INetworkMonitorCallbacks { 
    void onNetworkMonitorCreated(in INetworkMonitor networkMonitor);

    void notifyNetworkTested(int testResult, @nullable String redirectUrl);

    void notifyPrivateDnsConfigResolved(in PrivateDnsConfigParcel config);

    void showProvisioningNotification(String action);

    void showProvisioningNotification(String action, String packageName);

    void hideProvisioningNotification();

    void logCaptivePortalLoginEvent(int eventId, String packageName);

}
 
 No newline at end of file

core/java/android/net/NetworkStack.java

+0 −3
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ public class NetworkStack { 
    public static final String PERMISSION_MAINLINE_NETWORK_STACK =

            "android.permission.MAINLINE_NETWORK_STACK";



    /** @hide */

    public static final String NETWORKSTACK_PACKAGE_NAME = "com.android.mainline.networkstack";



    private static final int NETWORKSTACK_TIMEOUT_MS = 10_000;



    @NonNull

packages/NetworkStack/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);

        }

packages/NetworkStack/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();

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

+2 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; 
import static android.net.NetworkCapabilities.TRANSPORT_VPN;

import static android.net.NetworkPolicyManager.RULE_NONE;

import static android.net.NetworkPolicyManager.uidRulesToString;

import static android.net.NetworkStack.NETWORKSTACK_PACKAGE_NAME;

import static android.net.shared.NetworkMonitorUtils.isValidationRequired;

import static android.net.shared.NetworkParcelableUtil.toStableParcelable;

import static android.os.Process.INVALID_UID;
@@ -2666,9 +2665,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }



        @Override

        public void showProvisioningNotification(String action) {

        public void showProvisioningNotification(String action, String packageName) {

            final Intent intent = new Intent(action);

            intent.setPackage(NETWORKSTACK_PACKAGE_NAME);

            intent.setPackage(packageName);



            final PendingIntent pendingIntent;

            // Only the system server can register notifications with package "android"