am 629a90cf: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev

* commit '629a90cf55cd6aa2e326dfdae2142e2b7e156731':
  FusedLocation runs per user as user
This commit is contained in:
Victoria Lease
2012-10-29 14:31:08 -07:00
committed by Android Git Automerger

View File

@@ -18,16 +18,14 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.location.fused" package="com.android.location.fused"
coreApp="true" coreApp="true">
android:sharedUserId="android.uid.system">
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" /> <uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" />
<application <application
android:label="@string/app_label" android:label="@string/app_label">
android:process="system">
<uses-library android:name="com.android.location.provider" /> <uses-library android:name="com.android.location.provider" />