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

Commit fcb071cd authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "refactor preciseDataState" 

am: d762a8ef

Change-Id: Ib683a2219d84f345fb30ca954f8b4a9f691cc680
parents 02210cb6 d762a8ef

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

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.telephony.CellInfo;

import android.telephony.CellLocation;

import android.telephony.DataFailCause;

import android.telephony.PhoneCapability;

import android.telephony.PhysicalChannelConfig;

import android.telephony.PreciseCallState;
@@ -286,7 +287,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    }



    public void notifyPreciseDataConnectionFailed(Phone sender, String apnType,

            String apn, String failCause) {

            String apn, @DataFailCause.FailCause int failCause) {

        // FIXME: subId?

        try {

            mRegistry.notifyPreciseDataConnectionFailed(apnType, apn, failCause);

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

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.telephony.CarrierConfigManager; 
import android.telephony.CellInfo;

import android.telephony.CellLocation;

import android.telephony.ClientRequestStats;

import android.telephony.DataFailCause;

import android.telephony.ImsiEncryptionInfo;

import android.telephony.PhoneStateListener;

import android.telephony.PhysicalChannelConfig;
@@ -3096,7 +3097,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    }



    public void notifyPreciseDataConnectionFailed(String apnType, String apn,

            String failCause) {

            @DataFailCause.FailCause int failCause) {

        mNotifier.notifyPreciseDataConnectionFailed(this, apnType, apn, failCause);

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.telephony; 


import android.telephony.CellInfo;

import android.telephony.CellLocation;

import android.telephony.DataFailCause;

import android.telephony.PhoneCapability;

import android.telephony.PhysicalChannelConfig;

import android.telephony.TelephonyManager;
@@ -59,8 +60,8 @@ public interface PhoneNotifier { 


    void notifyDisconnectCause(int cause, int preciseCause);



    void notifyPreciseDataConnectionFailed(Phone sender, String apnType, String apn,

                                                  String failCause);

    public void notifyPreciseDataConnectionFailed(Phone sender, String apnType, String apn,

                                                  @DataFailCause.FailCause int failCause);



    /** send a notification that the SRVCC state has changed.*/

    void notifySrvccStateChanged(Phone sender, @TelephonyManager.SrvccState int state);

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

+3 −2
Original line number Diff line number Diff line
@@ -2718,8 +2718,9 @@ public class DcTracker extends Handler { 
                        cause, cid, mTelephonyManager.getNetworkType());

            }

            ApnSetting apn = apnContext.getApnSetting();

            mPhone.notifyPreciseDataConnectionFailed(apnContext.getApnType(),

                    apn != null ? apn.getApnName() : "unknown", cause + "");

            mPhone.notifyPreciseDataConnectionFailed(

                    apnContext.getApnType(), apn != null ? apn.getApnName()

                    : "unknown", cause);



            // Compose broadcast intent send to the specific carrier signaling receivers

            Intent intent = new Intent(TelephonyIntents

tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.IBinder; 
import android.os.RemoteException;

import android.os.UserHandle;

import android.telephony.CellInfo;

import android.telephony.DataFailCause;

import android.telephony.PhoneCapability;

import android.telephony.PhysicalChannelConfig;

import android.telephony.ServiceState;
@@ -378,7 +379,7 @@ public class TelephonyRegistryMock extends ITelephonyRegistry.Stub { 


    @Override

    public void notifyPreciseDataConnectionFailed(String apnType, String apn,

            String failCause) {

                                                  @DataFailCause.FailCause int failCause) {

        throw new RuntimeException("Not implemented");

    }