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

Merge "Move isServiceReady to ImsServiceProxyCompat" am: e158cdaaa5

Browse Source 
am: 909a889436

Change-Id: I24c1b7009f54b20ba5231a81ecf67150f7345df1
This commit is contained in:
Jordan Liu
2017-11-07 00:33:20 +00:00
committed by android-build-merger
parent 4037fe04d2 909a889436
commit 1c664d0b8e
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/ims/ImsServiceProxy.java
View File

@@ -305,19 +305,6 @@ public class ImsServiceProxy extends ImsServiceProxyCompat implements IRcsFeatur
mStatusCallback = c;
}
/**
* @return Returns true if the ImsService is ready to take commands, false otherwise. If this
* method returns false, it doesn't mean that the Binder connection is not available (use
* {@link #isBinderReady()} to check that), but that the ImsService is not accepting commands
* at this time.
*
* For example, for DSDS devices, only one slot can be {@link ImsFeature#STATE_READY} to take
* commands at a time, so the other slot must stay at {@link ImsFeature#STATE_NOT_AVAILABLE}.
*/
public boolean isBinderReady() {
return isBinderAlive() && getFeatureStatus() == ImsFeature.STATE_READY;
}
@Override
public boolean isBinderAlive() {
return mIsAvailable && mBinder != null && mBinder.isBinderAlive();

13
telephony/java/android/telephony/ims/ImsServiceProxyCompat.java
View File

@@ -171,6 +171,19 @@ public class ImsServiceProxyCompat implements IMMTelFeature {
return mBinder != null && mBinder.isBinderAlive();
}
/**
* @return Returns true if the ImsService is ready to take commands, false otherwise. If this
* method returns false, it doesn't mean that the Binder connection is not available (use
* {@link #isBinderReady()} to check that), but that the ImsService is not accepting commands
* at this time.
*
* For example, for DSDS devices, only one slot can be {@link ImsFeature#STATE_READY} to take
* commands at a time, so the other slot must stay at {@link ImsFeature#STATE_NOT_AVAILABLE}.
*/
public boolean isBinderReady() {
return isBinderAlive() && getFeatureStatus() == ImsFeature.STATE_READY;
}
private IImsService getServiceInterface(IBinder b) {
return IImsService.Stub.asInterface(b);
}