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

Commit 688a8633 authored by Betty Chang's avatar Betty Chang Committed by Automerger Merge Worker
Browse files

Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into... 

Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into rvc-dev am: 4ce79c63

Change-Id: I5476f3696c09330d0160a23db9be04bafd65199c
parents dea74912 4ce79c63

api/system-current.txt

+0 −3
Original line number Diff line number Diff line
@@ -11294,8 +11294,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultDataSubId(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultSmsSubId(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultVoiceSubscriptionId(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setDisplayName(@Nullable String, int, int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setIconTint(@ColorInt int, int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPreferredDataSubscriptionId(int, boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setSubscriptionEnabled(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUiccApplicationsEnabled(int, boolean);
@@ -11435,7 +11433,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings();

    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 setAlwaysAllowMmsData(boolean);

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

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);

telephony/api/system-current.txt

+0 −3
Original line number Diff line number Diff line
@@ -703,8 +703,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultDataSubId(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultSmsSubId(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultVoiceSubscriptionId(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setDisplayName(@Nullable String, int, int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setIconTint(int, int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPreferredDataSubscriptionId(int, boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setSubscriptionEnabled(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUiccApplicationsEnabled(int, boolean);
@@ -838,7 +836,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings();

    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 setAlwaysAllowMmsData(boolean);

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

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);

telephony/java/android/telephony/SubscriptionManager.java

+0 −2
Original line number Diff line number Diff line
@@ -1655,7 +1655,6 @@ public class SubscriptionManager { 
     * @return the number of records updated

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    public int setIconTint(@ColorInt int tint, int subId) {

        if (VDBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId);
@@ -1672,7 +1671,6 @@ public class SubscriptionManager { 
     * @return the number of records updated or < 0 if invalid subId

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    public int setDisplayName(@Nullable String displayName, int subId,

            @SimDisplayNameSource int nameSource) {

telephony/java/android/telephony/TelephonyManager.java

+0 −1
Original line number Diff line number Diff line
@@ -12990,7 +12990,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public boolean setAlwaysAllowMmsData(boolean alwaysAllow) {

        try {