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

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

Promotion of atel.lnx.2.0-00029. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1080282   I491ff8dd8d06a54aa92740f7307a41fe96bb7d7b   Launch Emergency Call on Speed Dialing key 9.
1087615   I146e6c358bd44b8a4a5fc872c1ef4f0ffe2cc5ae   IMS-VT:Process crash during MT_VT call accept scenario
1078562   I9fc213eaa8d1a46797b34a962bb58d7656f4773a   Dialer: Screen does not light when incominging call  in

Change-Id: I4c17c7fa15c718a29653d44f3dcfc796628149ca
CRs-Fixed: 1078562, 1080282, 1087615
parents 656f3080 e9f4d419

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />

    <!-- This tells the activity manager to not delay any of our activity

     start requests, even if they happen immediately after the user

     presses home. -->

InCallUI/src/com/android/incallui/InCallPresenter.java

+4 −1
Original line number Diff line number Diff line
@@ -707,6 +707,7 @@ public class InCallPresenter implements CallList.Listener, 
        if (CallList.getInstance().isDsdaEnabled() && (mInCallActivity != null)) {

            mInCallActivity.updateDsdaTab();

        }

        wakeUpScreen();

    }



    @Override
@@ -947,8 +948,10 @@ public class InCallPresenter implements CallList.Listener, 
        }



        Call call = mCallList.getIncomingCall();

        if (call != null) {

            answerIncomingCall(context, call.getVideoState());

        }

    }



    /**

     * Answers any incoming call.

res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -36,4 +36,6 @@ 
  <!--not display SIP dial icon -->

  <bool name="config_hide_SIP_dial_icon">false</bool>



  <integer name="speed_dial_emergency_number_assigned_key">9</integer>



</resources>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,9 @@ ey \'<xliff:g id="number">%s</xliff:g>\'. Do you want to assign an action now?</ 
    <string name="dialog_speed_dial_airplane_mode_message">To use speed dial, first turn off Airplan

e mode.</string>



    <!-- Speed Dial can not be set for the key used for Emergency number-->

    <string name="speed_dial_can_not_be_set">Speed Dial Can not be set for this Key</string>



    <string name="yes">Yes</string>



    <string name="no">No</string>

src/com/android/dialer/SpeedDialListActivity.java

+18 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.content.Context; 
import android.database.Cursor;

import android.net.Uri;

import android.os.Bundle;

import android.os.SystemProperties;

import android.provider.ContactsContract;

import android.provider.ContactsContract.CommonDataKinds.Phone;

import android.provider.Settings;
@@ -64,6 +65,7 @@ import android.widget.ListView; 
import android.widget.PopupMenu;

import android.widget.QuickContactBadge;

import android.widget.TextView;

import android.widget.Toast;



import com.android.contacts.common.ContactPhotoManager;

import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
@@ -110,6 +112,9 @@ public class SpeedDialListActivity extends ListActivity implements 
    private static final int MENU_REPLACE = 1001;

    private static final int MENU_DELETE = 1002;



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

    private static final String CARRIER_ONE_DEFAULT_MCC_MNC = "405854";



    private static class Record {

        long contactId;

        String name;
@@ -135,6 +140,9 @@ public class SpeedDialListActivity extends ListActivity implements 


    private SubscriptionManager mSubscriptionManager;



    private boolean mEmergencyCallSpeedDial = false;

    private int mSpeedDialKeyforEmergncyCall = -1;



    /** Called when the activity is first created. */

    @Override

    public void onCreate(Bundle savedInstanceState) {
@@ -161,6 +169,11 @@ public class SpeedDialListActivity extends ListActivity implements 


        mAdapter = new SpeedDialAdapter();

        setListAdapter(mAdapter);



        String property = SystemProperties.get(PROPERTY_RADIO_ATEL_CARRIER);

        mEmergencyCallSpeedDial = CARRIER_ONE_DEFAULT_MCC_MNC.equals(property);

        mSpeedDialKeyforEmergncyCall = getResources().getInteger(

                R.integer.speed_dial_emergency_number_assigned_key);

    }



    @Override
@@ -315,6 +328,11 @@ public class SpeedDialListActivity extends ListActivity implements 
            }

        } else {

            int number = position + 1;

            if (mEmergencyCallSpeedDial && (number == mSpeedDialKeyforEmergncyCall)) {

                Toast.makeText(SpeedDialListActivity.this, R.string.speed_dial_can_not_be_set,

                Toast.LENGTH_SHORT).show();

                return;

            }

            final Record record = mRecords.get(number);

            if (record == null) {

                showAddSpeedDialDialog(number);