diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-07-11 02:30:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-11 02:30:36 +0000 |
| commit | c7315d35182d1993d4dc194bd8405cb3b4a60516 (patch) | |
| tree | dc02902f45cc7ba4e4234030e68b397f83fce793 | |
| parent | f91ff6015ef226629d8bd0033ce5d97f94705383 (diff) | |
| parent | e77337b3c7f323886414089efe11f8fc0434560b (diff) | |
| download | cts-android10-dev.tar.gz | |
Merge "Check first-release-sdk before opening invalid LC." into qt-devandroid10-dev
| -rw-r--r-- | tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java index 9abaa008299..ca6ff3e7195 100644 --- a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java +++ b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java @@ -604,11 +604,14 @@ public class CarrierApiTest extends AndroidTestCase { // Valid p2 values are defined in TS 102 221 Table 11.2. Per Table 11.2, 0xF0 should be // invalid. Any p2 values that produce non '9000'/'62xx'/'63xx' status words are treated as - // an error and the channel is not opened. - p2 = 0xF0; - response = mTelephonyManager.iccOpenLogicalChannel("", p2); - assertEquals(INVALID_CHANNEL, response.getChannel()); - assertNotEquals(STATUS_NO_ERROR, response.getStatus()); + // an error and the channel is not opened. Due to compatibility issues with older devices, + // this check is only enabled for new devices launching on Q+. + if (Build.VERSION.FIRST_SDK_INT >= Build.VERSION_CODES.Q) { + p2 = 0xF0; + response = mTelephonyManager.iccOpenLogicalChannel("", p2); + assertEquals(INVALID_CHANNEL, response.getChannel()); + assertNotEquals(STATUS_NO_ERROR, response.getStatus()); + } } /** |