Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "API Review: Make ImsReasonInfo in ImsMmTelManager @NonNull" am: 06d11782d7

Browse Source 
Change-Id: Ib95726cecfe28621d6655f29bc1dd4b18cb2fd89
This commit is contained in:
Brad Ebinger
2020-03-23 17:28:24 +00:00
committed by Automerger Merge Worker
parent 5e7477c042 06d11782d7
commit 3ca91ce522
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -46752,8 +46752,8 @@ package android.telephony.ims {
ctor public RegistrationManager.RegistrationCallback(); ctor public RegistrationManager.RegistrationCallback();
method public void onRegistered(int); method public void onRegistered(int);
method public void onRegistering(int); method public void onRegistering(int);
method public void onTechnologyChangeFailed(int, @Nullable android.telephony.ims.ImsReasonInfo); method public void onTechnologyChangeFailed(int, @NonNull android.telephony.ims.ImsReasonInfo);
method public void onUnregistered(@Nullable android.telephony.ims.ImsReasonInfo); method public void onUnregistered(@NonNull android.telephony.ims.ImsReasonInfo);
} }
} }

5
telephony/java/android/telephony/ims/ImsMmTelManager.java
View File

@@ -21,7 +21,6 @@ import android.Manifest;
import android.annotation.CallbackExecutor; import android.annotation.CallbackExecutor;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
import android.annotation.SuppressAutoDoc; import android.annotation.SuppressAutoDoc;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
@@ -125,7 +124,7 @@ public class ImsMmTelManager implements RegistrationManager {
* @param info the {@link ImsReasonInfo} associated with why registration was disconnected. * @param info the {@link ImsReasonInfo} associated with why registration was disconnected.
*/ */
@Override @Override
public void onUnregistered(@Nullable ImsReasonInfo info) { public void onUnregistered(@NonNull ImsReasonInfo info) {
} }
/** /**
@@ -137,7 +136,7 @@ public class ImsMmTelManager implements RegistrationManager {
@Override @Override
public void onTechnologyChangeFailed( public void onTechnologyChangeFailed(
@AccessNetworkConstants.TransportType int imsTransportType, @AccessNetworkConstants.TransportType int imsTransportType,
@Nullable ImsReasonInfo info) { @NonNull ImsReasonInfo info) {
} }
} }

6
telephony/java/android/telephony/ims/RegistrationManager.java
View File

@@ -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. * @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( public void onTechnologyChangeFailed(
@AccessNetworkConstants.TransportType int imsTransportType, @AccessNetworkConstants.TransportType int imsTransportType,
@Nullable ImsReasonInfo info) { @NonNull ImsReasonInfo info) {
} }
/** /**

7
telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java
View File

@@ -175,9 +175,11 @@ public class ImsRegistrationImplBase {
*/ */
public final void onDeregistered(ImsReasonInfo info) { public final void onDeregistered(ImsReasonInfo info) {
updateToDisconnectedState(info); updateToDisconnectedState(info);
// ImsReasonInfo should never be null.
final ImsReasonInfo reasonInfo = (info != null) ? info : new ImsReasonInfo();
mCallbacks.broadcastAction((c) -> { mCallbacks.broadcastAction((c) -> {
try { try {
c.onDeregistered(info); c.onDeregistered(reasonInfo);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(LOG_TAG, e + " " + "onRegistrationDisconnected() - Skipping " + Log.w(LOG_TAG, e + " " + "onRegistrationDisconnected() - Skipping " +
"callback."); "callback.");
@@ -194,9 +196,10 @@ public class ImsRegistrationImplBase {
*/ */
public final void onTechnologyChangeFailed(@ImsRegistrationTech int imsRadioTech, public final void onTechnologyChangeFailed(@ImsRegistrationTech int imsRadioTech,
ImsReasonInfo info) { ImsReasonInfo info) {
final ImsReasonInfo reasonInfo = (info != null) ? info : new ImsReasonInfo();
mCallbacks.broadcastAction((c) -> { mCallbacks.broadcastAction((c) -> {
try { try {
c.onTechnologyChangeFailed(imsRadioTech, info); c.onTechnologyChangeFailed(imsRadioTech, reasonInfo);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(LOG_TAG, e + " " + "onRegistrationChangeFailed() - Skipping " + Log.w(LOG_TAG, e + " " + "onRegistrationChangeFailed() - Skipping " +
"callback."); "callback.");