Merge change 4237 into donut

* changes:
  Remove obsolete FOTA_UPDATE permission (which should never have been made public, and wouldn't be used by any third party applications, and no longer does anything regardless).

api/4.xml

@@ -452,17 +452,6 @@
  visibility="public"
 >
 </field>
-<field name="FOTA_UPDATE"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;android.permission.FOTA_UPDATE&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="GET_ACCOUNTS"
  type="java.lang.String"
  transient="false"

api/current.xml

@@ -463,17 +463,6 @@
  visibility="public"
 >
 </field>
-<field name="FOTA_UPDATE"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;android.permission.FOTA_UPDATE&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="GET_ACCOUNTS"
  type="java.lang.String"
  transient="false"

core/res/AndroidManifest.xml

@@ -745,9 +745,12 @@
         android:description="@string/permdesc_forceBack"
         android:protectionLevel="signature" />
 
-    <permission android:name="android.permission.FOTA_UPDATE"
+    <!-- Allows an application to publish system-level services.  Such services
-        android:label="@string/permlab_fotaUpdate"
+         can only be published from processes that never go away, so this is
-        android:description="@string/permdesc_fotaUpdate"
+         not something that any normal application can do. -->
+    <permission android:name="android.permission.ADD_SYSTEM_SERVICE"
+        android:label="@string/permlab_addSystemService"
+        android:description="@string/permdesc_addSystemService"
         android:protectionLevel="signature" />
 
     <!-- Allows an application to update device statistics. Not for

packages/SettingsProvider/AndroidManifest.xml

@@ -2,12 +2,6 @@
         package="com.android.providers.settings"
         android:sharedUserId="android.uid.system">
 
-    <!-- Permission to write Gservices in SettingsProvider -->
-    <permission android:name="android.permission.WRITE_GSERVICES"
-        android:label="@string/permlab_writeGservices"
-        android:description="@string/permdesc_writeGservices"
-        android:protectionLevel="signature" />
-
     <application android:allowClearUserData="false"
                  android:label="Settings Storage"
                  android:icon="@drawable/ic_launcher_settings">