diff options
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/feature/ImsFeature.java | 7 |
3 files changed, 5 insertions, 4 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index eed6d671b1e9..04aa300ea88b 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10313,6 +10313,7 @@ package android.telephony.ims.feature { public abstract class ImsFeature { ctor public ImsFeature(); method public abstract void changeEnabledCapabilities(android.telephony.ims.feature.CapabilityChangeRequest, android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy); + method public int getFeatureState(); method public final int getSlotIndex(); method public abstract void onFeatureReady(); method public abstract void onFeatureRemoved(); diff --git a/api/test-current.txt b/api/test-current.txt index 20e3508f6008..f438d551e596 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3637,6 +3637,7 @@ package android.telephony.ims.feature { public abstract class ImsFeature { ctor public ImsFeature(); method public abstract void changeEnabledCapabilities(android.telephony.ims.feature.CapabilityChangeRequest, android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy); + method public int getFeatureState(); method public final int getSlotIndex(); method public abstract void onFeatureReady(); method public abstract void onFeatureRemoved(); diff --git a/telephony/java/android/telephony/ims/feature/ImsFeature.java b/telephony/java/android/telephony/ims/feature/ImsFeature.java index 72390d070337..f14270f99c83 100644 --- a/telephony/java/android/telephony/ims/feature/ImsFeature.java +++ b/telephony/java/android/telephony/ims/feature/ImsFeature.java @@ -337,11 +337,10 @@ public abstract class ImsFeature { } /** - * @return The current state of the feature, defined as {@link #STATE_UNAVAILABLE}, - * {@link #STATE_INITIALIZING}, or {@link #STATE_READY}. - * @hide + * @return The current state of the ImsFeature, set previously by {@link #setFeatureState(int)} + * or {@link #STATE_UNAVAILABLE} if it has not been updated yet. */ - public int getFeatureState() { + public @ImsState int getFeatureState() { synchronized (mLock) { return mState; } |