commit 4ab3130192dffc972e2023a0c8692dbb8cf09fa8
author chen xu <fionaxu@google.com> Mon Apr 01 22:18:26 2019 -0700
committer chen xu <fionaxu@google.com> Wed Apr 03 15:26:13 2019 -0700
tree ea334dbe6e85b45025185d4da416e48897ab718b
parent 596a3b0b73afd70c8303ff66e1f44ad9d8f50dfa

push new carrier list

1. include new carrier id e.g, CBRS
2. version number is offsetting by SDK number (MSB 8 bits)

Bug: 129491596
Test: Manual
Change-Id: I48156004e4330680dd8917cbf80e4b35ff329fea
(cherry picked from commit 71264e6297dd1b5991342c2b81e68ada87018fc2)
Merged-in: I48156004e4330680dd8917cbf80e4b35ff329fea

assets/carrier_list.pb

diff --git a/assets/carrier_list.pb b/assets/carrier_list.pb
index 18b18e3..011ba01 100644
--- a/assets/carrier_list.pb
+++ b/assets/carrier_list.pb
Binary files differ

assets/carrier_list.textpb

diff --git a/assets/carrier_list.textpb b/assets/carrier_list.textpb
index 07fdc8d..d94a50a 100644
--- a/assets/carrier_list.textpb
+++ b/assets/carrier_list.textpb
@@ -4045,6 +4045,10 @@
   carrier_attribute {
     mccmnc_tuple: "22299"
   }
+  carrier_attribute {
+    mccmnc_tuple: "22288"
+    gid1: "0000000099"
+  }
 }
 carrier_id {
   canonical_id: 1576
@@ -7632,6 +7636,10 @@
     mccmnc_tuple: "310260"
     gid1: "7031"
   }
+  carrier_attribute {
+    mccmnc_tuple: "23222"
+    spn: "Plintron"
+  }
 }
 carrier_id {
   canonical_id: 2073
@@ -10166,6 +10174,49 @@
   }
 }
 carrier_id {
+  canonical_id: 2417
+  carrier_name: "FIZZ"
+  carrier_attribute {
+    mccmnc_tuple: "302500"
+    gid1: "55"
+  }
+}
+carrier_id {
+  canonical_id: 2418
+  carrier_name: "TalkMobile"
+  carrier_attribute {
+    mccmnc_tuple: "23415"
+    spn: "Talkmobile"
+  }
+}
+carrier_id {
+  canonical_id: 2419
+  carrier_name: "EE Business"
+  carrier_attribute {
+    mccmnc_tuple: "23433"
+    gid1: "ec"
+    gid1: "ecff"
+  }
+}
+carrier_id {
+  canonical_id: 2420
+  carrier_name: "ION Mobile"
+  carrier_attribute {
+    mccmnc_tuple: "21434"
+  }
+  carrier_attribute {
+    mccmnc_tuple: "21405"
+    imsi_prefix_xpattern: "214050104"
+  }
+}
+carrier_id {
+  canonical_id: 2421
+  carrier_name: "Spectrum CBRS"
+  carrier_attribute {
+    mccmnc_tuple: "310014"
+  }
+}
+carrier_id {
   canonical_id: 10000
   carrier_name: "Tracfone-ATT"
   carrier_attribute {
@@ -10244,4 +10295,4 @@
     mccmnc_tuple: "44010"
   }
 }
-version: 8
+version: 16777225

src/com/android/providers/telephony/CarrierIdProvider.java

diff --git a/src/com/android/providers/telephony/CarrierIdProvider.java b/src/com/android/providers/telephony/CarrierIdProvider.java
index d4efeb9..237a197 100644
--- a/src/com/android/providers/telephony/CarrierIdProvider.java
+++ b/src/com/android/providers/telephony/CarrierIdProvider.java
@@ -81,6 +81,8 @@
 
     private static final String ASSETS_PB_FILE = "carrier_list.pb";
     private static final String VERSION_KEY = "version";
+    // The version number is offset by SDK level, the MSB 8 bits is reserved for SDK.
+    private static final int VERSION_BITMASK = 0x00FFFFFF;
     private static final String OTA_UPDATED_PB_PATH = "misc/carrierid/" + ASSETS_PB_FILE;
     private static final String PREF_FILE = CarrierIdProvider.class.getSimpleName();
 
@@ -567,6 +569,9 @@
     }
 
     private void setAppliedVersion(int version) {
+        int relative_version = version & VERSION_BITMASK;
+        Log.d(TAG, "update version number: " +  Integer.toHexString(version)
+                + " relative version: " + relative_version);
         final SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE,
                 Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();