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

Commit f604f167 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge changes from topic "cbrs_tethering_failed" 

* changes:
  Fixed crash in getActiveDataSubscriptionId
  Fixed permission exception for getNetworkType
  Fixed tethering failed when device is on CBRS
parents 548eab37 79562319

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

+7 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,13 @@ public class PhoneSwitcher extends Handler { 
        }

    }



    /**

     * @return The active data subscription id

     */

    public int getActiveDataSubId() {

        return mPreferredDataSubId;

    }



    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {

        final IndentingPrintWriter pw = new IndentingPrintWriter(writer, "  ");

        pw.println("PhoneSwitcher:");

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

+27 −0
Original line number Diff line number Diff line
@@ -3683,4 +3683,31 @@ public class SubscriptionController extends ISub.Stub { 
        return TextUtils.emptyIfNull(getSubscriptionProperty(subId,

                SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES));

    }



    /**

     * Get active data subscription id.

     *

     * @return Active data subscription id

     *

     * @hide

     */

    @Override

    public int getActiveDataSubscriptionId() {

        final long token = Binder.clearCallingIdentity();



        try {

            PhoneSwitcher phoneSwitcher = PhoneSwitcher.getInstance();

            if (phoneSwitcher != null) {

                int activeDataSubId = phoneSwitcher.getActiveDataSubId();

                if (SubscriptionManager.isUsableSubscriptionId(activeDataSubId)) {

                    return activeDataSubId;

                }

            }

            // If phone switcher isn't ready, or active data sub id is not available, use default

            // sub id from settings.

            return getDefaultDataSubId();

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }

}