am ffa7918a: am 15a5ad8e: Give the android core shared user a label.
Merge commit 'ffa7918aa988e4c819a73c9d491967b9fa1a45cf'
* commit 'ffa7918aa988e4c819a73c9d491967b9fa1a45cf':
Give the android core shared user a label.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 29fcedc..6215870 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,6 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts"
android:sharedUserId="android.uid.shared"
+ android:sharedUserLabel="@string/sharedUserLabel"
>
<original-package android:name="com.android.contacts" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8969228..3c8cd18 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,6 +14,10 @@
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Label for this app's shared user ID (and thus for all other
+ apps sharing the uid). -->
+ <string name="sharedUserLabel">Android Core Apps</string>
+
<!-- Title for the activity that shows contacts. This is the name
used in the Launcher icon. -->
<string name="contactsList">Contacts</string>