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

Commit 8f81cc0f authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Gerrit Code Review
Browse files

Merge changes from topic "134086103" 

* changes:
  Make sure on non-dds phone, try MMS data connection when PS is not attached.
  Sync displayName and other fields across grouped subscriptions.
parents 9c3ff48c 97f297e7

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

+62 −15
Original line number Diff line number Diff line
@@ -151,6 +151,18 @@ public class SubscriptionController extends ISub.Stub { 
    private int[] colorArr;

    private long mLastISubServiceRegTime;



    // The properties that should be shared and synced across grouped subscriptions.

    private static final Set<String> GROUP_SHARING_PROPERTIES = new HashSet<>(Arrays.asList(

            SubscriptionManager.ENHANCED_4G_MODE_ENABLED,

            SubscriptionManager.VT_IMS_ENABLED,

            SubscriptionManager.WFC_IMS_ENABLED,

            SubscriptionManager.WFC_IMS_MODE,

            SubscriptionManager.WFC_IMS_ROAMING_MODE,

            SubscriptionManager.WFC_IMS_ROAMING_ENABLED,

            SubscriptionManager.DATA_ROAMING,

            SubscriptionManager.DISPLAY_NAME,

            SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES));



    public static SubscriptionController init(Phone phone) {

        synchronized (SubscriptionController.class) {

            if (sInstance == null) {
@@ -1588,8 +1600,7 @@ public class SubscriptionController extends ISub.Stub { 
            // to the eSIM itself. Currently it will be blown away the next time the subscription

            // list is updated.



            int result = mContext.getContentResolver().update(

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

            int result = updateDatabase(value, subId, true);



            // Refresh the Cache of Active Subscription Info List

            refreshCachedActiveSubscriptionInfoList();
@@ -1703,7 +1714,7 @@ public class SubscriptionController extends ISub.Stub { 
            value.put(SubscriptionManager.DATA_ROAMING, roaming);

            if (DBG) logd("[setDataRoaming]- roaming:" + roaming + " set");



            int result = databaseUpdateHelper(value, subId, true);

            int result = updateDatabase(value, subId, true);



            // Refresh the Cache of Active Subscription Info List

            refreshCachedActiveSubscriptionInfoList();
@@ -1716,18 +1727,54 @@ public class SubscriptionController extends ISub.Stub { 
        }

    }





    public void syncGroupedSetting(int refSubId) {

        // Currently it only syncs allow MMS. Sync other settings as well if needed.

        String dataEnabledOverrideRules = getSubscriptionProperty(

                refSubId, SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES);

        logd("syncGroupedSetting");

        try (Cursor cursor = mContext.getContentResolver().query(

                SubscriptionManager.CONTENT_URI, null,

                SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID + "=?",

                new String[] {String.valueOf(refSubId)}, null)) {

            if (cursor == null || !cursor.moveToFirst()) {

                logd("[syncGroupedSetting] failed. Can't find refSubId " + refSubId);

                return;

            }



        ContentValues value = new ContentValues(1);

        value.put(SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES, dataEnabledOverrideRules);

        databaseUpdateHelper(value, refSubId, true);

            ContentValues values = new ContentValues(GROUP_SHARING_PROPERTIES.size());

            for (String propKey : GROUP_SHARING_PROPERTIES) {

                copyDataFromCursorToContentValue(propKey, cursor, values);

            }

            updateDatabase(values, refSubId, true);

        }

    }



    private int databaseUpdateHelper(ContentValues value, int subId, boolean updateEntireGroup) {

    private void copyDataFromCursorToContentValue(String propKey, Cursor cursor,

            ContentValues values) {

        int columnIndex = cursor.getColumnIndex(propKey);

        if (columnIndex == -1) {

            logd("[copyDataFromCursorToContentValue] can't find column " + propKey);

            return;

        }



        switch (propKey) {

            case SubscriptionManager.ENHANCED_4G_MODE_ENABLED:

            case SubscriptionManager.VT_IMS_ENABLED:

            case SubscriptionManager.WFC_IMS_ENABLED:

            case SubscriptionManager.WFC_IMS_MODE:

            case SubscriptionManager.WFC_IMS_ROAMING_MODE:

            case SubscriptionManager.WFC_IMS_ROAMING_ENABLED:

            case SubscriptionManager.DATA_ROAMING:

                values.put(propKey, cursor.getInt(columnIndex));

                break;

            case SubscriptionManager.DISPLAY_NAME:

            case SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES:

                values.put(propKey, cursor.getString(columnIndex));

                break;

            default:

                loge("[copyDataFromCursorToContentValue] invalid propKey " + propKey);

        }

    }



    // TODO: replace all updates with this helper method.

    private int updateDatabase(ContentValues value, int subId, boolean updateEntireGroup) {

        List<SubscriptionInfo> infoList = getSubscriptionsInGroup(getGroupUuid(subId),

                mContext.getOpPackageName());

        if (!updateEntireGroup || infoList == null || infoList.size() == 0) {
@@ -2509,9 +2556,10 @@ public class SubscriptionController extends ISub.Stub { 
        }

    }



    private static int setSubscriptionPropertyIntoContentResolver(

    private int setSubscriptionPropertyIntoContentResolver(

            int subId, String propKey, String propValue, ContentResolver resolver) {

        ContentValues value = new ContentValues();

        boolean updateEntireGroup = GROUP_SHARING_PROPERTIES.contains(propKey);

        switch (propKey) {

            case SubscriptionManager.CB_EXTREME_THREAT_ALERT:

            case SubscriptionManager.CB_SEVERE_THREAT_ALERT:
@@ -2539,8 +2587,7 @@ public class SubscriptionController extends ISub.Stub { 
                break;

        }



        return resolver.update(SubscriptionManager.getUriForSubscriptionId(subId),

                value, null, null);

        return updateDatabase(value, subId, updateEntireGroup);

    }



    /**
@@ -3646,7 +3693,7 @@ public class SubscriptionController extends ISub.Stub { 
        ContentValues value = new ContentValues(1);

        value.put(SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES, rules);



        boolean result = databaseUpdateHelper(value, subId, true) > 0;

        boolean result = updateDatabase(value, subId, true) > 0;



        if (result) {

            // Refresh the Cache of Active Subscription Info List

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

+29 −22
Original line number Diff line number Diff line
@@ -1320,7 +1320,7 @@ public class DcTracker extends Handler { 
            reasons.add(DataDisallowedReasonType.IN_ECBM);

        }



        if (!attachedState && !mAutoAttachEnabled.get() && requestType != REQUEST_TYPE_HANDOVER) {

        if (!attachedState && !shouldAutoAttach() && requestType != REQUEST_TYPE_HANDOVER) {

            reasons.add(DataDisallowedReasonType.NOT_ATTACHED);

        }

        if (!recordsLoaded) {
@@ -1488,6 +1488,9 @@ public class DcTracker extends Handler { 
                apnContext.setState(DctConstants.State.IDLE);

            }

            int radioTech = getDataRat();

            if (radioTech == ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) {

                radioTech = getVoiceRat();

            }

            log("service state=" + mPhone.getServiceState());

            apnContext.setConcurrentVoiceAndDataAllowed(mPhone.getServiceStateTracker()

                    .isConcurrentVoiceAndDataAllowed());
@@ -1761,8 +1764,8 @@ public class DcTracker extends Handler { 
        }



        for (ApnSetting dunSetting : dunCandidates) {

            if (!ServiceState.bitmaskHasTech(dunSetting.getNetworkTypeBitmask(),

                    ServiceState.rilRadioTechnologyToNetworkType(bearer))) {

            if (!ServiceState.networkBitmaskHasAccessNetworkType(dunSetting.getNetworkTypeBitmask(),

                    ServiceState.rilRadioTechnologyToAccessNetworkType(bearer))) {

                continue;

            }

            retDunSettings.add(dunSetting);
@@ -2204,10 +2207,6 @@ public class DcTracker extends Handler { 
        }

    }



    public boolean getAutoAttachEnabled() {

        return mAutoAttachEnabled.get();

    }



    private void onRecordsLoadedOrSubIdChanged() {

        if (DBG) log("onRecordsLoadedOrSubIdChanged: createAllApnList");

        if (mTransportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN) {
@@ -3284,8 +3283,9 @@ public class DcTracker extends Handler { 
                        + mPreferredApn.getOperatorNumeric() + ":" + mPreferredApn);

            }

            if (mPreferredApn.getOperatorNumeric().equals(operator)) {

                if (ServiceState.bitmaskHasTech(mPreferredApn.getNetworkTypeBitmask(),

                        ServiceState.rilRadioTechnologyToNetworkType(radioTech))) {

                if (ServiceState.networkBitmaskHasAccessNetworkType(

                        mPreferredApn.getNetworkTypeBitmask(),

                        ServiceState.rilRadioTechnologyToAccessNetworkType(radioTech))) {

                    apnList.add(mPreferredApn);

                    apnList = sortApnListByPreferred(apnList);

                    if (DBG) log("buildWaitingApns: X added preferred apnList=" + apnList);
@@ -3305,8 +3305,8 @@ public class DcTracker extends Handler { 
        if (DBG) log("buildWaitingApns: mAllApnSettings=" + mAllApnSettings);

        for (ApnSetting apn : mAllApnSettings) {

            if (apn.canHandleType(requestedApnTypeBitmask)) {

                if (ServiceState.bitmaskHasTech(apn.getNetworkTypeBitmask(),

                        ServiceState.rilRadioTechnologyToNetworkType(radioTech))) {

                if (ServiceState.networkBitmaskHasAccessNetworkType(apn.getNetworkTypeBitmask(),

                        ServiceState.rilRadioTechnologyToAccessNetworkType(radioTech))) {

                    if (VDBG) log("buildWaitingApns: adding apn=" + apn);

                    apnList.add(apn);

                } else {
@@ -3875,7 +3875,7 @@ public class DcTracker extends Handler { 
        log("update(): Active DDS, register for all events now!");

        onUpdateIcc();



        updateAutoAttachOnCreation();

        mAutoAttachEnabled.set(false);



        mPhone.updateCurrentCarrierInProvider();

    }
@@ -3886,20 +3886,17 @@ public class DcTracker extends Handler { 
     * try setting up data call even if it's not attached for 2G or 3G networks. And doing so will

     * trigger PS attach if possible.

     */

    public void updateAutoAttachOnCreation() {

    @VisibleForTesting

    public boolean shouldAutoAttach() {

        if (mAutoAttachEnabled.get()) return true;



        PhoneSwitcher phoneSwitcher = PhoneSwitcher.getInstance();

        ServiceState serviceState = mPhone.getServiceState();

        if (PhoneSwitcher.getInstance() == null || serviceState == null) {

            mAutoAttachEnabled.set(false);

            return;

        }



        // If it's non DDS phone, and voice is registered on 2G or 3G network, we set

        // mAutoAttachEnabled to true.

        mAutoAttachEnabled.set(mPhone.getPhoneId() != phoneSwitcher.getPreferredDataPhoneId()

        return phoneSwitcher != null && serviceState != null

                && mPhone.getPhoneId() != phoneSwitcher.getPreferredDataPhoneId()

                && serviceState.getVoiceRegState() == ServiceState.STATE_IN_SERVICE

                && serviceState.getVoiceNetworkType() != NETWORK_TYPE_LTE

                && serviceState.getVoiceNetworkType() != NETWORK_TYPE_NR);

                && serviceState.getVoiceNetworkType() != NETWORK_TYPE_NR;

    }



    private void notifyAllDataDisconnected() {
@@ -4841,4 +4838,14 @@ public class DcTracker extends Handler { 
        }

        return ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;

    }



    private int getVoiceRat() {

        ServiceState ss = mPhone.getServiceState();

        NetworkRegistrationInfo nrs = ss.getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_CS, mTransportType);

        if (nrs != null) {

            return ServiceState.networkTypeToRilRadioTechnology(nrs.getAccessNetworkTechnology());

        }

        return ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;

    }

}

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

+0 −7
Original line number Diff line number Diff line
@@ -231,13 +231,6 @@ public class TelephonyNetworkFactory extends NetworkFactory { 


    // apply or revoke requests if our active-ness changes

    private void onActivePhoneSwitch() {

        // For non DDS phone, mAutoAttachOnCreation should be true because it may be detached

        // automatically from network only because it's idle for too long. In this case, we should

        // try setting up data call even if it's not attached. And doing so will trigger PS attach

        // if possible.

        mPhone.getDcTracker(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                .updateAutoAttachOnCreation();



        for (HashMap.Entry<NetworkRequest, Integer> entry : mNetworkRequests.entrySet()) {

            NetworkRequest networkRequest = entry.getKey();

            boolean applied = entry.getValue() != AccessNetworkConstants.TRANSPORT_TYPE_INVALID;

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -967,10 +967,10 @@ public class DcTrackerTest extends TelephonyTest { 


        verifyDataConnected(FAKE_APN1);



        assertTrue(mDct.getAutoAttachEnabled());

        assertTrue(mDct.shouldAutoAttach());

        mDct.update();

        // The auto attach flag should be reset after update

        assertFalse(mDct.getAutoAttachEnabled());

        assertFalse(mDct.shouldAutoAttach());



        verify(mSST, times(1)).registerForDataConnectionDetached(

                eq(AccessNetworkConstants.TRANSPORT_TYPE_WWAN), eq(mDct),