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

Commit 5d99d2fb authored by Gary Jian's avatar Gary Jian Committed by Automerger Merge Worker
Browse files

Merge "Added nr advanced calling settings support" am: 6d86bbbb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1885711

Change-Id: I9cdfaca9fa370fb71b47d2d5fb58dab07e888c84
parents 4552cbed 6d86bbbb

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

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

            SubscriptionManager.UICC_APPLICATIONS_ENABLED,

            SubscriptionManager.IMS_RCS_UCE_ENABLED,

            SubscriptionManager.CROSS_SIM_CALLING_ENABLED

            SubscriptionManager.CROSS_SIM_CALLING_ENABLED,

            SubscriptionManager.NR_ADVANCED_CALLING_ENABLED

    ));



    public static SubscriptionController init(Context c) {
@@ -2249,6 +2250,7 @@ public class SubscriptionController extends ISub.Stub { 
            case SubscriptionManager.DATA_ROAMING:

            case SubscriptionManager.IMS_RCS_UCE_ENABLED:

            case SubscriptionManager.CROSS_SIM_CALLING_ENABLED:

            case SubscriptionManager.NR_ADVANCED_CALLING_ENABLED:

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

                break;

            case SubscriptionManager.DISPLAY_NAME:
@@ -3187,6 +3189,7 @@ public class SubscriptionController extends ISub.Stub { 
            case SubscriptionManager.IMS_RCS_UCE_ENABLED:

            case SubscriptionManager.CROSS_SIM_CALLING_ENABLED:

            case SubscriptionManager.VOIMS_OPT_IN_STATUS:

            case SubscriptionManager.NR_ADVANCED_CALLING_ENABLED:

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

                break;

            case SubscriptionManager.ALLOWED_NETWORK_TYPES:
@@ -3267,6 +3270,7 @@ public class SubscriptionController extends ISub.Stub { 
                        case SubscriptionManager.VOIMS_OPT_IN_STATUS:

                        case SubscriptionManager.D2D_STATUS_SHARING:

                        case SubscriptionManager.D2D_STATUS_SHARING_SELECTED_CONTACTS:

                        case SubscriptionManager.NR_ADVANCED_CALLING_ENABLED:

                            resultValue = cursor.getString(0);

                            break;

                        default:

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

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ public class FakeTelephonyProvider extends MockContentProvider { 
                    + Telephony.SimInfo.COLUMN_RCS_CONFIG + " BLOB,"

                    + Telephony.SimInfo.COLUMN_ALLOWED_NETWORK_TYPES_FOR_REASONS + " TEXT,"

                    + Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING_SELECTED_CONTACTS + "TEXT"

                    + Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING_SELECTED_CONTACTS + "TEXT,"

                    + Telephony.SimInfo.COLUMN_NR_ADVANCED_CALLING_ENABLED + " INTEGER DEFAULT -1"

                    + ");";

        }