Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ffe0e8f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Expose ImsFeature#getFeatureState as @SystemApi" am: 40cae1c0 

Change-Id: Iec1ea80a9a3b41c9cbe7fabb861a79aa2d094548
parents 1d97c995 40cae1c0

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -10313,6 +10313,7 @@ package android.telephony.ims.feature { 
  public abstract class ImsFeature {

  public abstract class ImsFeature {

    ctor public ImsFeature();

    ctor public ImsFeature();

    method public abstract void changeEnabledCapabilities(android.telephony.ims.feature.CapabilityChangeRequest, android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy);

    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 final int getSlotIndex();

    method public abstract void onFeatureReady();

    method public abstract void onFeatureReady();

    method public abstract void onFeatureRemoved();

    method public abstract void onFeatureRemoved();

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -3637,6 +3637,7 @@ package android.telephony.ims.feature { 
  public abstract class ImsFeature {

  public abstract class ImsFeature {

    ctor public ImsFeature();

    ctor public ImsFeature();

    method public abstract void changeEnabledCapabilities(android.telephony.ims.feature.CapabilityChangeRequest, android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy);

    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 final int getSlotIndex();

    method public abstract void onFeatureReady();

    method public abstract void onFeatureReady();

    method public abstract void onFeatureRemoved();

    method public abstract void onFeatureRemoved();

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

+3 −4
Original line number Original line Diff line number Diff line
@@ -337,11 +337,10 @@ public abstract class ImsFeature { 
    }

    }





    /**

    /**

     * @return The current state of the feature, defined as {@link #STATE_UNAVAILABLE},

     * @return The current state of the ImsFeature, set previously by {@link #setFeatureState(int)}

     * {@link #STATE_INITIALIZING}, or {@link #STATE_READY}.

     * or {@link #STATE_UNAVAILABLE} if it has not been updated  yet.

     * @hide

     */

     */

    public int getFeatureState() {

    public @ImsState int getFeatureState() {

        synchronized (mLock) {

        synchronized (mLock) {

            return mState;

            return mState;

        }

        }