diff options
author | Sooraj Sasindran <sasindran@google.com> | 2019-12-16 16:46:55 -0800 |
---|---|---|
committer | Sooraj Sasindran <sasindran@google.com> | 2020-01-27 22:03:54 -0800 |
commit | c834e855cb56680907bcc5f271ca06c33b15365c (patch) | |
tree | 9cfbc6bb73509f09efd52b1eed8378d5df371205 | |
parent | 02f70c7476fcf116c9c1dd1851d74c977a60c81d (diff) |
Fix testNetworkScanRequestParcel_Parcel CTS
Allow mSpecifiers to be null in case the length of the specifier array
is less than null
Bug: 146363437
Test: Ran CTS
cts-tradefed run cts -m CtsCarrierApiTestCases --test android.carrierapi.cts.NetworkScanApiTest
Merged-In: Iad7d91d8813415bbd2f3b6cad02120e59441e08a
Change-Id: Iad7d91d8813415bbd2f3b6cad02120e59441e08a
-rw-r--r-- | telephony/java/android/telephony/NetworkScanRequest.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/NetworkScanRequest.java b/telephony/java/android/telephony/NetworkScanRequest.java index 0ceb103d0f27..c8b8ffb9846b 100644 --- a/telephony/java/android/telephony/NetworkScanRequest.java +++ b/telephony/java/android/telephony/NetworkScanRequest.java @@ -222,9 +222,13 @@ public final class NetworkScanRequest implements Parcelable { private NetworkScanRequest(Parcel in) { mScanType = in.readInt(); Parcelable[] tempSpecifiers = in.readParcelableArray(Object.class.getClassLoader()); - mSpecifiers = new RadioAccessSpecifier[tempSpecifiers.length]; - for (int i = 0; i < tempSpecifiers.length; i++) { - mSpecifiers[i] = (RadioAccessSpecifier) tempSpecifiers[i]; + if (tempSpecifiers != null) { + mSpecifiers = new RadioAccessSpecifier[tempSpecifiers.length]; + for (int i = 0; i < tempSpecifiers.length; i++) { + mSpecifiers[i] = (RadioAccessSpecifier) tempSpecifiers[i]; + } + } else { + mSpecifiers = null; } mSearchPeriodicity = in.readInt(); mMaxSearchTime = in.readInt(); |