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" into rvc-dev am: 3bdd15fbb4

Browse Source 
Change-Id: I364a252c38bddfddfe31554c8fde7064017a47e2
This commit is contained in:
Automerger Merge Worker
2020-03-16 16:02:54 +00:00
parent de1dd7038f 3bdd15fbb4
commit b1a1a4cba9
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

@@ -49000,8 +49000,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);
}
}

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

@@ -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) {
}
}

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.
*/
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) {
}
/**

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

@@ -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.");