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

Commit c41cb737 authored by Nathan Harold's avatar Nathan Harold
Browse files

Add Callback for Registration Failure 

Add a callback to PhoneStateListener to indicate that
a registration procedure has failed.

Bug: 143187047
Test: make update-api && make
Merged-In: I4a4ba4479dfd465a9d8063135f3b4bf4e1323e99
Change-Id: I4a4ba4479dfd465a9d8063135f3b4bf4e1323e99
(cherry picked from commit 5e6e983c)
parent 78ff9fe2

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -45040,6 +45040,7 @@ package android.telephony { 
    method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo);

    method public void onMessageWaitingIndicatorChanged(boolean);

    method @RequiresPermission("android.permission.MODIFY_PHONE_STATE") public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState);

    method public void onRegistrationFailed(@NonNull android.telephony.CellIdentity, @NonNull String, int, int, int);

    method public void onServiceStateChanged(android.telephony.ServiceState);

    method @Deprecated public void onSignalStrengthChanged(int);

    method public void onSignalStrengthsChanged(android.telephony.SignalStrength);
@@ -45057,6 +45058,7 @@ package android.telephony { 
    field public static final int LISTEN_MESSAGE_WAITING_INDICATOR = 4; // 0x4

    field public static final int LISTEN_NONE = 0; // 0x0

    field @RequiresPermission("android.permission.MODIFY_PHONE_STATE") public static final int LISTEN_PRECISE_DATA_CONNECTION_STATE = 4096; // 0x1000

    field @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int LISTEN_REGISTRATION_FAILURE = 1073741824; // 0x40000000

    field public static final int LISTEN_SERVICE_STATE = 1; // 0x1

    field @Deprecated public static final int LISTEN_SIGNAL_STRENGTH = 2; // 0x2

    field public static final int LISTEN_SIGNAL_STRENGTHS = 256; // 0x100

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -8682,7 +8682,9 @@ package android.telephony { 
    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.NetworkRegistrationInfo> CREATOR;

    field public static final int DOMAIN_CS = 1; // 0x1

    field public static final int DOMAIN_CS_PS = 3; // 0x3

    field public static final int DOMAIN_PS = 2; // 0x2

    field public static final int DOMAIN_UNKNOWN = 0; // 0x0

    field public static final int REGISTRATION_STATE_DENIED = 3; // 0x3

    field public static final int REGISTRATION_STATE_HOME = 1; // 0x1

    field public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0; // 0x0
@@ -9287,6 +9289,7 @@ package android.telephony { 
    method public void addOnSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener, @NonNull java.util.concurrent.Executor);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyCallStateChangedForAllSubscriptions(int, @Nullable String);

    method public void notifyCarrierNetworkChange(boolean);

    method public void notifyRegistrationFailed(int, int, @NonNull android.telephony.CellIdentity, @NonNull String, int, int, int);

    method public void removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);

    method public void removeOnSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);

  }

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2964,7 +2964,9 @@ package android.telephony { 
    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.NetworkRegistrationInfo> CREATOR;

    field public static final int DOMAIN_CS = 1; // 0x1

    field public static final int DOMAIN_CS_PS = 3; // 0x3

    field public static final int DOMAIN_PS = 2; // 0x2

    field public static final int DOMAIN_UNKNOWN = 0; // 0x0

    field public static final int REGISTRATION_STATE_DENIED = 3; // 0x3

    field public static final int REGISTRATION_STATE_HOME = 1; // 0x1

    field public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0; // 0x0

core/java/android/telephony/PhoneStateListener.java

+59 −0
Original line number Diff line number Diff line
@@ -369,6 +369,21 @@ public class PhoneStateListener { 
    @RequiresPermission(Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION)

    public static final int LISTEN_OUTGOING_EMERGENCY_SMS                   = 0x20000000;



    /**

     * Listen for Registration Failures.

     *

     * Listen for indications that a registration procedure has failed in either the CS or PS

     * domain. This indication does not necessarily indicate a change of service state, which should

     * be tracked via {@link #LISTEN_SERVICE_STATE}.

     *

     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or the calling

     * app has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}).

     *

     * @see #onRegistrationFailed()

     */

    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)

    public static final int LISTEN_REGISTRATION_FAILURE = 0x40000000;



    /*

     * Subscription used to listen to the phone state changes

     * @hide
@@ -931,6 +946,38 @@ public class PhoneStateListener { 
        // default implementation empty

    }



    /**

     * Report that Registration or a Location/Routing/Tracking Area update has failed.

     *

     * <p>Indicate whenever a registration procedure, including a location, routing, or tracking

     * area update fails. This includes procedures that do not necessarily result in a change of

     * the modem's registration status. If the modem's registration status changes, that is

     * reflected in the onNetworkStateChanged() and subsequent get{Voice/Data}RegistrationState().

     *

     * <p>Because registration failures are ephemeral, this callback is not sticky.

     * Registrants will not receive the most recent past value when registering.

     *

     * @param cellIdentity the CellIdentity, which must include the globally unique identifier

     *        for the cell (for example, all components of the CGI or ECGI).

     * @param chosenPlmn a 5 or 6 digit alphanumeric PLMN (MCC|MNC) among those broadcast by the

     *         cell that was chosen for the failed registration attempt.

     * @param domain DOMAIN_CS, DOMAIN_PS or both in case of a combined procedure.

     * @param causeCode the primary failure cause code of the procedure.

     *        For GSM/UMTS (MM), values are in TS 24.008 Sec 10.5.95

     *        For GSM/UMTS (GMM), values are in TS 24.008 Sec 10.5.147

     *        For LTE (EMM), cause codes are TS 24.301 Sec 9.9.3.9

     *        For NR (5GMM), cause codes are TS 24.501 Sec 9.11.3.2

     *        Integer.MAX_VALUE if this value is unused.

     * @param additionalCauseCode the cause code of any secondary/combined procedure if appropriate.

     *        For UMTS, if a combined attach succeeds for PS only, then the GMM cause code shall be

     *        included as an additionalCauseCode. For LTE (ESM), cause codes are in

     *        TS 24.301 9.9.4.4. Integer.MAX_VALUE if this value is unused.

     */

    public void onRegistrationFailed(@NonNull CellIdentity cellIdentity, @NonNull String chosenPlmn,

            @NetworkRegistrationInfo.Domain int domain, int causeCode, int additionalCauseCode) {

        // default implementation empty

    }



    /**

     * The callback methods need to be called on the handler thread where

     * this object was created.  If the binder did that for us it'd be nice.
@@ -1203,6 +1250,18 @@ public class PhoneStateListener { 
                            () -> psl.onImsCallDisconnectCauseChanged(disconnectCause)));



        }



        public void onRegistrationFailed(@NonNull CellIdentity cellIdentity,

                @NonNull String chosenPlmn, @NetworkRegistrationInfo.Domain int domain,

                int causeCode, int additionalCauseCode) {

            PhoneStateListener psl = mPhoneStateListenerWeakRef.get();

            if (psl == null) return;



            Binder.withCleanCallingIdentity(

                    () -> mExecutor.execute(() -> psl.onRegistrationFailed(

                            cellIdentity, chosenPlmn, domain, causeCode, additionalCauseCode)));

            // default implementation empty

        }

    }

core/java/android/telephony/TelephonyRegistryManager.java

+33 −1
Original line number Diff line number Diff line
@@ -621,9 +621,9 @@ public class TelephonyRegistryManager { 
     * Notify call disconnect causes which contains {@link DisconnectCause} and {@link

     * android.telephony.PreciseDisconnectCause}.

     *

     * @param subId for which call disconnected.

     * @param slotIndex for which call disconnected. Can be derived from subId except when subId is

     * invalid.

     * @param subId for which call disconnected.

     * @param cause {@link DisconnectCause} for the disconnected call.

     * @param preciseCause {@link android.telephony.PreciseDisconnectCause} for the disconnected

     * call.
@@ -682,4 +682,36 @@ public class TelephonyRegistryManager { 


        }

    }



    /**

     * Report that Registration or a Location/Routing/Tracking Area update has failed.

     *

     * @param slotIndex for which call disconnected. Can be derived from subId except when subId is

     * invalid.

     * @param subId for which cellinfo changed.

     * @param cellIdentity the CellIdentity, which must include the globally unique identifier

     *        for the cell (for example, all components of the CGI or ECGI).

     * @param chosenPlmn a 5 or 6 digit alphanumeric PLMN (MCC|MNC) among those broadcast by the

     *         cell that was chosen for the failed registration attempt.

     * @param domain DOMAIN_CS, DOMAIN_PS or both in case of a combined procedure.

     * @param causeCode the primary failure cause code of the procedure.

     *        For GSM/UMTS (MM), values are in TS 24.008 Sec 10.5.95

     *        For GSM/UMTS (GMM), values are in TS 24.008 Sec 10.5.147

     *        For LTE (EMM), cause codes are TS 24.301 Sec 9.9.3.9

     *        For NR (5GMM), cause codes are TS 24.501 Sec 9.11.3.2

     *        Integer.MAX_VALUE if this value is unused.

     * @param additionalCauseCode the cause code of any secondary/combined procedure if appropriate.

     *        For UMTS, if a combined attach succeeds for PS only, then the GMM cause code shall be

     *        included as an additionalCauseCode. For LTE (ESM), cause codes are in

     *        TS 24.301 9.9.4.4. Integer.MAX_VALUE if this value is unused.

     */

    public void notifyRegistrationFailed(int slotIndex, int subId,

            @NonNull CellIdentity cellIdentity, @NonNull String chosenPlmn,

            @NetworkRegistrationInfo.Domain int domain, int causeCode, int additionalCauseCode) {

        try {

            sRegistry.notifyRegistrationFailed(slotIndex, subId, cellIdentity,

                    chosenPlmn, domain, causeCode, additionalCauseCode);

        } catch (RemoteException ex) {

        }

    }

}