From 17898168a606c2244da597b2c0f626254aa44bd8 Mon Sep 17 00:00:00 2001 From: Suresh Koleti Date: Fri, 3 Nov 2017 18:29:25 +0530 Subject: [PATCH] Move isServiceReady to ImsServiceProxyCompat -- Move isServiceReady from ImsServiceProxy to its base class ImsServiceProxyCompat to use in ImsManager. Test: Manual Bug: 63920021 Change-Id: I0e136ffe8490a3ba985bfb5992c1ff2176e610fe --- .../java/android/telephony/ims/ImsServiceProxy.java | 13 ------------- .../telephony/ims/ImsServiceProxyCompat.java | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/telephony/java/android/telephony/ims/ImsServiceProxy.java b/telephony/java/android/telephony/ims/ImsServiceProxy.java index 038e295d88222..31d3db44d6fe9 100644 --- a/telephony/java/android/telephony/ims/ImsServiceProxy.java +++ b/telephony/java/android/telephony/ims/ImsServiceProxy.java @@ -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(); diff --git a/telephony/java/android/telephony/ims/ImsServiceProxyCompat.java b/telephony/java/android/telephony/ims/ImsServiceProxyCompat.java index bbd5f0279913a..7ec92296448f0 100644 --- a/telephony/java/android/telephony/ims/ImsServiceProxyCompat.java +++ b/telephony/java/android/telephony/ims/ImsServiceProxyCompat.java @@ -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); }