43a368dc19f87669d3e319136d166b80d4f83d50
Cancellation was not being propagated to the system server due to a misunderstanding on how CancellationSignal functions. There is no noticable impact for the user, as cancellation did properly prevent any further locations, however this would have resulted in limited extra power draw since the system server would not have canceled the associated provider location request. Impact is limited since getCurrentLocation() was limited to a 30s duration anyways. Bug: 168666216 Test: manual + presubmits Change-Id: I5c77db4cc56cce1b984587f65d2bcfb488436bb8
resolve merge conflicts of
525ed1c275 to rvc-dev-plus-aosp am: be053b7e19 am: 08e54a12ec am: 374718a2a8
Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to DownloadProvider" into rvc-qpr-dev am:
8b9d40586b am: aed20efa42
…
Merge "Update language to comply with Android's inclusive language guidance" am:
f98e615b6d am: 9016cc88e3
Merge "Adding TEST_MAPPING to frameworks/base/keystore" am:
5dd8206c04 am: 844ceb6d89 am: d3bcb99fee am: a017206faa am: 2104618c58
Merge "Merge "Convert lowpan/tests/Android.mk file to Android.bp" am:
9d9510e39e am: f7c86b4982 am: 152348379d" into rvc-d1-dev-plus-aosp am: acbfaa44ab am: e84805febd
…
Merge "Remove libandroid_trace" am:
242c212b80 am: 7d36816ecd am: 7e2c27581a am: bcd3b9c997 am: 2adaf74b30
…
Merge "Use jni_headers instead of JNI_H_INCLUDE" am:
75a5b44258 am: b842272135 am: 61ea9dd847 am: fe576af25a am: b90a8a87d9
Merge "Add sample app for haptic assessment." into rvc-dev am:
d121fd282c am: 7afc791190 am: a06cdd86e4 am: 37a3b83c1d
…
Merge "IorapForwardingService: Suppress error log" am:
c20242f7e6 am: 3e1b131387 am: 2206e69609 am: a0421d89ba am: 1c30e174e9
Merge "Expose Telecom constants for use in Telephony" am:
9fcb2819d0 am: 1bf919f084 am: 5b6beb2fc0 am: 2f8cf2f852 am: 74bb99708b
Merge "Data connection for carrier specific APN" into rvc-d1-dev-plus-aosp am:
e2b212e94e am: e662938fdf
Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am:
0b778939c7 am: 3f1247e91b am: 7d95615a4d am: 5f1edaf743 am: 3371e64939
…
…
…
Merge "Re-apply "Add bp-based disting of android stubs"" into rvc-dev-plus-aosp am:
b1db8662c0 am: 4b57d15fa3 am: b75a7e0983
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%