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

Commit 957b01a0 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Splice subscriber identity into NetworkMisc. 

This gives us a path that strongly ties a network to the underlying
subscriber identity, which is needed for multi-SIM support.

Bug: 18012787
Change-Id: Ie8ddd2bd280af82fa1414c42c9ae4538557ca8a0
parent 13f5f13d

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+7 −4
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.net.LinkProperties; 
import android.net.NetworkAgent;

import android.net.NetworkCapabilities;

import android.net.NetworkInfo;

import android.net.NetworkMisc;

import android.net.ProxyInfo;

import android.os.AsyncResult;

import android.os.Build;
@@ -58,7 +59,6 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.Locale;

import java.util.concurrent.atomic.AtomicInteger;



import java.net.InetAddress;

import java.util.Collection;
@@ -1722,9 +1722,12 @@ public final class DataConnection extends StateMachine { 
                    mNetworkInfo.getReason(), null);

            mNetworkInfo.setExtraInfo(mApnSetting.apn);

            updateTcpBufferSizes(mRilRat);



            final NetworkMisc misc = new NetworkMisc();

            misc.subscriberId = mPhone.getSubscriberId();

            mNetworkAgent = new DcNetworkAgent(getHandler().getLooper(), mPhone.getContext(),

                    "DcNetworkAgent", mNetworkInfo, makeNetworkCapabilities(), mLinkProperties,

                    50);

                    50, misc);

        }



        @Override
@@ -1944,8 +1947,8 @@ public final class DataConnection extends StateMachine { 


    private class DcNetworkAgent extends NetworkAgent {

        public DcNetworkAgent(Looper l, Context c, String TAG, NetworkInfo ni,

                NetworkCapabilities nc, LinkProperties lp, int score) {

            super(l, c, TAG, ni, nc, lp, score);

                NetworkCapabilities nc, LinkProperties lp, int score, NetworkMisc misc) {

            super(l, c, TAG, ni, nc, lp, score, misc);

        }



        protected void unwanted() {