From 91c5dc9a6a591046f87021480d0985a526cd5716 Mon Sep 17 00:00:00 2001 From: Cassie Date: Tue, 17 Apr 2018 09:20:08 -0700 Subject: [PATCH] Cherry-pick 'Fix a tiny bug in NetworkScanRequest' Bug: 77487847 Test: cts-tradefed run cts -m CtsCarrierApiTestCases --test android.carrierapi.cts.NetworkScanApiTest Change-Id: Ic4b167cf4929a1bb86fa7e6768672a9288b96911 Merged-In: Ic4b167cf4929a1bb86fa7e6768672a9288b96911 --- telephony/java/android/telephony/NetworkScanRequest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/telephony/java/android/telephony/NetworkScanRequest.java b/telephony/java/android/telephony/NetworkScanRequest.java index 9726569a60a20..8705fa333d2f5 100644 --- a/telephony/java/android/telephony/NetworkScanRequest.java +++ b/telephony/java/android/telephony/NetworkScanRequest.java @@ -20,11 +20,10 @@ import android.annotation.IntDef; import android.os.Parcel; import android.os.Parcelable; -import java.util.ArrayList; -import java.util.Arrays; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; - +import java.util.ArrayList; +import java.util.Arrays; /** * Defines a request to peform a network scan. * @@ -152,7 +151,7 @@ public final class NetworkScanRequest implements Parcelable { this.mMaxSearchTime = maxSearchTime; this.mIncrementalResults = incrementalResults; this.mIncrementalResultsPeriodicity = incrementalResultsPeriodicity; - if (mMccMncs != null) { + if (mccMncs != null) { this.mMccMncs = (ArrayList) mccMncs.clone(); } else { this.mMccMncs = new ArrayList<>();