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

Commit 99afbf9a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update API doc for accidentally exposed NETWORK_TYPE_BITMASK_LTE_CA" am: 2ca9a7ae 

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



Change-Id: Ia0cd9db993d4ed0f40c64bf07dc4ea1176026a5e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7613c6d5 2ca9a7ae

telephony/java/android/telephony/TelephonyManager.java

+21 −0
Original line number Diff line number Diff line
@@ -9051,6 +9051,7 @@ public class TelephonyManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                networkTypeBitmask = checkNetworkTypeBitmask(networkTypeBitmask);

                return telephony.setAllowedNetworkTypesForReason(getSubId(),

                        TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER, networkTypeBitmask);

            }
@@ -9060,6 +9061,20 @@ public class TelephonyManager { 
        return false;

    }













    /**













     * If {@link #NETWORK_TYPE_BITMASK_LTE_CA} bit is set, convert it to NETWORK_TYPE_BITMASK_LTE.













     *













     * @param networkTypeBitmask The networkTypeBitmask being checked













     * @return The checked/converted networkTypeBitmask













     */













    private long checkNetworkTypeBitmask(@NetworkTypeBitMask long networkTypeBitmask) {













        if ((networkTypeBitmask & NETWORK_TYPE_BITMASK_LTE_CA) != 0) {













            networkTypeBitmask ^= NETWORK_TYPE_BITMASK_LTE_CA;













            networkTypeBitmask |= NETWORK_TYPE_BITMASK_LTE;













        }













        return networkTypeBitmask;













    }



























    /**















     * Set the allowed network types of the device. This is for carrier or privileged apps to















     * enable/disable certain network types on the device. The user preferred network types should









@@ -9086,6 +9101,7 @@ public class TelephonyManager {













        try {















            ITelephony telephony = getITelephony();















            if (telephony != null) {













                allowedNetworkTypes = checkNetworkTypeBitmask(allowedNetworkTypes);















                return telephony.setAllowedNetworkTypesForReason(getSubId(),















                        TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER, allowedNetworkTypes);















            }










@@ -9171,6 +9187,7 @@ public class TelephonyManager {













        try {















            ITelephony telephony = getITelephony();















            if (telephony != null) {













                allowedNetworkTypes = checkNetworkTypeBitmask(allowedNetworkTypes);















                telephony.setAllowedNetworkTypesForReason(getSubId(), reason,















                        allowedNetworkTypes);















            } else {










@@ -13429,7 +13446,11 @@ public class TelephonyManager {













     */















    public static final long NETWORK_TYPE_BITMASK_LTE = (1 << (NETWORK_TYPE_LTE -1));















    /**













     * NOT USED; this bitmask is exposed accidentally, will be deprecated in U.













     * If used, will be converted to {@link #NETWORK_TYPE_BITMASK_LTE}.















     * network type bitmask indicating the support of radio tech LTE CA (carrier aggregation).













     *













     * @see #NETWORK_TYPE_BITMASK_LTE















     */















    public static final long NETWORK_TYPE_BITMASK_LTE_CA = (1 << (NETWORK_TYPE_LTE_CA -1));