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

Commit 25de1bae authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5392835 from 845aaf7c to qt-release 

Change-Id: Ieaa768816b5c42e5e35cf20ab0a7351ce4b8f76c
parents a29d8767 845aaf7c

Android.bp

+6 −4
Original line number Diff line number Diff line
@@ -40,21 +40,23 @@ java_library { 
        "src/java/**/*.logtags",

    ],



    jarjar_rules: ":framework-jarjar-rules",



    libs: [

        "android.hardware.radio-V1.0-java",

        "android.hardware.radio-V1.1-java",

        "android.hardware.radio-V1.2-java",

        "android.hardware.radio-V1.3-java",

        "android.hardware.radio-V1.4-java",

        "android.hardware.radio.config-V1.0-java",

        "android.hardware.radio.config-V1.1-java",

        "android.hardware.radio.config-V1.2-java",

        "android.hardware.radio.deprecated-V1.0-java",

        "voip-common",

        "ims-common",

        "services",

    ],

    static_libs: [

        "android.hardware.radio.config-V1.0-java-shallow",

        "android.hardware.radio.config-V1.1-java-shallow",

        "android.hardware.radio.config-V1.2-java-shallow",

        "android.hardware.radio.deprecated-V1.0-java-shallow",

        "telephony-protos",

        "ecc-protos-lite",

    ],

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

+2 −2
Original line number Diff line number Diff line
@@ -306,13 +306,13 @@ public class CarrierSignalAgent extends Handler { 
                    PackageManager.MATCH_DEFAULT_ONLY).isEmpty()) {

                loge("Carrier signal receivers are configured but unavailable: "

                        + signal.getComponent());

                return;

                continue;

            }

            if (!wakeup && !packageManager.queryBroadcastReceivers(signal,

                    PackageManager.MATCH_DEFAULT_ONLY).isEmpty()) {

                loge("Runtime signals shouldn't be configured in Manifest: "

                        + signal.getComponent());

                return;

                continue;

            }



            signal.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, mPhone.getSubId());

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static android.telephony.PhoneStateListener.LISTEN_PRECISE_CALL_STATE; 
import static android.telephony.SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;

import static android.telephony.SubscriptionManager.INVALID_PHONE_INDEX;

import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;

import static android.telephony.TelephonyManager.SET_OPPORTUNISTIC_SUB_INVALID_PARAMETER;

import static android.telephony.TelephonyManager.SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION;

import static android.telephony.TelephonyManager.SET_OPPORTUNISTIC_SUB_SUCCESS;

import static android.telephony.TelephonyManager.SET_OPPORTUNISTIC_SUB_VALIDATION_FAILED;
@@ -808,7 +808,7 @@ public class PhoneSwitcher extends Handler { 
            ISetOpportunisticDataCallback callback) {

        if (!mSubscriptionController.isActiveSubId(subId)) {

            log("Can't switch data to inactive subId " + subId);

            sendSetOpptCallbackHelper(callback, SET_OPPORTUNISTIC_SUB_INVALID_PARAMETER);

            sendSetOpptCallbackHelper(callback, SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION);

            return;

        }

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+3 −0
Original line number Diff line number Diff line
@@ -419,6 +419,9 @@ public class DcTracker extends Handler { 
        mSettingsObserver.observe(

                Settings.Global.getUriFor(Settings.Global.DATA_ROAMING + simSuffix),

                DctConstants.EVENT_ROAMING_SETTING_CHANGE);

        mSettingsObserver.observe(

                Settings.Global.getUriFor(Settings.Global.DEVICE_PROVISIONED),

                DctConstants.EVENT_DEVICE_PROVISIONED_CHANGE);

    }



    /**