Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c6e9e65 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 2a6f6ed9 7d301700

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -8149,6 +8149,9 @@ package android.telephony { 














  public class TelephonyManager {















    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 checkCarrierPrivilegesForPackageAnyPhone(String);















    method public void dial(String);

























telephony/java/android/telephony/TelephonyManager.java



+9
−3




























Original line number
Diff line number
Diff line








@@ -10132,11 +10132,13 @@ public class TelephonyManager {





























    /**















     * 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 enabled control enable or disable radio.















     * @hide















     */













    @SystemApi













    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)















    public void carrierActionSetRadioEnabled(int subId, boolean enabled) {















        try {















            ITelephony service = getITelephony();









@@ -10151,11 +10153,13 @@ public class TelephonyManager {













    /**















     * Action set from carrier signalling broadcast receivers to start/stop reporting default















     * 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 report control start/stop reporting network status.















     * @hide















     */













    @SystemApi













    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)















    public void carrierActionReportDefaultNetworkStatus(int subId, boolean report) {















        try {















            ITelephony service = getITelephony();









@@ -10169,10 +10173,12 @@ public class TelephonyManager {





























    /**















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















     * @hide















     */













    @SystemApi













    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)















    public void carrierActionResetAll(int subId) {















        try {















            ITelephony service = getITelephony();