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

Commit 32f843db authored by Brad Ebinger's avatar Brad Ebinger
Browse files

API Review: Make ImsReasonInfo in ImsMmTelManager @NonNull 

1) If the vendor does not specify an ImsReasonInfo, create an
unspecified ImsReasonInfo instead of passing null back.
2) Move onUnregistered to @NonNull

Fixes: 150008589
Test: atest CtsTelephonyTestCases:ImsServiceTest
Change-Id: Idd0f2216bdd55011cb16d268b61cb652ca11bd41
parent 97d835f6

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -48996,8 +48996,8 @@ package android.telephony.ims { 
    ctor public RegistrationManager.RegistrationCallback();

    method public void onRegistered(int);

    method public void onRegistering(int);

    method public void onTechnologyChangeFailed(int, @Nullable android.telephony.ims.ImsReasonInfo);

    method public void onUnregistered(@Nullable android.telephony.ims.ImsReasonInfo);

    method public void onTechnologyChangeFailed(int, @NonNull android.telephony.ims.ImsReasonInfo);

    method public void onUnregistered(@NonNull android.telephony.ims.ImsReasonInfo);

  }















}

























telephony/java/android/telephony/ims/ImsMmTelManager.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -21,7 +21,6 @@ import android.Manifest;













import android.annotation.CallbackExecutor;















import android.annotation.IntDef;















import android.annotation.NonNull;













import android.annotation.Nullable;















import android.annotation.RequiresPermission;















import android.annotation.SuppressAutoDoc;















import android.annotation.SuppressLint;










@@ -124,7 +123,7 @@ public class ImsMmTelManager implements RegistrationManager {













         * @param info the {@link ImsReasonInfo} associated with why registration was disconnected.















         */















        @Override













        public void onUnregistered(@Nullable ImsReasonInfo info) {













        public void onUnregistered(@NonNull ImsReasonInfo info) {















        }































        /**









@@ -136,7 +135,7 @@ public class ImsMmTelManager implements RegistrationManager {













        @Override















        public void onTechnologyChangeFailed(















                @AccessNetworkConstants.TransportType int imsTransportType,













                @Nullable ImsReasonInfo info) {













                @NonNull ImsReasonInfo info) {















        }















    }

















































telephony/java/android/telephony/ims/RegistrationManager.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -196,11 +196,11 @@ public interface RegistrationManager {













        }































        /**













         * Notifies the framework when the IMS Provider is deregistered from the IMS network.













         * Notifies the framework when the IMS Provider is unregistered from the IMS network.















         *















         * @param info the {@link ImsReasonInfo} associated with why registration was disconnected.















         */













        public void onUnregistered(@Nullable ImsReasonInfo info) {













        public void onUnregistered(@NonNull ImsReasonInfo info) {















        }































        /**









@@ -211,7 +211,7 @@ public interface RegistrationManager {













         */















        public void onTechnologyChangeFailed(















                @AccessNetworkConstants.TransportType int imsTransportType,













                @Nullable ImsReasonInfo info) {













                @NonNull ImsReasonInfo info) {















        }































        /**

































telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java



+5
−2




























Original line number
Diff line number
Diff line








@@ -175,9 +175,11 @@ public class ImsRegistrationImplBase {













     */















    public final void onDeregistered(ImsReasonInfo info) {















        updateToDisconnectedState(info);













        // ImsReasonInfo should never be null.













        final ImsReasonInfo reasonInfo = (info != null) ? info : new ImsReasonInfo();















        mCallbacks.broadcastAction((c) -> {















            try {













                c.onDeregistered(info);













                c.onDeregistered(reasonInfo);















            } catch (RemoteException e) {















                Log.w(LOG_TAG, e + " " + "onRegistrationDisconnected() - Skipping " +















                        "callback.");









@@ -194,9 +196,10 @@ public class ImsRegistrationImplBase {













     */















    public final void onTechnologyChangeFailed(@ImsRegistrationTech int imsRadioTech,















            ImsReasonInfo info) {













        final ImsReasonInfo reasonInfo = (info != null) ? info : new ImsReasonInfo();















        mCallbacks.broadcastAction((c) -> {















            try {













                c.onTechnologyChangeFailed(imsRadioTech, info);













                c.onTechnologyChangeFailed(imsRadioTech, reasonInfo);















            } catch (RemoteException e) {















                Log.w(LOG_TAG, e + " " + "onRegistrationChangeFailed() - Skipping " +















                        "callback.");