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

Commit ab8c33a4 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Add IMS_RCS_UCE_ENABLED column access in SubscriptionManager" 

am: e04a9a54

Change-Id: I00c6a0deddce87ea50f48bae90ee1293dc6b648c
parents 4926ed70 e04a9a54

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

+5 −1
Original line number Diff line number Diff line
@@ -162,7 +162,8 @@ public class SubscriptionController extends ISub.Stub { 
            SubscriptionManager.DATA_ROAMING,

            SubscriptionManager.DISPLAY_NAME,

            SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES,

            SubscriptionManager.UICC_APPLICATIONS_ENABLED));

            SubscriptionManager.UICC_APPLICATIONS_ENABLED,

            SubscriptionManager.IMS_RCS_UCE_ENABLED));



    public static SubscriptionController init(Context c) {

        synchronized (SubscriptionController.class) {
@@ -1786,6 +1787,7 @@ public class SubscriptionController extends ISub.Stub { 
            case SubscriptionManager.WFC_IMS_ROAMING_MODE:

            case SubscriptionManager.WFC_IMS_ROAMING_ENABLED:

            case SubscriptionManager.DATA_ROAMING:

            case SubscriptionManager.IMS_RCS_UCE_ENABLED:

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

                break;

            case SubscriptionManager.DISPLAY_NAME:
@@ -2668,6 +2670,7 @@ public class SubscriptionController extends ISub.Stub { 
            case SubscriptionManager.WFC_IMS_MODE:

            case SubscriptionManager.WFC_IMS_ROAMING_MODE:

            case SubscriptionManager.WFC_IMS_ROAMING_ENABLED:

            case SubscriptionManager.IMS_RCS_UCE_ENABLED:

                value.put(propKey, Integer.parseInt(propValue));

                break;

            case SubscriptionManager.ALLOWED_NETWORK_TYPES:
@@ -2739,6 +2742,7 @@ public class SubscriptionController extends ISub.Stub { 
                        case SubscriptionManager.WFC_IMS_MODE:

                        case SubscriptionManager.WFC_IMS_ROAMING_MODE:

                        case SubscriptionManager.WFC_IMS_ROAMING_ENABLED:

                        case SubscriptionManager.IMS_RCS_UCE_ENABLED:

                        case SubscriptionManager.IS_OPPORTUNISTIC:

                        case SubscriptionManager.GROUP_UUID:

                        case SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES:

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

+3 −1
Original line number Diff line number Diff line
@@ -111,7 +111,9 @@ public class FakeTelephonyProvider extends MockContentProvider { 
                    + Telephony.SimInfo.DATA_ENABLED_OVERRIDE_RULES + " TEXT,"

                    + Telephony.SimInfo.IMSI + " TEXT,"

                    + Telephony.SimInfo.ACCESS_RULES_FROM_CARRIER_CONFIGS + " BLOB,"

                    + Telephony.SimInfo.UICC_APPLICATIONS_ENABLED + " INTEGER DEFAULT 1"

                    + Telephony.SimInfo.UICC_APPLICATIONS_ENABLED + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.ALLOWED_NETWORK_TYPES + " BIGINT DEFAULT -1, "

                    + Telephony.SimInfo.IMS_RCS_UCE_ENABLED + " INTEGER DEFAULT 0"

                    + ");";

        }