diff options
| author | Jim Sun <jimsun@google.com> | 2022-08-12 12:22:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-08-12 12:22:08 +0000 |
| commit | 7af1dfa02178c7b5f229bee5164969a735fd63a0 (patch) | |
| tree | 0f874415265bdc24f5a6b9bb799b8c4ce8de7e7a | |
| parent | 55dc7628d68a0ca5c182c0475fd51d314f6774a2 (diff) | |
| parent | cc20035d72aeed2f81aeb27b8f04c7d736d78c68 (diff) | |
| download | cts-7af1dfa02178c7b5f229bee5164969a735fd63a0.tar.gz | |
Merge "Fix to get correct num of support physical id from resource and check minimum support case"
2 files changed, 22 insertions, 2 deletions
diff --git a/tests/tests/telephony/current/mockmodem/src/android/telephony/mockmodem/MockModemService.java b/tests/tests/telephony/current/mockmodem/src/android/telephony/mockmodem/MockModemService.java index f2523a4018e..0bed8a7fa6d 100644 --- a/tests/tests/telephony/current/mockmodem/src/android/telephony/mockmodem/MockModemService.java +++ b/tests/tests/telephony/current/mockmodem/src/android/telephony/mockmodem/MockModemService.java @@ -34,6 +34,7 @@ import java.util.concurrent.TimeUnit; public class MockModemService extends Service { private static final String TAG = "MockModemService"; + private static final String RESOURCE_PACKAGE_NAME = "android"; public static final int TEST_TIMEOUT_MS = 30000; public static final String IRADIOCONFIG_INTERFACE = "android.telephony.mockmodem.iradioconfig"; @@ -233,9 +234,18 @@ public class MockModemService extends Service { } public int getNumPhysicalSlots() { - int numPhysicalSlots = + int numPhysicalSlots = MockSimService.MOCK_SIM_SLOT_MIN; + int resourceId = sContext.getResources() - .getInteger(com.android.internal.R.integer.config_num_physical_slots); + .getIdentifier( + "config_num_physical_slots", "integer", RESOURCE_PACKAGE_NAME); + + if (resourceId > 0) { + numPhysicalSlots = sContext.getResources().getInteger(resourceId); + } else { + Log.d(TAG, "Fail to get the resource Id, using default: " + numPhysicalSlots); + } + if (numPhysicalSlots > MockSimService.MOCK_SIM_SLOT_MAX) { Log.d( TAG, @@ -245,6 +255,15 @@ public class MockModemService extends Service { + MockSimService.MOCK_SIM_SLOT_MAX + ")."); numPhysicalSlots = MockSimService.MOCK_SIM_SLOT_MAX; + } else if (numPhysicalSlots <= MockSimService.MOCK_SIM_SLOT_MIN) { + Log.d( + TAG, + "Number of physical Slot (" + + numPhysicalSlots + + ") < mock sim slot support. Reset to min number supported (" + + MockSimService.MOCK_SIM_SLOT_MIN + + ")."); + numPhysicalSlots = MockSimService.MOCK_SIM_SLOT_MIN; } return numPhysicalSlots; diff --git a/tests/tests/telephony/current/mockmodem/src/android/telephony/mockmodem/MockSimService.java b/tests/tests/telephony/current/mockmodem/src/android/telephony/mockmodem/MockSimService.java index 81839255dec..026710b67d1 100644 --- a/tests/tests/telephony/current/mockmodem/src/android/telephony/mockmodem/MockSimService.java +++ b/tests/tests/telephony/current/mockmodem/src/android/telephony/mockmodem/MockSimService.java @@ -63,6 +63,7 @@ public class MockSimService { private static final int MOCK_SIM_SLOT_1 = 0; private static final int MOCK_SIM_SLOT_2 = 1; private static final int MOCK_SIM_SLOT_3 = 2; + public static final int MOCK_SIM_SLOT_MIN = 1; public static final int MOCK_SIM_SLOT_MAX = 3; /* Default value definition */ |