commit 40cae1c0c99b3685f97eaf6ba5b4fb04fe58e737
author Brad Ebinger <breadley@google.com> Fri Jan 17 03:34:05 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 17 03:34:05 2020 +0000
tree 1aae1a8bbc7c8bff54d89168aba37fac505e0c09
parent 05c43b7095eb881959a0f5c1d2a633eaec26b5c9
parent 27330071ec30c1172b1192f2ee61f8f5da86c93e

Merge "Expose ImsFeature#getFeatureState as @SystemApi"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index eed6d67..04aa300 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -10313,6 +10313,7 @@
   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();

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 20e3508..f438d55 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3637,6 +3637,7 @@
   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();

telephony/java/android/telephony/ims/feature/ImsFeature.java

diff --git a/telephony/java/android/telephony/ims/feature/ImsFeature.java b/telephony/java/android/telephony/ims/feature/ImsFeature.java
index 72390d0..f14270f 100644
--- a/telephony/java/android/telephony/ims/feature/ImsFeature.java
+++ b/telephony/java/android/telephony/ims/feature/ImsFeature.java
@@ -337,11 +337,10 @@
     }
 
     /**
-     * @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;
         }