commit f7696d07b86b03ffb3f4f1d4697be41ce4802027
author Jean Chalard <jchalard@google.com> Mon Sep 25 10:58:05 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 25 10:58:05 2023 +0000
tree 572b224723867ab4dbd75fafb57d17547fdd3ab8
parent 87fac2a39cdcec6936540aa99a5fefc81ecafe21
parent 71706f4fdee5c9ec2182e3a8ba01604189463709

Merge "Fix a bug where slotId was used instead of subscription ID" into main

src/com/android/phone/TelephonyShellCommand.java

diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 70912c1..6dddb4b 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -3035,7 +3035,7 @@
     // clear-carrier-service-package-override
     private int clearCarrierServicePackageOverride() {
         PrintWriter errPw = getErrPrintWriter();
-        int subId = getDefaultSlot();
+        int subId = SubscriptionManager.getDefaultSubscriptionId();
 
         String opt;
         while ((opt = getNextOption()) != null) {