commit f618f5577a6eaa8d7facb9eefe42823e6e478a53
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 27 18:23:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 27 18:23:24 2018 +0000
tree 81fb2f33e683261fe7c1af9248eb2b647845fb57
parent b0cfd52c4d1781612952e2b29dd3fdfd9b78ef96
parent da96ee642c2fbcf54d682d2b0d437e9f174c3e6d

Merge "Let URL_DPC use CONFLICT_IGNORE algorithm for insert and update."

Android.mk

diff --git a/Android.mk b/Android.mk
index c824fff..3ff05c9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under,src)
 
 LOCAL_PACKAGE_NAME := TelephonyProvider
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
 
 LOCAL_JAVA_LIBRARIES += telephony-common

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 4cbbc79..cbad428 100644
--- a/src/com/android/providers/telephony/CarrierIdProvider.java
+++ b/src/com/android/providers/telephony/CarrierIdProvider.java
@@ -122,7 +122,7 @@
     /**
      * ending index of carrier attribute list.
      */
-    private static final int CARRIER_ATTR_END_IDX        = APN_INDEX;
+    private static final int CARRIER_ATTR_END_IDX        = ICCID_PREFIX_INDEX;
     /**
      * The authority string for the CarrierIdProvider
      */

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index ffd2e39..6163934 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -13,6 +13,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under,src)
 
 LOCAL_PACKAGE_NAME := TelephonyProviderTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_COMPATIBILITY_SUITE := device-tests
 LOCAL_CERTIFICATE := platform