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

Commit 05ab1c88 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "Update SubscriptionInfo to use String mcc/mncs""

parents c51b03c8 68e803ce

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

+7 −11
Original line number Original line Diff line number Diff line
@@ -290,10 +290,10 @@ public class SubscriptionController extends ISub.Stub { 
        // Get the blank bitmap for this SubInfoRecord

        // Get the blank bitmap for this SubInfoRecord

        Bitmap iconBitmap = BitmapFactory.decodeResource(mContext.getResources(),

        Bitmap iconBitmap = BitmapFactory.decodeResource(mContext.getResources(),

                com.android.internal.R.drawable.ic_sim_card_multi_24px_clr);

                com.android.internal.R.drawable.ic_sim_card_multi_24px_clr);

        String mcc = cursor.getString(cursor.getColumnIndexOrThrow(

        int mcc = cursor.getInt(cursor.getColumnIndexOrThrow(

                SubscriptionManager.MCC_STRING));

                SubscriptionManager.MCC));

        String mnc = cursor.getString(cursor.getColumnIndexOrThrow(

        int mnc = cursor.getInt(cursor.getColumnIndexOrThrow(

                SubscriptionManager.MNC_STRING));

                SubscriptionManager.MNC));

        String cardId = cursor.getString(cursor.getColumnIndexOrThrow(

        String cardId = cursor.getString(cursor.getColumnIndexOrThrow(

                SubscriptionManager.CARD_ID));

                SubscriptionManager.CARD_ID));

        // FIXME: consider stick this into database too

        // FIXME: consider stick this into database too
@@ -1373,22 +1373,18 @@ public class SubscriptionController extends ISub.Stub { 
     * @return the number of records updated

     * @return the number of records updated

     */

     */

    public int setMccMnc(String mccMnc, int subId) {

    public int setMccMnc(String mccMnc, int subId) {

        String mccString = mccMnc.substring(0, 3);

        String mncString = mccMnc.substring(3);

        int mcc = 0;

        int mcc = 0;

        int mnc = 0;

        int mnc = 0;

        try {

        try {

            mcc = Integer.parseInt(mccString);

            mcc = Integer.parseInt(mccMnc.substring(0,3));

            mnc = Integer.parseInt(mncString);

            mnc = Integer.parseInt(mccMnc.substring(3));

        } catch (NumberFormatException e) {

        } catch (NumberFormatException e) {

            loge("[setMccMnc] - couldn't parse mcc/mnc: " + mccMnc);

            loge("[setMccMnc] - couldn't parse mcc/mnc: " + mccMnc);

        }

        }

        if (DBG) logd("[setMccMnc]+ mcc/mnc:" + mcc + "/" + mnc + " subId:" + subId);

        if (DBG) logd("[setMccMnc]+ mcc/mnc:" + mcc + "/" + mnc + " subId:" + subId);

        ContentValues value = new ContentValues(4);

        ContentValues value = new ContentValues(2);

        value.put(SubscriptionManager.MCC, mcc);

        value.put(SubscriptionManager.MCC, mcc);

        value.put(SubscriptionManager.MNC, mnc);

        value.put(SubscriptionManager.MNC, mnc);

        value.put(SubscriptionManager.MCC_STRING, mccString);

        value.put(SubscriptionManager.MNC_STRING, mncString);





        int result = mContext.getContentResolver().update(SubscriptionManager.CONTENT_URI, value,

        int result = mContext.getContentResolver().update(SubscriptionManager.CONTENT_URI, value,

                SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID + "=" + Long.toString(subId), null);

                SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID + "=" + Long.toString(subId), null);

tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -65,9 +65,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
                SubscriptionManager.NAME_SOURCE, SubscriptionManager.COLOR,

                SubscriptionManager.NAME_SOURCE, SubscriptionManager.COLOR,

                SubscriptionManager.NUMBER, SubscriptionManager.DISPLAY_NUMBER_FORMAT,

                SubscriptionManager.NUMBER, SubscriptionManager.DISPLAY_NUMBER_FORMAT,

                SubscriptionManager.DATA_ROAMING, SubscriptionManager.MCC,

                SubscriptionManager.DATA_ROAMING, SubscriptionManager.MCC,

                SubscriptionManager.MNC, SubscriptionManager.MCC_STRING,

                SubscriptionManager.MNC, SubscriptionManager.CB_EXTREME_THREAT_ALERT,

                SubscriptionManager.MNC_STRING,

                SubscriptionManager.CB_EXTREME_THREAT_ALERT,

                SubscriptionManager.CB_SEVERE_THREAT_ALERT, SubscriptionManager.CB_AMBER_ALERT,

                SubscriptionManager.CB_SEVERE_THREAT_ALERT, SubscriptionManager.CB_AMBER_ALERT,

                SubscriptionManager.CB_ALERT_SOUND_DURATION,

                SubscriptionManager.CB_ALERT_SOUND_DURATION,

                SubscriptionManager.CB_ALERT_REMINDER_INTERVAL,

                SubscriptionManager.CB_ALERT_REMINDER_INTERVAL,

tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoTest.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -15,15 +15,15 @@ 
 */

 */

package com.android.internal.telephony;

package com.android.internal.telephony;





import static org.junit.Assert.assertEquals;

import android.telephony.SubscriptionManager;



import android.telephony.SubscriptionInfo;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;



import static org.junit.Assert.*;

import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

import org.junit.Test;





import android.telephony.SubscriptionInfo;



public class SubscriptionInfoTest {

public class SubscriptionInfoTest {

    private SubscriptionInfo mSubscriptionInfoUT;

    private SubscriptionInfo mSubscriptionInfoUT;
@@ -35,7 +35,7 @@ public class SubscriptionInfoTest { 
    @Before

    @Before

    public void setUp() throws Exception {

    public void setUp() throws Exception {

        mSubscriptionInfoUT = new SubscriptionInfo(1, "890126042XXXXXXXXXXX", 0, "T-mobile",

        mSubscriptionInfoUT = new SubscriptionInfo(1, "890126042XXXXXXXXXXX", 0, "T-mobile",

                "T-mobile", 0, 255, "12345", 0, null, "310", "260", "156");

                "T-mobile", 0, 255, "12345", 0, null, 310, 260, "156");

    }

    }





    @Test

    @Test

tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -453,11 +453,11 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        List<SubscriptionInfo> subInfoList = new ArrayList<>();

        List<SubscriptionInfo> subInfoList = new ArrayList<>();

        // 1: not embedded, but has matching iccid with an embedded subscription.

        // 1: not embedded, but has matching iccid with an embedded subscription.

        subInfoList.add(new SubscriptionInfo(

        subInfoList.add(new SubscriptionInfo(

                        0, "1", 0, "", "", 0, 0, "", 0, null, "0", "0", "", false /* isEmbedded */,

                        0, "1", 0, "", "", 0, 0, "", 0, null, 0, 0, "", false /* isEmbedded */,

                        null /* accessRules */));

                        null /* accessRules */));

        // 2: embedded but no longer present.

        // 2: embedded but no longer present.

        subInfoList.add(new SubscriptionInfo(

        subInfoList.add(new SubscriptionInfo(

                0, "2", 0, "", "", 0, 0, "", 0, null, "0", "0", "", true /* isEmbedded */,

                0, "2", 0, "", "", 0, 0, "", 0, null, 0, 0, "", true /* isEmbedded */,

                null /* accessRules */));

                null /* accessRules */));





        when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(

        when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(
@@ -504,11 +504,11 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        List<SubscriptionInfo> subInfoList = new ArrayList<>();

        List<SubscriptionInfo> subInfoList = new ArrayList<>();

        // 1: not embedded, but has matching iccid with an embedded subscription.

        // 1: not embedded, but has matching iccid with an embedded subscription.

        subInfoList.add(new SubscriptionInfo(

        subInfoList.add(new SubscriptionInfo(

                0, "1", 0, "", "", 0, 0, "", 0, null, "0", "0", "", false /* isEmbedded */,

                0, "1", 0, "", "", 0, 0, "", 0, null, 0, 0, "", false /* isEmbedded */,

                null /* accessRules */));

                null /* accessRules */));

        // 2: embedded.

        // 2: embedded.

        subInfoList.add(new SubscriptionInfo(

        subInfoList.add(new SubscriptionInfo(

                0, "2", 0, "", "", 0, 0, "", 0, null, "0", "0", "", true /* isEmbedded */,

                0, "2", 0, "", "", 0, 0, "", 0, null, 0, 0, "", true /* isEmbedded */,

                null /* accessRules */));

                null /* accessRules */));





        when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(

        when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(
@@ -546,7 +546,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        List<SubscriptionInfo> subInfoList = new ArrayList<>();

        List<SubscriptionInfo> subInfoList = new ArrayList<>();

        // 1: not embedded.

        // 1: not embedded.

        subInfoList.add(new SubscriptionInfo(

        subInfoList.add(new SubscriptionInfo(

                0, "1", 0, "", "", 0, 0, "", 0, null, "0", "0", "", false /* isEmbedded */,

                0, "1", 0, "", "", 0, 0, "", 0, null, 0, 0, "", false /* isEmbedded */,

                null /* accessRules */));

                null /* accessRules */));





        when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(

        when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(

tests/telephonytests/src/com/android/internal/telephony/euicc/EuiccControllerTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -837,7 +837,7 @@ public class EuiccControllerTest extends TelephonyTest { 
    private void setHasCarrierPrivilegesOnActiveSubscription(boolean hasPrivileges)

    private void setHasCarrierPrivilegesOnActiveSubscription(boolean hasPrivileges)

            throws Exception {

            throws Exception {

        SubscriptionInfo subInfo = new SubscriptionInfo(

        SubscriptionInfo subInfo = new SubscriptionInfo(

                0, "", 0, "", "", 0, 0, "", 0, null, "0", "0", "", true /* isEmbedded */,

                0, "", 0, "", "", 0, 0, "", 0, null, 0, 0, "", true /* isEmbedded */,

                hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null);

                hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null);

        when(mSubscriptionManager.canManageSubscription(subInfo, PACKAGE_NAME)).thenReturn(

        when(mSubscriptionManager.canManageSubscription(subInfo, PACKAGE_NAME)).thenReturn(

                hasPrivileges);

                hasPrivileges);
@@ -847,7 +847,7 @@ public class EuiccControllerTest extends TelephonyTest { 




    private void prepareOperationSubscription(boolean hasPrivileges) throws Exception {

    private void prepareOperationSubscription(boolean hasPrivileges) throws Exception {

        SubscriptionInfo subInfo = new SubscriptionInfo(

        SubscriptionInfo subInfo = new SubscriptionInfo(

                SUBSCRIPTION_ID, ICC_ID, 0, "", "", 0, 0, "", 0, null, "0", "0", "",

                SUBSCRIPTION_ID, ICC_ID, 0, "", "", 0, 0, "", 0, null, 0, 0, "",

                true /* isEmbedded */, hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null);

                true /* isEmbedded */, hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null);

        when(mSubscriptionManager.canManageSubscription(subInfo, PACKAGE_NAME)).thenReturn(

        when(mSubscriptionManager.canManageSubscription(subInfo, PACKAGE_NAME)).thenReturn(

                hasPrivileges);

                hasPrivileges);