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

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

Snap for 5472349 from 3f7c5d57 to qt-release 

Change-Id: I07124409ceed0dfa577aa64edb3d4871b73a8c7b
parents 3c9f4948 3f7c5d57

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

+19 −10
Original line number Diff line number Diff line
@@ -38,13 +38,16 @@ import android.telephony.LocationAccessPolicy; 
import android.telephony.NetworkScan;

import android.telephony.NetworkScanRequest;

import android.telephony.RadioAccessSpecifier;

import android.telephony.SubscriptionInfo;

import android.telephony.TelephonyScanManager;

import android.util.Log;



import java.util.Collection;

import java.util.List;

import java.util.Set;

import java.util.concurrent.atomic.AtomicInteger;

import java.util.stream.Collectors;

import java.util.stream.Stream;



/**

 * Manages radio access network scan requests.
@@ -172,15 +175,22 @@ public final class NetworkScanRequestTracker { 
    }



    /**

     * @return S list of MCC/MNC ids that apps should be allowed to see as results from a network

     * @return A list of MCC/MNC ids that apps should be allowed to see as results from a network

     * scan when scan results are restricted due to location privacy.

     */

    public static List<String> getAllowedMccMncsForLocationRestrictedScan(Context context) {

    public static Set<String> getAllowedMccMncsForLocationRestrictedScan(Context context) {

        return withCleanCallingIdentity(() -> SubscriptionController.getInstance()

                .getAllSubInfoList(context.getOpPackageName()).stream()

                .filter(subInfo -> subInfo.getMccString() != null)

                .map(subInfo -> subInfo.getMccString() + subInfo.getMncString())

                .collect(Collectors.toList()));

            .getAvailableSubscriptionInfoList(context.getOpPackageName()).stream()

            .flatMap(NetworkScanRequestTracker::getAllowableMccMncsFromSubscriptionInfo)

            .collect(Collectors.toSet()));

    }



    private static Stream<String> getAllowableMccMncsFromSubscriptionInfo(SubscriptionInfo info) {

        Stream<String> plmns = Stream.of(info.getEhplmns(), info.getHplmns()).flatMap(List::stream);

        if (info.getMccString() != null && info.getMncString() != null) {

            plmns = Stream.concat(plmns, Stream.of(info.getMccString() + info.getMncString()));

        }

        return plmns;

    }



    /** Sends a message back to the application via its callback. */
@@ -194,12 +204,11 @@ public final class NetworkScanRequestTracker { 


        if (result != null) {

            if (what == TelephonyScanManager.CALLBACK_RESTRICTED_SCAN_RESULTS) {

                //List<String> allowedMccMncs =

                //        getAllowedMccMncsForLocationRestrictedScan(nsri.mPhone.getContext());

                Set<String> allowedMccMncs =

                        getAllowedMccMncsForLocationRestrictedScan(nsri.mPhone.getContext());



                result = result.stream().map(CellInfo::sanitizeLocationInfo)

                        // STOPSHIP Revisit PLMN check (b/130253962).

                        //.filter(ci -> doesCellInfoCorrespondToKnownMccMnc(ci, allowedMccMncs))

                        .filter(ci -> doesCellInfoCorrespondToKnownMccMnc(ci, allowedMccMncs))

                        .collect(Collectors.toList());

            }

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

+44 −4
Original line number Diff line number Diff line
@@ -389,6 +389,13 @@ public class SubscriptionController extends ISub.Stub { 
                SubscriptionManager.MCC_STRING));

        String mnc = cursor.getString(cursor.getColumnIndexOrThrow(

                SubscriptionManager.MNC_STRING));

        String ehplmnsRaw = cursor.getString(cursor.getColumnIndexOrThrow(

                SubscriptionManager.EHPLMNS));

        String hplmnsRaw = cursor.getString(cursor.getColumnIndexOrThrow(

                SubscriptionManager.HPLMNS));

        String[] ehplmns = ehplmnsRaw == null ? null : ehplmnsRaw.split(",");

        String[] hplmns = hplmnsRaw == null ? null : hplmnsRaw.split(",");



        // cardId is the private ICCID/EID string, also known as the card string

        String cardId = cursor.getString(cursor.getColumnIndexOrThrow(

                SubscriptionManager.CARD_ID));
@@ -435,10 +442,12 @@ public class SubscriptionController extends ISub.Stub { 
        if (!TextUtils.isEmpty(line1Number) && !line1Number.equals(number)) {

            number = line1Number;

        }

        return new SubscriptionInfo(id, iccId, simSlotIndex, displayName, carrierName,

            nameSource, iconTint, number, dataRoaming, iconBitmap, mcc, mnc, countryIso,

            isEmbedded, accessRules, cardId, publicCardId, isOpportunistic, groupUUID,

            false /* isGroupDisabled */, carrierId, profileClass, subType);

        SubscriptionInfo info = new SubscriptionInfo(id, iccId, simSlotIndex, displayName,

                carrierName, nameSource, iconTint, number, dataRoaming, iconBitmap, mcc, mnc,

                countryIso, isEmbedded, accessRules, cardId, publicCardId, isOpportunistic,

                groupUUID, false /* isGroupDisabled */, carrierId, profileClass, subType);

        info.setAssociatedPlmns(ehplmns, hplmns);

        return info;

    }



    /**
@@ -1648,6 +1657,37 @@ public class SubscriptionController extends ISub.Stub { 
        }

    }



    /**

     * Set the EHPLMNs and HPLMNs associated with the subscription.

     */

    public void setAssociatedPlmns(String[] ehplmns, String[] hplmns, int subId) {

        if (DBG) logd("[setAssociatedPlmns]+ subId:" + subId);



        validateSubId(subId);

        int phoneId = getPhoneId(subId);



        if (phoneId < 0 || phoneId >= mTelephonyManager.getPhoneCount()) {

            if (DBG) logd("[setAssociatedPlmns]- fail");

            return;

        }



        String formattedEhplmns = ehplmns == null ? "" : String.join(",", ehplmns);

        String formattedHplmns = hplmns == null ? "" : String.join(",", hplmns);



        ContentValues value = new ContentValues(2);

        value.put(SubscriptionManager.EHPLMNS, formattedEhplmns);

        value.put(SubscriptionManager.HPLMNS, formattedHplmns);



        int count = mContext.getContentResolver().update(

                SubscriptionManager.getUriForSubscriptionId(subId), value, null, null);



        // Refresh the Cache of Active Subscription Info List

        refreshCachedActiveSubscriptionInfoList();



        if (DBG) logd("[setAssociatedPlmns]- update result :" + count);

        notifySubscriptionInfoChanged();

    }



    /**

     * Set data roaming by simInfo index

     * @param roaming 0:Don't allow data when roaming, 1:Allow data when roaming

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

+6 −0
Original line number Diff line number Diff line
@@ -439,6 +439,12 @@ public class SubscriptionInfoUpdater extends Handler { 
                    SubscriptionController.getInstance().setDisplayNumber(msisdn, subId);

                }



                String[] ehplmns = records.getEhplmns();

                String[] hplmns = records.getHplmns();

                if (ehplmns != null || hplmns != null) {

                    SubscriptionController.getInstance().setAssociatedPlmns(ehplmns, hplmns, subId);

                }



                SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(subId);

                String nameToSet;

                String simCarrierName = tm.getSimOperatorName(subId);

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

+27 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import com.android.internal.telephony.TelephonyProperties; 
import com.android.internal.telephony.dataconnection.DataEnabledSettings;

import com.android.internal.telephony.dataconnection.DataEnabledSettings.DataEnabledChangedReason;

import com.android.internal.telephony.gsm.SuppServiceNotification;

import com.android.internal.telephony.metrics.CallQualityMetrics;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.nano.TelephonyProto.ImsConnectionState;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession;
@@ -114,6 +115,7 @@ import java.util.List; 
import java.util.Map;

import java.util.Queue;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ConcurrentLinkedQueue;

import java.util.concurrent.Executor;

import java.util.concurrent.LinkedBlockingQueue;

import java.util.concurrent.atomic.AtomicInteger;
@@ -151,6 +153,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            new MmTelFeature.MmTelCapabilities();



    private TelephonyMetrics mMetrics;

    private final Map<String, CallQualityMetrics> mCallQualityMetrics = new ConcurrentHashMap<>();

    private final ConcurrentLinkedQueue<String> mLeastRecentCallId = new ConcurrentLinkedQueue<>();

    private boolean mCarrierConfigLoaded = false;



    private final MmTelFeatureListener mMmTelFeatureListener = new MmTelFeatureListener();
@@ -278,6 +282,10 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
    static final int MAX_CONNECTIONS = 7;

    static final int MAX_CONNECTIONS_PER_CALL = 5;



    // Max number of calls we will keep call quality history for (the history is saved in-memory and

    // included in bug reports).

    private static final int MAX_CALL_QUALITY_HISTORY = 10;



    private static final int EVENT_HANGUP_PENDINGMO = 18;

    private static final int EVENT_DIAL_PENDINGMO = 20;

    private static final int EVENT_EXIT_ECBM_BEFORE_PENDINGMO = 21;
@@ -2319,8 +2327,10 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                cause = DisconnectCause.IMS_MERGED_SUCCESSFULLY;

            }



            String callId = imsCall.getSession().getCallId();

            mMetrics.writeOnImsCallTerminated(mPhone.getPhoneId(), imsCall.getCallSession(),

                    reasonInfo);

                    reasonInfo, mCallQualityMetrics.get(callId));

            pruneCallQualityMetricsHistory();

            mPhone.notifyImsReason(reasonInfo);



            if (reasonInfo.getCode() == ImsReasonInfo.CODE_SIP_ALTERNATE_EMERGENCY_CALL
@@ -2948,6 +2958,14 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            // convert ServiceState.radioTech to TelephonyManager.NetworkType constant

            mPhone.onCallQualityChanged(callQuality,

                    ServiceState.rilRadioTechnologyToNetworkType(imsCall.getRadioTechnology()));

            String callId = imsCall.getSession().getCallId();

            CallQualityMetrics cqm = mCallQualityMetrics.get(callId);

            if (cqm == null) {

                cqm = new CallQualityMetrics(mPhone);

                mLeastRecentCallId.add(callId);

            }

            cqm.saveCallQuality(callQuality);

            mCallQualityMetrics.put(callId, cqm);

        }

    };
@@ -3500,6 +3518,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        pw.println(" mDefaultDialerUid=" + mDefaultDialerUid.get());

        pw.println(" mVtDataUsageSnapshot=" + mVtDataUsageSnapshot);

        pw.println(" mVtDataUsageUidSnapshot=" + mVtDataUsageUidSnapshot);

        pw.println(" mCallQualityMetrics=" + mCallQualityMetrics);



        pw.flush();

        pw.println("++++++++++++++++++++++++++++++++");
@@ -4076,6 +4095,13 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        mIsDataEnabled = isDataEnabled;

    }



    // Removes old call quality metrics if mCallQualityMetrics exceeds its max size

    private void pruneCallQualityMetricsHistory() {

        if (mCallQualityMetrics.size() > MAX_CALL_QUALITY_HISTORY) {

            mCallQualityMetrics.remove(mLeastRecentCallId.poll());

        }

    }



    private void handleFeatureCapabilityChanged(ImsFeature.Capabilities capabilities) {

        boolean tmpIsVideoCallEnabled = isVideoCallEnabled();

        // Check enabledFeatures to determine capabilities. We ignore disabledFeatures.

src/java/com/android/internal/telephony/metrics/CallQualityMetrics.java

0 → 100644
+345 −0

File added.

Preview size limit exceeded, changes collapsed.