From 6898dae9fbca2cf8783c9dd252b9ec07c151a126 Mon Sep 17 00:00:00 2001
From: Brad Ebinger <breadley@google.com>
Date: Fri, 8 Mar 2019 13:22:49 -0800
Subject: [PATCH] Deprecate SystemApi that was accidently made public in P

ImsFeature.Capabilities was accidently made public in P
due to a reference to it in another @SystemApi method.
Marking as @Deprecated in Q and then moving back to @hide
in R.

Bug: 115639348
Test: manual
Change-Id: Iab0d0c9227798b9f4e153d1c5a0a4e16353ee87c
---
 api/system-current.txt                                       | 4 ++--
 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 413e79e0efea3..c1f1ce48157a5 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7450,8 +7450,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 b55866b5c1c84..d2b41337e1002 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 {