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

Commit 46bde45c authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android-framework.lnx.2.0-00006. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
957277 957403   I60b8e50c92d06c0d847df501178add070b98273b   Add support for LTE, LTE+ data icons display.
1061684   Ic8e8ffc70d9255275ad9654a4de13861e4457774   Send intent onLaunch of StatusBar in IntentTile
1001718   I168a9621e2121c8aee9d93b6048219cf3a4085f4   Do not display sim absent when sim info is not available
1063174   I3020d675bec3266da7d91d303cb9f8858a99bcbb   IMS: Update MISSED_IMS_TYPE and MISSED_WIFI_TYPE calls i
957838   If218ea3ead2b837d9c2d1cac4d353c1d35c5babe   MSIM: Restrict data activity change to listeners with ma
784379   I464b87f1a6470401b2ef4e7507b804b1da5b5af2   Tether: fix bt-pan and wlan0 timing issue
1060934   I419026649addfd14a4067ecadca5f676b322ecc8   SystemUI: Fix SystemUI FC issue
1003527   Ic2811f80085e5f9a25ea589c1c1c9247cad4ab72   MSIM: Provide voice pref selection in qucksettings.
1018881c   I69afdd8b85dd2d5d352ba70b716453e3425f3760   Keyguard: Replace "Emergency" to "Emergency call"
1023026   I583e6163f5c841e74593d94cbcd67855eb11bd14   SystemUI: Fix for display datatype icon while in roaming
968357   Ie8155eb4590b61f79215d3277648d112d9055073   Display H icon for HSPA RAT's

Change-Id: I6773bff7b6e9fc453c046fda221f5ecfd68954df
CRs-Fixed: 784379, 1063174, 1023026, 1060934, 957277, 957403, 1001718, 957838, 1018881c, 1061684, 968357, 1003527
parents 2e18d19f a066b0dd

core/java/android/provider/CallLog.java

+19 −1
Original line number Diff line number Diff line
@@ -203,6 +203,23 @@ public class CallLog { 
         * @hide

         */

        public static final int ANSWERED_EXTERNALLY_TYPE = 7;

        /** Call log type for missed IMS calls. */

        private static final int MISSED_IMS_TYPE = 10;

        /**

         * Call log type for incoming WiFi calls.

         * @hide

         */

        public static final int INCOMING_WIFI_TYPE = 20;

        /**

         * Call log type for outgoing WiFi calls.

         * @hide

         */

        public static final int OUTGOING_WIFI_TYPE = 21;

        /**

         * Call log type for missed WiFi calls.

         * @hide

         */

        public static final int MISSED_WIFI_TYPE = 22;



        /**

         * Bit-mask describing features of the call (e.g. video).
@@ -648,7 +665,8 @@ public class CallLog { 
            values.put(NEW, Integer.valueOf(1));

            values.put(ADD_FOR_ALL_USERS, addForAllUsers ? 1 : 0);



            if (callType == MISSED_TYPE) {

            if (callType == MISSED_TYPE || callType == MISSED_IMS_TYPE

                    || callType == MISSED_WIFI_TYPE) {

                values.put(IS_READ, Integer.valueOf(is_read ? 1 : 0));

            }

packages/Keyguard/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -399,4 +399,5 @@ number">%d</xliff:g> remaining attempt before SIM becomes permanently unusable. 
number">%d</xliff:g> remaining attempts before SIM becomes permanently unusable. Contact carrier for details.</item>

    </plurals>



    <string name="button_lockscreen_emergency_call">Emergency call</string>

</resources>

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+21 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.util.AttributeSet; 
import android.util.Log;

import android.view.View;

import android.widget.TextView;

import android.os.SystemProperties;



import com.android.internal.telephony.IccCardConstants;

import com.android.internal.telephony.IccCardConstants.State;
@@ -158,10 +159,29 @@ public class CarrierText extends TextView { 
        boolean showLocale = getContext().getResources().getBoolean(

                com.android.internal.R.bool.config_monitor_locale_change);

        CharSequence displayText = null;



        String carrier = "405854";

        List<SubscriptionInfo> subs = mKeyguardUpdateMonitor.getSubscriptionInfo(false);

        final int N = subs.size();

        if (DEBUG) Log.d(TAG, "updateCarrierText(): " + N);

        // If the Subscription Infos are not available and if any of the sims are not

        // in SIM_STATE_ABSENT,set displayText as "NO SERVICE".

        // displayText will be overrided after the Subscription infos are available and

        // displayText is set according to the SIM Status.

        String property = SystemProperties.get("persist.radio.atel.carrier");

            if (N == 0 && carrier.equals(property)) {

                 boolean isSimAbsent = false;

                 for (int i = 0; i < TelephonyManager.getDefault().getSimCount(); i++) {

                      if (TelephonyManager.getDefault().getSimState(i)

                            == TelephonyManager.SIM_STATE_ABSENT) {

                            isSimAbsent = true;

                            break;

                      }

            }

            if (!isSimAbsent) {

                allSimsMissing = false;

                displayText = getContext().getString(R.string.keyguard_carrier_default);

            }

        }

        for (int i = 0; i < N; i++) {

            CharSequence networkClass = "";

            int subId = subs.get(i).getSubscriptionId();

packages/Keyguard/src/com/android/keyguard/EmergencyButton.java

+18 −1
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ public class EmergencyButton extends Button { 


    private final boolean mIsVoiceCapable;

    private final boolean mEnableEmergencyCallWhileSimLocked;

    private final boolean mIsCarrierSupported = isCarrierOneSupported();



    public static final String PROPERTY_RADIO_ATEL_CARRIER = "persist.radio.atel.carrier";

    public static final String CARRIER_ONE_DEFAULT_MCC_MNC = "405854";



    public EmergencyButton(Context context) {

        this(context, null);
@@ -172,9 +176,14 @@ public class EmergencyButton extends Button { 
            int textId;

            if (isInCall()) {

                textId = com.android.internal.R.string.lockscreen_return_to_call;

            } else {

                if (mIsCarrierSupported) {

                    // Text "Emergency call"

                    textId = R.string.button_lockscreen_emergency_call;

                } else {

                    textId = com.android.internal.R.string.lockscreen_emergency_call;

                }

            }

            setText(textId);

        } else {

            setVisibility(View.GONE);
@@ -202,4 +211,12 @@ public class EmergencyButton extends Button { 
    private TelecomManager getTelecommManager() {

        return (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE);

    }



    /**

     * Check is carrier one supported or not

     */

    public static boolean isCarrierOneSupported() {

        String property = SystemProperties.get(PROPERTY_RADIO_ATEL_CARRIER);

        return CARRIER_ONE_DEFAULT_MCC_MNC.equals(property);

    }

}

packages/SystemUI/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    framework-protos \

    SystemUI-proto-tags



LOCAL_JAVA_LIBRARIES := telephony-common

LOCAL_JAVA_LIBRARIES := telephony-common telephony-ext



LOCAL_PACKAGE_NAME := SystemUI

LOCAL_CERTIFICATE := platform