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

Commit 79664cbf authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Set NetworkIdentity subscriberId on all networks 

Instead of setting NetworkIdentity.subscriberId only on telephony
networks, set it when provided on any network. At the moment only
telephony is expected to have a subscriberId in its NetworkState anyway,
and while there are plans for other network agents (wifi) to have a
subscriberId, it should also be set in that case.

This allows NetworkIdentity to stop depending on hidden network type
APIs to determine if the network is mobile.

Bug: 174436414
Test: atest FrameworksNetTests
Change-Id: I4f09987f8737d1801342eb5d6d7c2b9968b466b0
parent c7556173

core/java/android/net/NetworkIdentity.java

+2 −13
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.net;



import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.ConnectivityManager.isNetworkTypeMobile;



import android.content.Context;

import android.net.wifi.WifiInfo;
@@ -25,7 +24,6 @@ import android.net.wifi.WifiManager; 
import android.os.Build;

import android.service.NetworkIdentityProto;

import android.telephony.Annotation.NetworkType;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;



import java.util.Objects;
@@ -193,18 +191,9 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
        boolean metered = !state.networkCapabilities.hasCapability(

                NetworkCapabilities.NET_CAPABILITY_NOT_METERED);



        if (isNetworkTypeMobile(type)) {

            if (state.subscriberId == null) {

                if (state.networkInfo.getState() != NetworkInfo.State.DISCONNECTED &&

                        state.networkInfo.getState() != NetworkInfo.State.UNKNOWN) {

                    Slog.w(TAG, "Active mobile network without subscriber! ni = "

                            + state.networkInfo);

                }

            }



        subscriberId = state.subscriberId;



        } else if (type == TYPE_WIFI) {

        if (type == TYPE_WIFI) {

            if (state.networkId != null) {

                networkId = state.networkId;

            } else {