commit 8ac14e4e3d0ca66e8197956a0c3be0e20b43f84b
author fionaxu <fionaxu@google.com> Tue Jan 23 15:14:10 2018 -0800
committer fionaxu <fionaxu@google.com> Tue Jan 23 15:25:25 2018 -0800
tree 61f9e346943d308fc6f0a4e388f21fc569220e31
parent 0123844f8f007da5c4d185b0174a6d9c36daf304

fix carrierIdentifierTest

declare read/write permission in manifest is not test friendly.
thus move the permission check inside each function.

Bug: 29579544
Test: CarrierIdentifierTest & CarrierPrividerTest
Change-Id: I8a1cfd02745d3954c95f819c1027bf328c86d149

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7a6f683..f2bb84b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -110,9 +110,7 @@
                   android:authorities="carrier_identification"
                   android:exported="true"
                   android:singleUser="true"
-                  android:multiprocess="false"
-                  android:readPermission="android.permission.READ_PRIVILEGED_PHONE_STATE"
-                  android:writePermission="android.permission.MODIFY_PHONE_STATE" />
+                  android:multiprocess="false" />
 
         <service
             android:name=".TelephonyBackupAgent$DeferredSmsMmsRestoreService"