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

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

Browse Source 
Change-Id: Iec1ea80a9a3b41c9cbe7fabb861a79aa2d094548
This commit is contained in:
Automerger Merge Worker
2020-01-17 20:07:43 +00:00
parent 1d97c995f2 40cae1c0c9
commit 9ffe0e8fd6
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -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();

1
api/test-current.txt
View File

@@ -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();

7
telephony/java/android/telephony/ims/feature/ImsFeature.java
View File

@@ -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;
}