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

Commit d38615b8 authored by nharold's avatar nharold Committed by android-build-merger
Browse files

Merge changes from topic 'sms-files-move-opt-to-base' 

am: abcc43d8

Change-Id: Ib61b38a3fd065c3906e2e3f0863b83f2f4b740f4
parents 7fbbc2e8 abcc43d8

services/core/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_SRC_FILES += \ 
LOCAL_AIDL_INCLUDES += \

    system/netd/server/binder



LOCAL_JAVA_LIBRARIES := services.net telephony-common

LOCAL_JAVA_LIBRARIES := services.net

LOCAL_STATIC_JAVA_LIBRARIES := tzdata_shared2 tzdata_update2

LOCAL_PROTOC_OPTIMIZE_TYPE := nano

services/core/java/com/android/server/TelephonyRegistry.java

+4 −5
Original line number Diff line number Diff line
@@ -57,9 +57,8 @@ import com.android.internal.app.IBatteryStats; 
import com.android.internal.telephony.IOnSubscriptionsChangedListener;

import com.android.internal.telephony.ITelephonyRegistry;

import com.android.internal.telephony.IPhoneStateListener;

import com.android.internal.telephony.DefaultPhoneNotifier;

import com.android.internal.telephony.PhoneConstantConversions;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.ServiceStateTracker;

import com.android.internal.telephony.TelephonyIntents;

import com.android.server.am.BatteryStatsService;
@@ -171,7 +170,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 


    private int[] mDataConnectionNetworkType;



    private int mOtaspMode = ServiceStateTracker.OTASP_UNKNOWN;

    private int mOtaspMode = TelephonyManager.OTASP_UNKNOWN;



    private ArrayList<List<CellInfo>> mCellInfo = null;
@@ -1496,7 +1495,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 


        Intent intent = new Intent(TelephonyManager.ACTION_PHONE_STATE_CHANGED);

        intent.putExtra(PhoneConstants.STATE_KEY,

                DefaultPhoneNotifier.convertCallState(state).toString());

                PhoneConstantConversions.convertCallState(state).toString());

        if (!TextUtils.isEmpty(incomingNumber)) {

            intent.putExtra(TelephonyManager.EXTRA_INCOMING_NUMBER, incomingNumber);

        }
@@ -1530,7 +1529,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        // required info.

        Intent intent = new Intent(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);

        intent.putExtra(PhoneConstants.STATE_KEY,

                DefaultPhoneNotifier.convertDataState(state).toString());

                PhoneConstantConversions.convertDataState(state).toString());

        if (!isDataConnectivityPossible) {

            intent.putExtra(PhoneConstants.NETWORK_UNAVAILABLE_KEY, true);

        }