commit 595884ed04648a8c926c8b452d4f03d390a033c2
author Jiashen Wang <jiashenwang@google.com> Thu Jan 28 15:46:47 2021 -0800
committer Jiashen Wang <jiashenwang@google.com> Sun Jan 31 21:38:28 2021 +0000
tree df9cc3dde60c48ecce8f5f4b617a054bb75476d9
parent 06abd14274261e52d4ecb3d0c0bb82d421c6586f

Change Settings to be able to receive timeout values from LPA

Bug: 171846124
Test: Tested manually
Change-Id: I547315eabd7cc873b0dda7a3bb2d09c84225ddd3

src/com/android/settings/network/EnableMultiSimSidecar.java

diff --git a/src/com/android/settings/network/EnableMultiSimSidecar.java b/src/com/android/settings/network/EnableMultiSimSidecar.java
index c47e61a..4a32433 100644
--- a/src/com/android/settings/network/EnableMultiSimSidecar.java
+++ b/src/com/android/settings/network/EnableMultiSimSidecar.java
@@ -21,6 +21,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccSlotInfo;
@@ -46,8 +47,7 @@
     // Tags
     private static final String TAG = "EnableMultiSimSidecar";
 
-    // TODO(b/171846124): Pass timeout value from LPA to Settings
-    private static final long ENABLE_MULTI_SIM_TIMEOUT_MILLS = 40 * 1000L;
+    private static final long DEFAULT_ENABLE_MULTI_SIM_TIMEOUT_MILLS = 40 * 1000L;
 
     public static EnableMultiSimSidecar get(FragmentManager fm) {
         return SidecarFragment.get(fm, TAG, EnableMultiSimSidecar.class, null /* args */);
@@ -77,7 +77,7 @@
                             TAG,
                             String.format(
                                     "%d slots are active and %d SIMs are ready. Keep waiting until"
-                                        + " timeout.",
+                                            + " timeout.",
                                     activeSlotsCount, readySimsCount));
                 }
             };
@@ -123,8 +123,12 @@
                             mCarrierConfigChangeReceiver,
                             new IntentFilter(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));
             mTelephonyManager.switchMultiSimConfig(mNumOfActiveSim);
-            if (mSimCardStateChangedLatch.await(
-                    ENABLE_MULTI_SIM_TIMEOUT_MILLS, TimeUnit.MILLISECONDS)) {
+            long waitingTimeMillis =
+                    Settings.Global.getLong(
+                            getContext().getContentResolver(),
+                            Settings.Global.ENABLE_MULTI_SLOT_TIMEOUT_MILLIS,
+                            DEFAULT_ENABLE_MULTI_SIM_TIMEOUT_MILLS);
+            if (mSimCardStateChangedLatch.await(waitingTimeMillis, TimeUnit.MILLISECONDS)) {
                 Log.i(TAG, "Multi SIM were successfully enabled.");
                 return true;
             } else {

src/com/android/settings/network/UiccSlotUtil.java

diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java
index 792f02a..6113f5a 100644
--- a/src/com/android/settings/network/UiccSlotUtil.java
+++ b/src/com/android/settings/network/UiccSlotUtil.java
@@ -18,6 +18,7 @@
 
 import android.annotation.IntDef;
 import android.content.Context;
+import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccSlotInfo;
 import android.util.Log;
@@ -35,8 +36,8 @@
 
     private static final String TAG = "UiccSlotUtil";
 
-    // TODO(b/171846124): Pass timeout value from LPA to Settings
-    private static final long WAIT_AFTER_SWITCH_TIMEOUT_MILLIS = 25000;
+    private static final long DEFAULT_WAIT_AFTER_SWITCH_TIMEOUT_MILLIS = 25 * 1000L;
+    ;
 
     public static final int INVALID_PHYSICAL_SLOT_ID = -1;
 
@@ -115,12 +116,17 @@
     private static void performSwitchToRemovableSlot(int slotId, Context context)
             throws UiccSlotsException {
         CarrierConfigChangedReceiver receiver = null;
+        long waitingTimeMillis =
+                Settings.Global.getLong(
+                        context.getContentResolver(),
+                        Settings.Global.EUICC_SWITCH_SLOT_TIMEOUT_MILLIS,
+                        DEFAULT_WAIT_AFTER_SWITCH_TIMEOUT_MILLIS);
         try {
             CountDownLatch latch = new CountDownLatch(1);
             receiver = new CarrierConfigChangedReceiver(latch);
             receiver.registerOn(context);
             switchSlots(context, slotId);
-            latch.await(WAIT_AFTER_SWITCH_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+            latch.await(waitingTimeMillis, TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             Log.e(TAG, "Failed switching to physical slot.", e);