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

Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master

Browse Source
This commit is contained in:
Xin Li
2019-02-23 00:39:16 +00:00
committed by Android (Google) Code Review
parent bcaf794579 b455c3a7f3
commit f90d07b1b3
1374 changed files with 20567 additions and 39364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -2687,12 +2687,9 @@ public class CarrierConfigManager {
//6: CARRIER_ACTION_CANCEL_ALL_NOTIFICATIONS
//8: CARRIER_ACTION_DISABLE_DEFAULT_URL_HANDLER
});
sDefaults.putStringArray(KEY_CARRIER_DEFAULT_ACTIONS_ON_DEFAULT_NETWORK_AVAILABLE,
new String[] {
String.valueOf(false) + ": 7",
//7: CARRIER_ACTION_ENABLE_DEFAULT_URL_HANDLER
String.valueOf(true) + ": 8"
//8: CARRIER_ACTION_DISABLE_DEFAULT_URL_HANDLER
sDefaults.putStringArray(KEY_CARRIER_DEFAULT_ACTIONS_ON_DEFAULT_NETWORK_AVAILABLE, new String[] {
String.valueOf(false) + ": 7", //7: CARRIER_ACTION_ENABLE_DEFAULT_URL_HANDLER
String.valueOf(true) + ": 8" //8: CARRIER_ACTION_DISABLE_DEFAULT_URL_HANDLER
});
sDefaults.putStringArray(KEY_CARRIER_DEFAULT_REDIRECTION_URL_STRING_ARRAY, null);

19
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -6547,7 +6547,7 @@ public class TelephonyManager {
* {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE READ_PRIVILEGED_PHONE_STATE}
* app has carrier privileges (see {@link #hasCarrierPrivileges}).
*
* @return the preferred network type.
* @return the preferred network type, defined in RILConstants.java.
* @hide
*/
@RequiresPermission((android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE))
@@ -9362,6 +9362,23 @@ public class TelephonyManager {
}
}
/**
* Action set from carrier signalling broadcast receivers to reset all carrier actions
* Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required
* @param subId the subscription ID that this action applies to.
* @hide
*/
public void carrierActionResetAll(int subId) {
try {
ITelephony service = getITelephony();
if (service != null) {
service.carrierActionResetAll(subId);
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#carrierActionResetAll", e);
}
}
/**
* Get aggregated video call data usage since boot.
* Permissions android.Manifest.permission.READ_NETWORK_USAGE_HISTORY is required.

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

@@ -1416,6 +1416,14 @@ interface ITelephony {
*/
void carrierActionReportDefaultNetworkStatus(int subId, boolean report);
/**
* Action set from carrier signalling broadcast receivers to reset all carrier actions.
* Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required
* @param subId the subscription ID that this action applies to.
* @hide
*/
void carrierActionResetAll(int subId);
/**
* Get aggregated video call data usage since boot.
* Permissions android.Manifest.permission.READ_NETWORK_USAGE_HISTORY is required.