Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69d5e476 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22722 into eclair 

* changes:
  Integrate CDMA provisioning into SetupWizard
parents b3b1ccfe 767be5f0

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -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"

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -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. -->

telephony/java/com/android/internal/telephony/ITelephony.aidl

+5 −0
Original line number Diff line number Diff line
@@ -238,6 +238,11 @@ interface ITelephony { 
     */

    String getCdmaEriText();



    /**

     * Returns true if CDMA provisioning needs to run.

     */

    boolean getCdmaNeedsProvisioning();



    /**

      * Returns the unread count of voicemails

      */