Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6463d24b: am 69d5e476: Merge change 22722 into eclair

Browse Source 
Merge commit '6463d24ba5ef4854da40294d7f98d849220a5de2'

* commit '6463d24ba5ef4854da40294d7f98d849220a5de2':
  Integrate CDMA provisioning into SetupWizard
This commit is contained in:
Jim Miller
2009-08-27 13:05:43 -07:00
committed by Android Git Automerger
parent fa89b09cec 6463d24ba5
commit 5ac41943ef
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/AndroidManifest.xml
View File

@@ -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"

6
core/res/res/values/strings.xml
View File

@@ -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. -->

5
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -238,6 +238,11 @@ interface ITelephony {
*/
String getCdmaEriText();
/**
* Returns true if CDMA provisioning needs to run.
*/
boolean getCdmaNeedsProvisioning();
/**
* Returns the unread count of voicemails
*/