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

Merge "Expose APIs required by CarrierDefaultApp as system APIs."

Browse Source
This commit is contained in:
Treehugger Robot
2019-10-29 20:06:27 +00:00
committed by Gerrit Code Review
parent 2a6f6ed94b 7d3017002f
commit 8c6e9e653d
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -8149,6 +8149,9 @@ package android.telephony {
public class TelephonyManager { public class TelephonyManager {
method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String); method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void carrierActionReportDefaultNetworkStatus(int, boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void carrierActionResetAll(int);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void carrierActionSetRadioEnabled(int, boolean);
method public int checkCarrierPrivilegesForPackage(String); method public int checkCarrierPrivilegesForPackage(String);
method public int checkCarrierPrivilegesForPackageAnyPhone(String); method public int checkCarrierPrivilegesForPackageAnyPhone(String);
method public void dial(String); method public void dial(String);

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

@@ -10132,11 +10132,13 @@ public class TelephonyManager {
/** /**
* Action set from carrier signalling broadcast receivers to enable/disable radio * Action set from carrier signalling broadcast receivers to enable/disable radio
* Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required * Permissions {@link android.Manifest.permission.MODIFY_PHONE_STATE} is required.
* @param subId the subscription ID that this action applies to. * @param subId the subscription ID that this action applies to.
* @param enabled control enable or disable radio. * @param enabled control enable or disable radio.
* @hide * @hide
*/ */
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void carrierActionSetRadioEnabled(int subId, boolean enabled) { public void carrierActionSetRadioEnabled(int subId, boolean enabled) {
try { try {
ITelephony service = getITelephony(); ITelephony service = getITelephony();
@@ -10151,11 +10153,13 @@ public class TelephonyManager {
/** /**
* Action set from carrier signalling broadcast receivers to start/stop reporting default * Action set from carrier signalling broadcast receivers to start/stop reporting default
* network available events * network available events
* Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required * Permissions {@link android.Manifest.permission.MODIFY_PHONE_STATE} is required.
* @param subId the subscription ID that this action applies to. * @param subId the subscription ID that this action applies to.
* @param report control start/stop reporting network status. * @param report control start/stop reporting network status.
* @hide * @hide
*/ */
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void carrierActionReportDefaultNetworkStatus(int subId, boolean report) { public void carrierActionReportDefaultNetworkStatus(int subId, boolean report) {
try { try {
ITelephony service = getITelephony(); ITelephony service = getITelephony();
@@ -10169,10 +10173,12 @@ public class TelephonyManager {
/** /**
* Action set from carrier signalling broadcast receivers to reset all carrier actions * Action set from carrier signalling broadcast receivers to reset all carrier actions
* Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required * Permissions {@link android.Manifest.permission.MODIFY_PHONE_STATE} is required.
* @param subId the subscription ID that this action applies to. * @param subId the subscription ID that this action applies to.
* @hide * @hide
*/ */
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void carrierActionResetAll(int subId) { public void carrierActionResetAll(int subId) {
try { try {
ITelephony service = getITelephony(); ITelephony service = getITelephony();