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

Merge "Add carrier setup app integration"

Browse Source
This commit is contained in:
Evan Charlton
2013-07-15 18:31:20 +00:00
committed by Android (Google) Code Review
parent 06a884671f 843d5ea5ec
commit 10dd2b6464
3 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/AndroidManifest.xml
View File

@@ -2348,6 +2348,14 @@
android:description="@string/permdesc_bindNotificationListenerService"
android:protectionLevel="signature" />
<!-- Allows an application to call into a carrier setup flow. It is up to the
carrier setup application to enforce that this permission is required
@hide This is not a third-party API (intended for OEMs and system apps). -->
<permission android:name="android.permission.INVOKE_CARRIER_SETUP"
android:label="@string/permlab_invokeCarrierSetup"
android:description="@string/permdesc_invokeCarrierSetup"
android:protectionLevel="signature|system" />
<!-- The system process is explicitly the only one allowed to launch the
confirmation UI for full backup/restore -->
<uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/>

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

@@ -1867,6 +1867,11 @@
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_bindNotificationListenerService">Allows the holder to bind to the top-level interface of a notification listener service. Should never be needed for normal apps.</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_invokeCarrierSetup">invoke the carrier-provided configuration app</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_invokeCarrierSetup">Allows the holder to invoke the carrier-provided configuration app. Should never be needed for normal apps.</string>
<!-- Policy administration -->
<!-- Title of policy access to limiting the user's password choices -->

17
telephony/java/com/android/internal/telephony/TelephonyIntents.java
View File

@@ -237,6 +237,23 @@ public class TelephonyIntents {
public static final String ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS
= "android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS";
/**
* Activity Action: Start this activity to invoke the carrier setup app.
* To filter the intent, see {@link #CATEGORY_MCCMNC_PREFIX}.
*
* <p class="note">Callers of this should hold the android.permission.INVOKE_CARRIER_SETUP
* permission.</p>
*/
public static final String ACTION_CARRIER_SETUP = "android.intent.action.ACTION_CARRIER_SETUP";
/**
* A <em>prefix</em> for the MCC/MNC filtering used with {@link #ACTION_CARRIER_SETUP}.
* The MCC/MNC will be concatenated (zero-padded to 3 digits each) to create a final
* string of the form:
* <br />
* <code>android.intent.category.MCCMNC_310260</code>
*/
public static final String CATEGORY_MCCMNC_PREFIX = "android.intent.category.MCCMNC_";
/**
* Broadcast Action: A "secret code" has been entered in the dialer. Secret codes are