Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix testNetworkScanRequestParcel_Parcel CTS

Browse Source 
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
This commit is contained in:
Sooraj Sasindran
2019-12-16 16:46:55 -08:00
parent 02f70c7476
commit c834e855cb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/NetworkScanRequest.java
View File

@@ -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();