commit e7f90a2fae5f767b52bf5ca956c2ab38eea9e20a
author Sean Liu <guanxiongliu@google.com> Wed May 11 17:21:33 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 11 17:21:34 2016 +0000
tree 09e130d5f163560c714704bbf5540ad6a61a7cac
parent 395d6c605bc60a8a65aa11b963aaf02fba0ba696
parent 20edb81a74810f8892588efa675c2ae76125102c

Merge "Getting rid of LOCATION permission usage"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5b88a35..c2c4eab 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,8 +28,6 @@
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.WRITE_PROFILE" />
@@ -509,13 +507,6 @@
             </intent-filter>
         </service>
 
-        <!-- Broadcast receiver that passively listens to location updates -->
-        <receiver android:name="com.android.contacts.common.location.CountryDetector$LocationChangedReceiver"/>
-
-        <!-- IntentService to update the user's current country -->
-        <service android:name="com.android.contacts.common.location.UpdateCountryService"
-            android:exported="false"/>
-
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="@string/contacts_file_provider_authority"