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

Commit 1c8fa0e7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5351881 from 48d20c7d to qt-release 

Change-Id: Ia081ca52a52a348ca1788c00268afbff361184bd
parents c7e3f488 48d20c7d

src/java/com/android/internal/telephony/PhoneSwitcher.java

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ public class PhoneSwitcher extends Handler { 
        netCap.addCapability(NetworkCapabilities.NET_CAPABILITY_EIMS);

        netCap.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);

        netCap.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);

        netCap.addCapability(NetworkCapabilities.NET_CAPABILITY_MCX);

        netCap.setNetworkSpecifier(new MatchAllNetworkSpecifier());



        NetworkFactory networkFactory = new PhoneSwitcherNetworkRequestListener(looper, context,

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

+4 −0
Original line number Diff line number Diff line
@@ -625,6 +625,10 @@ public class ApnContext { 
            if (apnType != ApnSetting.TYPE_NONE) error = true;

            apnType = ApnSetting.TYPE_EMERGENCY;

        }

        if (nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_MCX)) {

            if (apnType != ApnSetting.TYPE_NONE) error = true;

            apnType = ApnSetting.TYPE_MCX;

        }

        if (error) {

            // TODO: If this error condition is removed, the framework's handling of

            // NET_CAPABILITY_NOT_RESTRICTED will need to be updated so requests for

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

+4 −0
Original line number Diff line number Diff line
@@ -1126,6 +1126,10 @@ public class DataConnection extends StateMachine { 
                        result.addCapability(NetworkCapabilities.NET_CAPABILITY_EIMS);

                        break;

                    }

                    case PhoneConstants.APN_TYPE_MCX: {

                        result.addCapability(NetworkCapabilities.NET_CAPABILITY_MCX);

                        break;

                    }

                    default:

                }

            }

src/java/com/android/internal/telephony/ims/RcsMessageStoreController.java

+4 −13
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ public class RcsMessageStoreController extends IRcs.Stub { 
        synchronized (RcsMessageStoreController.class) {

            if (sInstance == null) {

                sInstance = new RcsMessageStoreController(context.getContentResolver());

                if (ServiceManager.getService(RCS_SERVICE_NAME) == null) {

                    ServiceManager.addService(RCS_SERVICE_NAME, sInstance);

                }

            } else {

                Rlog.e(TAG, "init() called multiple times! sInstance = " + sInstance);

            }
@@ -138,20 +141,8 @@ public class RcsMessageStoreController extends IRcs.Stub { 
        return sInstance;

    }



    private RcsMessageStoreController(ContentResolver contentResolver) {

        mContentResolver = contentResolver;

        mParticipantQueryHelper = new RcsParticipantQueryHelper(contentResolver);

        mMessageQueryHelper = new RcsMessageQueryHelper(contentResolver);

        mThreadQueryHelper = new RcsThreadQueryHelper(contentResolver, mParticipantQueryHelper);

        mEventQueryHelper = new RcsEventQueryHelper(contentResolver);

        mMessageStoreUtil = new RcsMessageStoreUtil(contentResolver);

        if (ServiceManager.getService(RCS_SERVICE_NAME) == null) {

            ServiceManager.addService(RCS_SERVICE_NAME, this);

        }

    }



    @VisibleForTesting

    public RcsMessageStoreController(ContentResolver contentResolver, Void unused) {

    public RcsMessageStoreController(ContentResolver contentResolver) {

        mContentResolver = contentResolver;

        mParticipantQueryHelper = new RcsParticipantQueryHelper(contentResolver);

        mMessageQueryHelper = new RcsMessageQueryHelper(contentResolver);

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+8 −2
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ import java.util.List; 
import java.util.Map;

import java.util.Queue;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.Executor;

import java.util.concurrent.LinkedBlockingQueue;

import java.util.concurrent.atomic.AtomicInteger;

import java.util.regex.Pattern;
@@ -499,8 +500,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 




    //***** Constructors



    public ImsPhoneCallTracker(ImsPhone phone) {

        this(phone, phone.getContext().getMainExecutor());

    }



    @VisibleForTesting

    public ImsPhoneCallTracker(ImsPhone phone, Executor executor) {

        this.mPhone = phone;



        mMetrics = TelephonyMetrics.getInstance();
@@ -523,6 +528,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        mVtDataUsageSnapshot = new NetworkStats(currentTime, 1);

        mVtDataUsageUidSnapshot = new NetworkStats(currentTime, 1);



        // Allow the executor to be specified for testing.

        mImsManagerConnector = new ImsManager.Connector(phone.getContext(), phone.getPhoneId(),

                new ImsManager.Connector.Listener() {

                    @Override
@@ -535,7 +541,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                    public void connectionUnavailable() {

                        stopListeningForCalls();

                    }

                });

                }, executor);

        mImsManagerConnector.connect();

    }