From 548475c58d78ced139596cfefb040895f14c9589 Mon Sep 17 00:00:00 2001 From: yinxu Date: Fri, 23 Jun 2017 15:27:42 -0700 Subject: Fix the inconsistency of scan status. In types.hal and ril.h, the scan status is defined as: PARTIAL = 0x01 COMPLETE = 0x02 But in NetworkScanResult.java, the scan status is defined as: public static final int SCAN_STATUS_PARTIAL = 0 public static final int SCAN_STATUS_COMPLETE = 1 This CL makes changes to NetworkScanResult.java so that the scan status is consistent both in Telephony and RIL. Cherry-picked cleanly from: https://android-review.googlesource.com/#/c/422183/ Test: Telephony sanity tests Bug: 30954762 Merged-in: Iadcd344ad3fe682da98a1a41c2964583f67dc792 Change-Id: Iadcd344ad3fe682da98a1a41c2964583f67dc792 (cherry picked from commit ad50361ecec1844ddfb8a41097832a5cf0ecbb76) --- telephony/java/com/android/internal/telephony/NetworkScanResult.java | 4 ++-- 1 file 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; -- cgit v1.2.3-59-g8ed1b