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

Commit 4fd0ff86 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SIM slot not available error code added to... 

Merge "SIM slot not available error code added to UpdateAvailableNetworksResult" into tm-dev am: 217edfa9

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



Change-Id: I38613dcb05df4eb4a7e6d04816b9a1e8a08ab127
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 809566f8 217edfa9

telephony/java/android/telephony/TelephonyManager.java

+8 −1
Original line number Diff line number Diff line
@@ -14199,7 +14199,8 @@ public class TelephonyManager { 
            UPDATE_AVAILABLE_NETWORKS_MULTIPLE_NETWORKS_NOT_SUPPORTED,

            UPDATE_AVAILABLE_NETWORKS_NO_OPPORTUNISTIC_SUB_AVAILABLE,

            UPDATE_AVAILABLE_NETWORKS_REMOTE_SERVICE_EXCEPTION,

            UPDATE_AVAILABLE_NETWORKS_SERVICE_IS_DISABLED})

            UPDATE_AVAILABLE_NETWORKS_SERVICE_IS_DISABLED,

            UPDATE_AVAILABLE_NETWORKS_SIM_PORT_NOT_AVAILABLE})

    public @interface UpdateAvailableNetworksResult {}















    /**










@@ -14257,6 +14258,12 @@ public class TelephonyManager {













     */















    public static final int UPDATE_AVAILABLE_NETWORKS_SERVICE_IS_DISABLED = 10;



























    /**













     * SIM port is not available to switch to opportunistic subscription.













     * @hide













     */













    public static final int UPDATE_AVAILABLE_NETWORKS_SIM_PORT_NOT_AVAILABLE = 11;



























    /**















     * Set preferred opportunistic data subscription id.















     *