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

Commit 1fa6cf15 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed that DcTracker does not use correct data registration info 

Fixed by using correct info from the corresponding transport

Test: Unit tests + manual
Bug: 126436426

Change-Id: Ie8ae20423b794622b6a6141faf68c01b75c144ce
parent 9cfdca16

config/hiddenapi-greylist.txt

+0 −3
Original line number Diff line number Diff line
@@ -3041,7 +3041,6 @@ Lcom/android/internal/telephony/ServiceStateTracker;->isInHomeSidNid(II)Z 
Lcom/android/internal/telephony/ServiceStateTracker;->isInvalidOperatorNumeric(Ljava/lang/String;)Z

Lcom/android/internal/telephony/ServiceStateTracker;->log(Ljava/lang/String;)V

Lcom/android/internal/telephony/ServiceStateTracker;->loge(Ljava/lang/String;)V

Lcom/android/internal/telephony/ServiceStateTracker;->mAttachedRegistrants:Landroid/os/RegistrantList;

Lcom/android/internal/telephony/ServiceStateTracker;->mCi:Lcom/android/internal/telephony/CommandsInterface;

Lcom/android/internal/telephony/ServiceStateTracker;->mCr:Landroid/content/ContentResolver;

Lcom/android/internal/telephony/ServiceStateTracker;->mCurDataSpn:Ljava/lang/String;
@@ -3053,7 +3052,6 @@ Lcom/android/internal/telephony/ServiceStateTracker;->mDataRoamingOffRegistrants 
Lcom/android/internal/telephony/ServiceStateTracker;->mDataRoamingOnRegistrants:Landroid/os/RegistrantList;

Lcom/android/internal/telephony/ServiceStateTracker;->mDefaultRoamingIndicator:I

Lcom/android/internal/telephony/ServiceStateTracker;->mDesiredPowerState:Z

Lcom/android/internal/telephony/ServiceStateTracker;->mDetachedRegistrants:Landroid/os/RegistrantList;

Lcom/android/internal/telephony/ServiceStateTracker;->mDeviceShuttingDown:Z

Lcom/android/internal/telephony/ServiceStateTracker;->mEmergencyOnly:Z

Lcom/android/internal/telephony/ServiceStateTracker;->mIccRecords:Lcom/android/internal/telephony/uicc/IccRecords;
@@ -3081,7 +3079,6 @@ Lcom/android/internal/telephony/ServiceStateTracker;->mUiccApplcation:Lcom/andro 
Lcom/android/internal/telephony/ServiceStateTracker;->mUiccController:Lcom/android/internal/telephony/uicc/UiccController;

Lcom/android/internal/telephony/ServiceStateTracker;->mVoiceRoamingOffRegistrants:Landroid/os/RegistrantList;

Lcom/android/internal/telephony/ServiceStateTracker;->mVoiceRoamingOnRegistrants:Landroid/os/RegistrantList;

Lcom/android/internal/telephony/ServiceStateTracker;->notifyDataRegStateRilRadioTechnologyChanged()V

Lcom/android/internal/telephony/ServiceStateTracker;->notifySignalStrength()Z

Lcom/android/internal/telephony/ServiceStateTracker;->pollState()V

Lcom/android/internal/telephony/ServiceStateTracker;->reRegisterNetwork(Landroid/os/Message;)V

telephony/java/android/telephony/NetworkRegistrationState.java

+8 −0
Original line number Diff line number Diff line
@@ -284,6 +284,14 @@ public class NetworkRegistrationState implements Parcelable { 
        return mRoamingType != ServiceState.ROAMING_TYPE_NOT_ROAMING;

    }



    /**

     * @hide

     * @return {@code true} if in service.

     */

    public boolean isInService() {

        return mRegState == REG_STATE_HOME || mRegState == REG_STATE_ROAMING;

    }



    /**

     * Set {@link ServiceState.RoamingType roaming type}. This could override

     * roaming type based on resource overlay or carrier config.