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

Commit 322d0f8d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Hide API" into rvc-dev am: 58979d95 am: b86e2604 

Change-Id: I9c5192e1682cca523beb504f61174350e1cca11a
parents e3f23a49 b86e2604

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -11798,7 +11798,6 @@ package android.telephony { 
    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAlwaysAllowMmsData(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAlwaysAllowMmsData(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAlwaysReportSignalStrength(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCallForwarding(@NonNull android.telephony.CallForwardingInfo);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCallForwarding(@NonNull android.telephony.CallForwardingInfo);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCallWaitingStatus(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCallWaitingStatus(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);

telephony/java/android/telephony/TelephonyManager.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -11174,7 +11174,6 @@ public class TelephonyManager { 
     * @param isEnabled {@code true} for enabling; {@code false} for disabling.

     * @param isEnabled {@code true} for enabling; {@code false} for disabling.

     * @hide

     * @hide

     */

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public void setAlwaysReportSignalStrength(boolean isEnabled) {

    public void setAlwaysReportSignalStrength(boolean isEnabled) {

        try {

        try {