From 767be5f0b929cc1eeb8a7d5aa7a02e228053e9bb Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Tue, 25 Aug 2009 19:33:57 -0700
Subject: [PATCH] Integrate CDMA provisioning into SetupWizard

---
 core/res/AndroidManifest.xml                                | 6 ++++++
 core/res/res/values/strings.xml                             | 6 ++++++
 .../java/com/android/internal/telephony/ITelephony.aidl     | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 35042f1d842ae..5b9f7e6182ee1 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1011,6 +1011,12 @@
         android:description="@string/permdesc_callPrivileged"
         android:protectionLevel="signatureOrSystem" />
 
+    <!-- Allows an application to perform CDMA OTA provisioning @hide -->
+    <permission android:name="android.permission.PERFORM_CDMA_PROVISIONING"
+        android:label="@string/permlab_performCdmaProvisioning"
+        android:description="@string/permdesc_performCdmaProvisioning"
+        android:protectionLevel="signatureOrSystem" />
+
     <!-- Allows enabling/disabling location update notifications from
          the radio. Not for use by normal applications. -->
     <permission android:name="android.permission.CONTROL_LOCATION_UPDATES"
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 7dc4ff9e2e321..e79b0e2f82735 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -897,6 +897,12 @@
         Malicious applications may place unnecessary and illegal calls to emergency
         services.</string>
 
+    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+    <string name="permlab_performCdmaProvisioning">directly start CDMA phone setup</string>
+    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+    <string name="permdesc_performCdmaProvisioning">Allows the application to start CDMA provisioning.
+        Malicious applications may unnecessarily start CDMA provisioning</string>
+
     <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
     <string name="permlab_locationUpdates">control location update notifications</string>
     <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index cac4de96d68a1..63c23ae569547 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -238,6 +238,11 @@ interface ITelephony {
      */
     String getCdmaEriText();
 
+    /**
+     * Returns true if CDMA provisioning needs to run.
+     */
+    boolean getCdmaNeedsProvisioning();
+
     /**
       * Returns the unread count of voicemails
       */