Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e138c5e4 authored by Sarah Chin's avatar Sarah Chin
Browse files

Updated AccessNetworkConstants and RadioAccessSpecifier 

Bug: 143683654
Test: atest RadioAccessSpecifierTest
Change-Id: I307c8d09483e37d805cbfd17780523040abc9e4b
Merged-In: I307c8d09483e37d805cbfd17780523040abc9e4b
parent a57d5599

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ java_library { 
        "android.hardware.radio-V1.2-java",

        "android.hardware.radio-V1.3-java",

        "android.hardware.radio-V1.4-java",

        "android.hardware.radio-V1.5-java",

        "android.hardware.thermal-V1.0-java-constants",

        "android.hardware.thermal-V1.0-java",

        "android.hardware.thermal-V1.1-java",

api/current.txt

+40 −0
Original line number Diff line number Diff line
@@ -43931,6 +43931,7 @@ package android.telephony { 
    field public static final int EUTRAN = 3; // 0x3

    field public static final int GERAN = 1; // 0x1

    field public static final int IWLAN = 5; // 0x5

    field public static final int NGRAN = 6; // 0x6

    field public static final int UNKNOWN = 0; // 0x0

    field public static final int UTRAN = 2; // 0x2

  }
@@ -44003,6 +44004,45 @@ package android.telephony { 
    field public static final int BAND_T810 = 7; // 0x7

  }













  public static final class AccessNetworkConstants.NgranBands {













    field public static final int BAND_1 = 1; // 0x1













    field public static final int BAND_12 = 12; // 0xc













    field public static final int BAND_2 = 2; // 0x2













    field public static final int BAND_20 = 20; // 0x14













    field public static final int BAND_25 = 25; // 0x19













    field public static final int BAND_257 = 257; // 0x101













    field public static final int BAND_258 = 258; // 0x102













    field public static final int BAND_260 = 260; // 0x104













    field public static final int BAND_261 = 261; // 0x105













    field public static final int BAND_28 = 28; // 0x1c













    field public static final int BAND_3 = 3; // 0x3













    field public static final int BAND_34 = 34; // 0x22













    field public static final int BAND_38 = 38; // 0x26













    field public static final int BAND_39 = 39; // 0x27













    field public static final int BAND_40 = 40; // 0x28













    field public static final int BAND_41 = 41; // 0x29













    field public static final int BAND_5 = 5; // 0x5













    field public static final int BAND_50 = 50; // 0x32













    field public static final int BAND_51 = 51; // 0x33













    field public static final int BAND_66 = 66; // 0x42













    field public static final int BAND_7 = 7; // 0x7













    field public static final int BAND_70 = 70; // 0x46













    field public static final int BAND_71 = 71; // 0x47













    field public static final int BAND_74 = 74; // 0x4a













    field public static final int BAND_75 = 75; // 0x4b













    field public static final int BAND_76 = 76; // 0x4c













    field public static final int BAND_77 = 77; // 0x4d













    field public static final int BAND_78 = 78; // 0x4e













    field public static final int BAND_79 = 79; // 0x4f













    field public static final int BAND_8 = 8; // 0x8













    field public static final int BAND_80 = 80; // 0x50













    field public static final int BAND_81 = 81; // 0x51













    field public static final int BAND_82 = 82; // 0x52













    field public static final int BAND_83 = 83; // 0x53













    field public static final int BAND_84 = 84; // 0x54













    field public static final int BAND_86 = 86; // 0x56













  }



























  public static final class AccessNetworkConstants.UtranBand {















    field public static final int BAND_1 = 1; // 0x1















    field public static final int BAND_10 = 10; // 0xa

























telephony/java/android/telephony/AccessNetworkConstants.java



+50
−0




























Original line number
Diff line number
Diff line








@@ -80,6 +80,7 @@ public final class AccessNetworkConstants {













        public static final int EUTRAN = 3;















        public static final int CDMA2000 = 4;















        public static final int IWLAN = 5;













        public static final int NGRAN = 6;































        /** @hide */















        private AccessNetworkType() {}









@@ -93,6 +94,7 @@ public final class AccessNetworkConstants {













                case EUTRAN: return "EUTRAN";















                case CDMA2000: return "CDMA2000";















                case IWLAN: return "IWLAN";













                case NGRAN: return "NGRAN";















                default: return Integer.toString(type);















            }















        }










@@ -247,6 +249,54 @@ public final class AccessNetworkConstants {













        private CdmaBands() {};















    }





























    /**













     * Frequency bands for NGRAN













     */













    public static final class NgranBands {













        /** FR1 bands */













        public static final int BAND_1 = 1;













        public static final int BAND_2 = 2;













        public static final int BAND_3 = 3;













        public static final int BAND_5 = 5;













        public static final int BAND_7 = 7;













        public static final int BAND_8 = 8;













        public static final int BAND_12 = 12;













        public static final int BAND_20 = 20;













        public static final int BAND_25 = 25;













        public static final int BAND_28 = 28;













        public static final int BAND_34 = 34;













        public static final int BAND_38 = 38;













        public static final int BAND_39 = 39;













        public static final int BAND_40 = 40;













        public static final int BAND_41 = 41;













        public static final int BAND_50 = 50;













        public static final int BAND_51 = 51;













        public static final int BAND_66 = 66;













        public static final int BAND_70 = 70;













        public static final int BAND_71 = 71;













        public static final int BAND_74 = 74;













        public static final int BAND_75 = 75;













        public static final int BAND_76 = 76;













        public static final int BAND_77 = 77;













        public static final int BAND_78 = 78;













        public static final int BAND_79 = 79;













        public static final int BAND_80 = 80;













        public static final int BAND_81 = 81;













        public static final int BAND_82 = 82;













        public static final int BAND_83 = 83;













        public static final int BAND_84 = 84;













        public static final int BAND_86 = 86;



























        /** FR2 bands */













        public static final int BAND_257 = 257;













        public static final int BAND_258 = 258;













        public static final int BAND_260 = 260;













        public static final int BAND_261 = 261;



























        /** @hide */













        private NgranBands() {};













    }





























    /** @hide */















    private AccessNetworkConstants() {};















}
























telephony/java/android/telephony/RadioAccessSpecifier.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -97,8 +97,9 @@ public final class RadioAccessSpecifier implements Parcelable {













     * Returns the frequency bands that need to be scanned.















     *















     * The returned value is defined in either of {@link AccessNetworkConstants.GeranBand},













     * {@link AccessNetworkConstants.UtranBand} and {@link AccessNetworkConstants.EutranBand}, and













     * it depends on the returned value of {@link #getRadioAccessNetwork()}.













     * {@link AccessNetworkConstants.UtranBand}, {@link AccessNetworkConstants.EutranBand},













     * and {@link AccessNetworkConstants.NgranBands}, and it depends on













     * the returned value of {@link #getRadioAccessNetwork()}.















     */















    public int[] getBands() {















        return mBands == null ? null : mBands.clone();