diff options
| author | 2019-03-21 21:46:25 +0000 | |
|---|---|---|
| committer | 2019-03-21 21:46:25 +0000 | |
| commit | 18870b2e4e206e97a3114fcffaaae35d1abb8ff6 (patch) | |
| tree | cf0c176e4481f4806520d3cc0890bd1d5896ba80 | |
| parent | c5461c4490fcbe0b17785baffd3e8241efaf271e (diff) | |
| parent | 6898dae9fbca2cf8783c9dd252b9ec07c151a126 (diff) | |
Merge "Deprecate SystemApi that was accidently made public in P"
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/feature/ImsFeature.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 97b210fb04fb..193ead64e14f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 { diff --git a/telephony/java/android/telephony/ims/feature/ImsFeature.java b/telephony/java/android/telephony/ims/feature/ImsFeature.java index b55866b5c1c8..d2b41337e100 100644 --- a/telephony/java/android/telephony/ims/feature/ImsFeature.java +++ b/telephony/java/android/telephony/ims/feature/ImsFeature.java @@ -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 { |