OSDN Git Service

Fix the inconsistency of scan status.
authoryinxu <yinxu@google.com>
Fri, 23 Jun 2017 22:27:42 +0000 (15:27 -0700)
committeryinxu <yinxu@google.com>
Fri, 23 Jun 2017 22:39:13 +0000 (15:39 -0700)
commit548475c58d78ced139596cfefb040895f14c9589
tree486735f2a9eb446bd90173f2b39f81fbb65b0bd2
parent06c32f21fc2d51bcae7af0d7145311c8750d0d0c
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