resolved conflicts for merge of 964eb438 to master

Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e

2 files changed, 36 insertions, 3 deletions

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1514b37..3e99541 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1389,7 +1389,8 @@
         </receiver>
 
         <receiver android:name="com.android.server.MasterClearReceiver"
-            android:permission="android.permission.MASTER_CLEAR" >
+            android:permission="android.permission.MASTER_CLEAR"
+            android:priority="100" >
             <intent-filter>
                 <!-- For Checkin, Settings, etc.: action=MASTER_CLEAR -->
                 <action android:name="android.intent.action.MASTER_CLEAR" />
@@ -1399,8 +1400,11 @@
                 <category android:name="android.intent.category.MASTER_CLEAR" />
             </intent-filter>
         </receiver>
-    </application>
 
-</manifest>
+        <service android:name="com.android.internal.os.storage.ExternalStorageFormatter"
+            android:permission="android.permission.MASTER_CLEAR"
+            android:exported="true" />
 
+    </application>
 
+</manifest>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 25757a8..1d2e780 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2404,4 +2404,33 @@
 
     <!-- Label for the "Done" button on the far left of action mode toolbars. -->
     <string name="action_mode_done">Done</string>
+
+    <!-- Strings for ExternalStorageFormatter service. -->
+    <!-- Text for progress dialog while unmounting USB storage volume [CHAR LIMIT=NONE] -->
+    <string name="progress_unmounting" product="nosdcard">Unmounting USB storage...</string>
+    <!-- Text for progress dialog while unmounting SD card [CHAR LIMIT=NONE] -->
+    <string name="progress_unmounting" product="default">Unmounting SD card...</string>
+    <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+    <string name="progress_erasing" product="nosdcard">Erasing USB storage...</string>
+    <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+    <string name="progress_erasing" product="default">Erasing SD card...</string>
+    <!-- Text for message to user that an error happened when formatting USB storage [CHAR LIMIT=NONE] -->
+    <string name="format_error" product="nosdcard">Failed to erase USB storage.</string>
+    <!-- Text for message to user that an error happened when formatting SD card [CHAR LIMIT=NONE] -->
+    <string name="format_error" product="default">Failed to erase SD card.</string>
+    <!-- Text for message to user that SD card has been removed while in use [CHAR LIMIT=NONE] -->
+    <string name="media_bad_removal">SD card was removed before being unmounted.</string>
+    <!-- Text for message to user USB storage is currently being checked [CHAR LIMIT=NONE] -->
+    <string name="media_checking" product="nosdcard">USB storage is currently being checked.</string>
+    <!-- Text for message to user SD card is currently being checked [CHAR LIMIT=NONE] -->
+    <string name="media_checking" product="default">SD card is currently being checked.</string>
+    <!-- Text for message to user SD card has been removed [CHAR LIMIT=NONE] -->
+    <string name="media_removed">SD card has been removed.</string>
+    <!-- Text for message to user USB storage is currently mounted on a computer [CHAR LIMIT=NONE] -->
+    <string name="media_shared" product="nosdcard">USB storage is currently in use by a computer.</string>
+    <!-- Text for message to user SD card is currently mounted on a computer [CHAR LIMIT=NONE] -->
+    <string name="media_shared" product="default">SD card is currently in use by a computer.</string>
+    <!-- Text for message for an unknown external media state [CHAR LIMIT=NONE] -->
+    <string name="media_unknown_state">External media in unknown state.</string>
+
 </resources>