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

Merge "Clean up PCO plumbing." into nyc-mr1-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2016-06-10 19:39:25 +00:00
committed by Android (Google) Code Review
parent b8dac11e5a eb17ccb608
commit 4b6298b019
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
telephony/java/com/android/internal/telephony/DctConstants.java
View File

@@ -104,6 +104,7 @@ public class DctConstants {
public static final int CMD_CLEAR_PROVISIONING_SPINNER = BASE + 42;
public static final int EVENT_DEVICE_PROVISIONED_CHANGE = BASE + 43;
public static final int EVENT_REDIRECTION_DETECTED = BASE + 44;
public static final int EVENT_PCO_DATA_RECEIVED = BASE + 45;
/***** Constants *****/

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

@@ -432,7 +432,10 @@ public class TelephonyIntents {
* The intent will have the following extra values:</p>
* <ul>
* <li>apnType</li><dd>A string with the apn type.</dd>
* <li>pcoValue</li><dd>A integer read from modem.</dd>
* <li>apnProto</li><dd>A string with the protocol of the apn connection (IP,IPV6,
* IPV4V6)</dd>
* <li>pcoId</li><dd>An integer indicating the pco id for the data.</dd>
* <li>pcoValue</li><dd>A byte array of pco data read from modem.</dd>
* <li>subId</dt><li>Sub Id which associated the data connection.</dd>
* </ul>
* <p class="note">This is a protected intent that can only be sent by the system. </p>
@@ -444,7 +447,9 @@ public class TelephonyIntents {
public static final String EXTRA_REDIRECTION_URL_KEY = "redirectionUrl";
public static final String EXTRA_ERROR_CODE_KEY = "errorCode";
public static final String EXTRA_APN_TYPE_KEY = "apnType";
public static final String EXTRA_PCO_KEY = "pco";
public static final String EXTRA_APN_PROTO_KEY = "apnProto";
public static final String EXTRA_PCO_ID_KEY = "pcoId";
public static final String EXTRA_PCO_VALUE_KEY = "pcoValue";
/**