diff options
| -rw-r--r-- | telephony/java/android/telephony/NetworkScanRequest.java | 8 | ||||
| -rw-r--r-- | telephony/java/android/telephony/RadioAccessSpecifier.java | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/telephony/java/android/telephony/NetworkScanRequest.java b/telephony/java/android/telephony/NetworkScanRequest.java index ea503c3e4bd8..9726569a60a2 100644 --- a/telephony/java/android/telephony/NetworkScanRequest.java +++ b/telephony/java/android/telephony/NetworkScanRequest.java @@ -143,7 +143,11 @@ public final class NetworkScanRequest implements Parcelable { int incrementalResultsPeriodicity, ArrayList<String> mccMncs) { this.mScanType = scanType; - this.mSpecifiers = specifiers.clone(); + if (specifiers != null) { + this.mSpecifiers = specifiers.clone(); + } else { + this.mSpecifiers = null; + } this.mSearchPeriodicity = searchPeriodicity; this.mMaxSearchTime = maxSearchTime; this.mIncrementalResults = incrementalResults; @@ -187,7 +191,7 @@ public final class NetworkScanRequest implements Parcelable { /** Returns the radio access technologies with bands or channels that need to be scanned. */ public RadioAccessSpecifier[] getSpecifiers() { - return mSpecifiers.clone(); + return mSpecifiers == null ? null : mSpecifiers.clone(); } /** diff --git a/telephony/java/android/telephony/RadioAccessSpecifier.java b/telephony/java/android/telephony/RadioAccessSpecifier.java index 85a4ed8e465e..81e7ed0111f4 100644 --- a/telephony/java/android/telephony/RadioAccessSpecifier.java +++ b/telephony/java/android/telephony/RadioAccessSpecifier.java @@ -72,8 +72,16 @@ public final class RadioAccessSpecifier implements Parcelable { */ public RadioAccessSpecifier(int ran, int[] bands, int[] channels) { this.mRadioAccessNetwork = ran; - this.mBands = bands.clone(); - this.mChannels = channels.clone(); + if (bands != null) { + this.mBands = bands.clone(); + } else { + this.mBands = null; + } + if (channels != null) { + this.mChannels = channels.clone(); + } else { + this.mChannels = null; + } } /** @@ -93,12 +101,12 @@ public final class RadioAccessSpecifier implements Parcelable { * it depends on the returned value of {@link #getRadioAccessNetwork()}. */ public int[] getBands() { - return mBands.clone(); + return mBands == null ? null : mBands.clone(); } /** Returns the frequency channels that need to be scanned. */ public int[] getChannels() { - return mChannels.clone(); + return mChannels == null ? null : mChannels.clone(); } public static final Parcelable.Creator<RadioAccessSpecifier> CREATOR = |