From e1c880242be59f39d6a2f387cc41b057c24652d1 Mon Sep 17 00:00:00 2001
From: Cassie <xih@google.com>
Date: Thu, 22 Feb 2018 08:51:03 -0800
Subject: [PATCH] Add comments according to the API review process.

 * Explain what developers should use instead in the @deprecated note for Telephony#BEARER
 * Please add more documentation for network type bitmask - reference to just TelephonyManager is not sufficient because it has so much stuff in it.
 * Also remove the @hide tag for private constants in ServiceState.

Bug: 73751228
Test: Basic telephony sanity
Change-Id: Ie7405a961db4494104750bf406f20b1b4fb8191a
---
 telephony/java/android/telephony/ServiceState.java | 1 -
 telephony/java/android/telephony/Telephony.java    | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index cb867abb74d45..aae86862bd67e 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -178,7 +178,6 @@ public class ServiceState implements Parcelable {
 
     /**
      * Number of radio technologies for GSM, UMTS and CDMA.
-     * @hide
      */
     private static final int NEXT_RIL_RADIO_TECHNOLOGY = 20;
 
diff --git a/telephony/java/android/telephony/Telephony.java b/telephony/java/android/telephony/Telephony.java
index 8c4572474e6b0..49e221286dc21 100644
--- a/telephony/java/android/telephony/Telephony.java
+++ b/telephony/java/android/telephony/Telephony.java
@@ -2731,6 +2731,7 @@ public final class Telephony {
          * This should be spread to other technologies,
          * but is currently only used for LTE (14) and eHRPD (13).
          * <P>Type: INTEGER</P>
+         * @deprecated this column is no longer supported, use {@link #NETWORK_TYPE_BITMASK} instead
          */
         @Deprecated
         public static final String BEARER = "bearer";
@@ -2743,13 +2744,14 @@ public final class Telephony {
          * Bitmask for a radio tech R is (1 << (R - 1))
          * <P>Type: INTEGER</P>
          * @hide
+         * @deprecated this column is no longer supported, use {@link #NETWORK_TYPE_BITMASK} instead
          */
         @Deprecated
         public static final String BEARER_BITMASK = "bearer_bitmask";
 
         /**
          * Radio technology (network type) bitmask.
-         * To check what values can be contained, refer to
+         * To check what values can be contained, refer to the NETWORK_TYPE_ constants in
          * {@link android.telephony.TelephonyManager}.
          * Bitmask for a radio tech R is (1 << (R - 1))
          * <P>Type: INTEGER</P>