summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ying Xu <yinxu@google.com> 2017-06-26 17:45:41 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-26 17:45:41 +0000
commit487893dada3af9ba2b0b92e62c56d5ab5746af1c (patch)
tree1e61a35dfd49f37fa5962abcc901f43f152e792e
parentadcd1fe0f6a28aab9e25a8a2aa65440d7d0929f4 (diff)
parent57ad8be7ecb65003ea83ca7536e5d513e8ada1cb (diff)
Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195 am: e30cfbea60
am: 57ad8be7ec Change-Id: I2ee40a6c22a1bfe58ca107790719c5695aa7c774
-rw-r--r--telephony/java/com/android/internal/telephony/NetworkScanResult.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/NetworkScanResult.java b/telephony/java/com/android/internal/telephony/NetworkScanResult.java
index 7a7c17467dae..95f39d7f878a 100644
--- a/telephony/java/com/android/internal/telephony/NetworkScanResult.java
+++ b/telephony/java/com/android/internal/telephony/NetworkScanResult.java
@@ -35,10 +35,10 @@ import java.util.Objects;
public final class NetworkScanResult implements Parcelable {
// Contains only part of the scan result and more are coming.
- public static final int SCAN_STATUS_PARTIAL = 0;
+ public static final int SCAN_STATUS_PARTIAL = 1;
// Contains the last part of the scan result and the scan is now complete.
- public static final int SCAN_STATUS_COMPLETE = 1;
+ public static final int SCAN_STATUS_COMPLETE = 2;
// The status of the scan, only valid when scanError = SUCCESS.
public int scanStatus;