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

Merge "Deprecate SystemApi that was accidently made public in P" am: 18870b2e4e

Browse Source 
am: 1cb491e423

Change-Id: Ieafcc2c15eb0b7a2968faf979fe93e31088e86b5
This commit is contained in:
Brad Ebinger
2019-03-21 15:07:39 -07:00
committed by android-build-merger
parent 296e21451d 1cb491e423
commit 81304407aa
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -7439,8 +7439,8 @@ package android.telephony.ims.feature {
field public static final int STATE_UNAVAILABLE = 0; // 0x0
}
public static class ImsFeature.Capabilities {
field protected int mCapabilities;
@Deprecated public static class ImsFeature.Capabilities {
field @Deprecated protected int mCapabilities;
}
protected static class ImsFeature.CapabilityCallbackProxy {

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

@@ -210,6 +210,7 @@ public abstract class ImsFeature {
/**
* Contains the capabilities defined and supported by an ImsFeature in the form of a bit mask.
* @hide
* @deprecated
*/
@SystemApi // SystemApi only because it was leaked through type usage in a previous release.
public static class Capabilities {