From b01bf9753c80fce898e864ab5be3be0228a135b7 Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Sat, 18 Jan 2020 14:08:36 -0800
Subject: [PATCH] Added TD-SCDMA bands for network scanning

Added TD-SCDMA bands defined in 3GPP TS 25.102.

Test: Telephony sanity tests
Bug: 144939345
Change-Id: If5a9dfa7179d02886ce3520795b58bd452abe078
---
 api/current.txt                               |  6 ++++++
 .../telephony/AccessNetworkConstants.java     | 21 ++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 1210d627c99e5..f7c30f583266c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -45269,6 +45269,12 @@ package android.telephony {
     field public static final int BAND_7 = 7; // 0x7
     field public static final int BAND_8 = 8; // 0x8
     field public static final int BAND_9 = 9; // 0x9
+    field public static final int BAND_A = 101; // 0x65
+    field public static final int BAND_B = 102; // 0x66
+    field public static final int BAND_C = 103; // 0x67
+    field public static final int BAND_D = 104; // 0x68
+    field public static final int BAND_E = 105; // 0x69
+    field public static final int BAND_F = 106; // 0x6a
   }
 
   public final class AvailableNetworkInfo implements android.os.Parcelable {
diff --git a/telephony/java/android/telephony/AccessNetworkConstants.java b/telephony/java/android/telephony/AccessNetworkConstants.java
index d325cd84855c5..6d2ac9dbb737f 100644
--- a/telephony/java/android/telephony/AccessNetworkConstants.java
+++ b/telephony/java/android/telephony/AccessNetworkConstants.java
@@ -115,11 +115,11 @@ public final class AccessNetworkConstants {
         public static final int BAND_ER900 = 14;
 
         /** @hide */
-        private GeranBand() {};
+        private GeranBand() {}
     }
 
     /**
-     * Frenquency bands for UTRAN.
+     * Frequency bands for UTRAN.
      * http://www.etsi.org/deliver/etsi_ts/125100_125199/125104/13.03.00_60/ts_125104v130p.pdf
      */
     public static final class UtranBand {
@@ -146,12 +146,19 @@ public final class AccessNetworkConstants {
         public static final int BAND_25 = 25;
         public static final int BAND_26 = 26;
 
+        /** Frequency bands for TD-SCDMA. Defined in 3GPP TS 25.102, Table 5.2. */
+        public static final int BAND_A = 101;
+        public static final int BAND_B = 102;
+        public static final int BAND_C = 103;
+        public static final int BAND_D = 104;
+        public static final int BAND_E = 105;
+        public static final int BAND_F = 106;
         /** @hide */
-        private UtranBand() {};
+        private UtranBand() {}
     }
 
     /**
-     * Frenquency bands for EUTRAN.
+     * Frequency bands for EUTRAN.
      * http://www.etsi.org/deliver/etsi_ts/136100_136199/136101/14.03.00_60/ts_136101v140p.pdf
      */
     public static final class EutranBand {
@@ -209,7 +216,7 @@ public final class AccessNetworkConstants {
     }
 
     /**
-     * Frenquency bands for CDMA2000.
+     * Frequency bands for CDMA2000.
      * http://www.3gpp2.org/Public_html/Specs/C.S0057-E_v1.0_Bandclass_Specification.pdf
      * @hide
      *
@@ -240,7 +247,7 @@ public final class AccessNetworkConstants {
         public static final int BAND_21 = 22;
 
         /** @hide */
-        private CdmaBands() {};
+        private CdmaBands() {}
     }
 
     /**
@@ -295,7 +302,7 @@ public final class AccessNetworkConstants {
         public static final int BAND_261 = 261;
 
         /** @hide */
-        private NgranBands() {};
+        private NgranBands() {}
     }
 
     /** @hide */