commit 20d34663ddb38fd98e4efb515f97672067d857c4
author Chen Xu <fionaxu@google.com> Thu Feb 21 22:09:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 21 22:09:39 2019 +0000
tree e74fe53229e661c2fd651be961f78fef55512374
parent e7c780d4e66839bf3e17a1ccd6574831c036e738
parent 45701dc809142b73a9fefcc1a0c571a5630c15b8

Merge "fix issue that carrier id returns zero"

assets/carrier_list.pb

diff --git a/assets/carrier_list.pb b/assets/carrier_list.pb
index 9580a0b..18b18e3 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 b55cf68..07fdc8d 100644
--- a/assets/carrier_list.textpb
+++ b/assets/carrier_list.textpb
@@ -10244,4 +10244,4 @@
     mccmnc_tuple: "44010"
   }
 }
-version: 7
+version: 8

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 97d496b..a2c924c 100644
--- a/src/com/android/providers/telephony/CarrierIdProvider.java
+++ b/src/com/android/providers/telephony/CarrierIdProvider.java
@@ -385,7 +385,11 @@
                     cv = new ContentValues();
                     cv.put(CarrierId.CARRIER_ID, id.canonicalId);
                     cv.put(CarrierId.CARRIER_NAME, id.carrierName);
-                    cv.put(CarrierId.PARENT_CARRIER_ID, id.parentCanonicalId);
+                    // 0 is the default proto value. if parentCanonicalId is unset, apply default
+                    // unknown carrier id -1.
+                    if (id.parentCanonicalId > 0) {
+                        cv.put(CarrierId.PARENT_CARRIER_ID, id.parentCanonicalId);
+                    }
                     cvs = new ArrayList<>();
                     convertCarrierAttrToContentValues(cv, cvs, attr, 0);
                     for (ContentValues contentVal : cvs) {