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

Commit 38ca51d0 authored by Shishir Agrawal's avatar Shishir Agrawal
Browse files

DO NOT MERGE : Unhiding MSIM APIs. 

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I9e623100358d65f1ab853c33599cb78f100f7e3a
parent 54cbd324

src/java/android/provider/Telephony.java

+7 −7
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ public final class Telephony { 
        public static Uri addMessageToUri(ContentResolver resolver,

                Uri uri, String address, String body, String subject,

                Long date, boolean read, boolean deliveryReport) {

            return addMessageToUri(SubscriptionManager.getDefaultSmsSubId(),

            return addMessageToUri(SubscriptionManager.getDefaultSmsSubscriptionId(),

                    resolver, uri, address, body, subject, date, read, deliveryReport, -1L);

        }
@@ -382,7 +382,7 @@ public final class Telephony { 
        public static Uri addMessageToUri(ContentResolver resolver,

                Uri uri, String address, String body, String subject,

                Long date, boolean read, boolean deliveryReport, long threadId) {

            return addMessageToUri(SubscriptionManager.getDefaultSmsSubId(),

            return addMessageToUri(SubscriptionManager.getDefaultSmsSubscriptionId(),

                    resolver, uri, address, body, subject,

                    date, read, deliveryReport, threadId);

        }
@@ -522,7 +522,7 @@ public final class Telephony { 
            public static Uri addMessage(ContentResolver resolver,

                    String address, String body, String subject, Long date,

                    boolean read) {

                return addMessageToUri(SubscriptionManager.getDefaultSmsSubId(),

                return addMessageToUri(SubscriptionManager.getDefaultSmsSubscriptionId(),

                        resolver, CONTENT_URI, address, body, subject, date, read, false);

            }
@@ -581,7 +581,7 @@ public final class Telephony { 
             */

            public static Uri addMessage(ContentResolver resolver,

                    String address, String body, String subject, Long date) {

                return addMessageToUri(SubscriptionManager.getDefaultSmsSubId(),

                return addMessageToUri(SubscriptionManager.getDefaultSmsSubscriptionId(),

                        resolver, CONTENT_URI, address, body, subject, date, true, false);

            }
@@ -626,7 +626,7 @@ public final class Telephony { 
            */

            public static Uri addMessage(ContentResolver resolver,

                    String address, String body, String subject, Long date) {

                return addMessageToUri(SubscriptionManager.getDefaultSmsSubId(),

                return addMessageToUri(SubscriptionManager.getDefaultSmsSubscriptionId(),

                        resolver, CONTENT_URI, address, body, subject, date, true, false);

            }
@@ -691,7 +691,7 @@ public final class Telephony { 
            public static Uri addMessage(ContentResolver resolver,

                    String address, String body, String subject, Long date,

                    boolean deliveryReport, long threadId) {

                return addMessageToUri(SubscriptionManager.getDefaultSmsSubId(),

                return addMessageToUri(SubscriptionManager.getDefaultSmsSubscriptionId(),

                        resolver, CONTENT_URI, address, body, subject, date,

                        true, deliveryReport, threadId);

            }
@@ -1127,7 +1127,7 @@ public final class Telephony { 


                String format = intent.getStringExtra("format");

                int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,

                        SubscriptionManager.getDefaultSmsSubId());

                        SubscriptionManager.getDefaultSmsSubscriptionId());



                Rlog.v(TAG, " getMessagesFromIntent sub_id : " + subId);

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

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    private void doNotifyDataConnection(Phone sender, String reason, String apnType,

            PhoneConstants.DataState state) {

        int subId = sender.getSubId();

        long dds = SubscriptionManager.getDefaultDataSubId();

        long dds = SubscriptionManager.getDefaultDataSubscriptionId();

        if (DBG) log("subId = " + subId + ", DDS = " + dds);



        // TODO

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

+1 −1
Original line number Diff line number Diff line
@@ -2367,7 +2367,7 @@ public class GsmCdmaPhone extends Phone { 
    @Override

    public boolean updateCurrentCarrierInProvider() {

        if (isPhoneTypeGsm() || isPhoneTypeCdmaLte()) {

            long currentDds = SubscriptionManager.getDefaultDataSubId();

            long currentDds = SubscriptionManager.getDefaultDataSubscriptionId();

            String operatorNumeric = getOperatorNumeric();



            logd("updateCurrentCarrierInProvider: mSubId = " + getSubId()

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

+12 −9
Original line number Diff line number Diff line
@@ -92,19 +92,22 @@ public class IccProvider extends ContentProvider { 


        switch (URL_MATCHER.match(url)) {

            case ADN:

                return loadFromEf(IccConstants.EF_ADN, SubscriptionManager.getDefaultSubId());

                return loadFromEf(IccConstants.EF_ADN,

                        SubscriptionManager.getDefaultSubscriptionId());



            case ADN_SUB:

                return loadFromEf(IccConstants.EF_ADN, getRequestSubId(url));



            case FDN:

                return loadFromEf(IccConstants.EF_FDN, SubscriptionManager.getDefaultSubId());

                return loadFromEf(IccConstants.EF_FDN,

                        SubscriptionManager.getDefaultSubscriptionId());



            case FDN_SUB:

                return loadFromEf(IccConstants.EF_FDN, getRequestSubId(url));



            case SDN:

                return loadFromEf(IccConstants.EF_SDN, SubscriptionManager.getDefaultSubId());

                return loadFromEf(IccConstants.EF_SDN,

                        SubscriptionManager.getDefaultSubscriptionId());



            case SDN_SUB:

                return loadFromEf(IccConstants.EF_SDN, getRequestSubId(url));
@@ -168,7 +171,7 @@ public class IccProvider extends ContentProvider { 
        switch (match) {

            case ADN:

                efType = IccConstants.EF_ADN;

                subId = SubscriptionManager.getDefaultSubId();

                subId = SubscriptionManager.getDefaultSubscriptionId();

                break;



            case ADN_SUB:
@@ -178,7 +181,7 @@ public class IccProvider extends ContentProvider { 


            case FDN:

                efType = IccConstants.EF_FDN;

                subId = SubscriptionManager.getDefaultSubId();

                subId = SubscriptionManager.getDefaultSubscriptionId();

                pin2 = initialValues.getAsString("pin2");

                break;
@@ -261,7 +264,7 @@ public class IccProvider extends ContentProvider { 
        switch (match) {

            case ADN:

                efType = IccConstants.EF_ADN;

                subId = SubscriptionManager.getDefaultSubId();

                subId = SubscriptionManager.getDefaultSubscriptionId();

                break;



            case ADN_SUB:
@@ -271,7 +274,7 @@ public class IccProvider extends ContentProvider { 


            case FDN:

                efType = IccConstants.EF_FDN;

                subId = SubscriptionManager.getDefaultSubId();

                subId = SubscriptionManager.getDefaultSubscriptionId();

                break;



            case FDN_SUB:
@@ -345,7 +348,7 @@ public class IccProvider extends ContentProvider { 
        switch (match) {

            case ADN:

                efType = IccConstants.EF_ADN;

                subId = SubscriptionManager.getDefaultSubId();

                subId = SubscriptionManager.getDefaultSubscriptionId();

                break;



            case ADN_SUB:
@@ -355,7 +358,7 @@ public class IccProvider extends ContentProvider { 


            case FDN:

                efType = IccConstants.EF_FDN;

                subId = SubscriptionManager.getDefaultSubId();

                subId = SubscriptionManager.getDefaultSubscriptionId();

                pin2 = values.getAsString("pin2");

                break;

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

+3 −3
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ public class ServiceStateTracker extends Handler { 
                break;



            case EVENT_ALL_DATA_DISCONNECTED:

                int dds = SubscriptionManager.getDefaultDataSubId();

                int dds = SubscriptionManager.getDefaultDataSubscriptionId();

                ProxyController.getInstance().unregisterForAllDataDisconnected(dds, this);

                synchronized(this) {

                    if (mPendingRadioPowerOffAfterDataOff) {
@@ -4037,7 +4037,7 @@ public class ServiceStateTracker extends Handler { 


        switch (notifyType) {

            case PS_ENABLED:

                long dataSubId = SubscriptionManager.getDefaultDataSubId();

                long dataSubId = SubscriptionManager.getDefaultDataSubscriptionId();

                if (dataSubId != mPhone.getSubId()) {

                    return;

                }
@@ -4232,7 +4232,7 @@ public class ServiceStateTracker extends Handler { 
        synchronized (this) {

            if (!mPendingRadioPowerOffAfterDataOff) {

                if (mPhone.isPhoneTypeGsm() || mPhone.isPhoneTypeCdmaLte()) {

                    int dds = SubscriptionManager.getDefaultDataSubId();

                    int dds = SubscriptionManager.getDefaultDataSubscriptionId();

                    // To minimize race conditions we call cleanUpAllConnections on

                    // both if else paths instead of before this isDisconnected test.

                    if (dcTracker.isDisconnected()