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

Commit 06e8ba26 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" into main am: 02b16819 am: 4b1a0c2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2718259



Change-Id: I123ff357753a2a0bda489c990c60918d84d57e84
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ffd3906 4b1a0c2a

telephony/java/android/telephony/SmsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ public final class SmsManager { 
    }



    /**

     * Get {@link Context#getOpPackageName()} if this manager has a context, otherwise a dummy

     * Get {@link Context#getOpPackageName()} if this manager has a context, otherwise a placeholder

     * value.

     *

     * @return The package name to be used for app-ops checks

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -7840,7 +7840,7 @@ public class TelephonyManager { 
    }















    /**













     * Rollback modem configurations to factory default except some config which are in whitelist.













     * Rollback modem configurations to factory default except some config which are in allowlist.















     * Used for device configuration by some carriers.















     *















     * <p>Requires Permission:










@@ -15340,7 +15340,7 @@ public class TelephonyManager {













     *















     *  1) User data is turned on, or















     *  2) APN is un-metered for this subscription, or













     *  3) APN type is whitelisted. E.g. MMS is whitelisted if













     *  3) APN type is allowlisted. E.g. MMS is allowlisted if















     *  {@link #MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED} is enabled.















     *















     * @param apnType Value indicating the apn type. Apn types are defined in {@link ApnSetting}.

























telephony/java/android/telephony/ims/ImsReasonInfo.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -460,7 +460,7 @@ public final class ImsReasonInfo implements Parcelable {













     */















    public static final int CODE_LOW_BATTERY = 505;















    /**













     * Device declined a call due to a blacklisted caller ID.













     * Device declined a call due to a denylisted caller ID.















     */















    public static final int CODE_BLACKLISTED_CALL_ID = 506;















    // IMS -> Telephony