Commit Graph

344139 Commits

Author SHA1 Message Date
Etan Cohen
f319fccd79 [RTT2] Remove Aware RTT code
Original WIP Aware RTT API routed RTT through the Aware manager. This
will be replaced by direct usage of the WifiRttManager API. First step
is to remove the old code.

Bug: 65015034
Test: unit tests pass
Change-Id: I850d285d3f2a3dec6425d933614d18020745b9d4
2017-10-03 07:01:06 -07:00
Etan Cohen
692e68e7a2 [RTT2] Add API for testing whether feature exists on platform
Add PackageManager API which allows apps to test whether the platform
officially supports the Wi-Fi RTT API.

Only start the RTT service if the device supports it.

Bug: 65014628
Test: integration tests pass
Change-Id: Ie88bd29ccd592e9a29ff24e8cc346afc360f03b0
2017-10-03 07:01:05 -07:00
Etan Cohen
17ba47254c [RTT2] New (v2) Wi-Fi RTT framework
Replace existing Wi-Fi RTT manager framework. Creating new framework
in parallel since there's code using the new framework - will be
switched over once new version ready.

New version is AIDL-based.

Bug: 65014552
Test: unit tests and integration tests
Change-Id: Id468c9b2a3c94eb30959f5ac5e4b1688fb8fc633
2017-10-03 07:01:01 -07:00
Hall Liu
e77a09c7ae Merge "API council suggested edits, part 3" am: 7a4cc05d45 am: 4c4fb3bdfb am: 7fd9aa2654
am: 3715bced3a

Change-Id: Ie4dacc599a561e60f40e5ef26f03aa7ef19fbda8
2017-09-15 14:04:33 +00:00
Hall Liu
3812601906 Merge "Apply suggested edits to the file-download API" am: f6c9baa0cd am: 3934c475ce am: febecb8218
am: 3e0f22f676

Change-Id: I4c10058445c1252447f2cd5889bb35f425efa468
2017-09-15 14:00:18 +00:00
Jiyong Park
215df9c284 Merge "Merge "Fix missing null checking" into oc-mr1-dev am: 93d436f4bc" into oc-mr1-dev-plus-aosp
am: 2089f92625

Change-Id: Id44a81a44df376ebcaa9efd229b78328d8eaa5ac
2017-09-15 13:56:46 +00:00
Narayan Kamath
96d66875ce Merge changes from topic "am-37ab0897d803452791072eae772298af" into oc-mr1-dev-plus-aosp
am: 609495e298  -s ours

Change-Id: I82d29485a7d36021850b2e43068afd8671cc36ff
2017-09-15 13:53:16 +00:00
Kevin Hufnagle
911e1e1641 Merge "Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df am: 91fb9b2a16 am: 531a955dba" into oc-mr1-dev-plus-aosp
am: a210bf21ea

Change-Id: Ibe5ab4b576c3726c70651931606f513da8d88bb9
2017-09-15 13:49:36 +00:00
Android Build Merger (Role)
6dd80e7d83 Merge "Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am: cebe432650" into oc-mr1-dev-plus-aosp am: 7a9b7da051" 2017-09-15 11:49:50 +00:00
sergeyv
10c6d8b68e Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am: cebe432650" into oc-mr1-dev-plus-aosp
am: 7a9b7da051

Change-Id: If0cad94709d037fd47a96870d7b4f56622e9131a
2017-09-15 11:46:10 +00:00
Android Build Merger (Role)
0ec902f62d Merge "Merge changes from topic "incl_svc_parsing_fix" am: fee4546fd6 am: 3aa179fabd am: e22de0f23f am: 4df0b1590c" 2017-09-15 11:43:42 +00:00
Jakub Pawlowski
6d71e13630 Merge changes from topic "incl_svc_parsing_fix" am: fee4546fd6 am: 3aa179fabd am: e22de0f23f
am: 4df0b1590c

Change-Id: I5843f0f481071f795f7631dad50e9503d315434e
2017-09-15 11:40:41 +00:00
Android Build Merger (Role)
f19a147252 Merge "Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev am: 2437f9f10c am: 87fcf18ac7" 2017-09-15 11:39:54 +00:00
Andreas Gampe
5c013d495b Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev am: 2437f9f10c
am: 87fcf18ac7

Change-Id: I59e26973945ca6dfa69743e70a141fd93c4465ed
2017-09-15 11:38:02 +00:00
Android Build Merger (Role)
5aa67b6a19 Merge "Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev am: 982ee8e6c3 am: 2d7ef64f47" 2017-09-15 11:37:34 +00:00
Jean-Michel Trivi
c547bd8a9f Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev am: 982ee8e6c3
am: 2d7ef64f47

Change-Id: Ib4bd34bf0915afdd3e6c91c2ad34594e1e373a36
2017-09-15 11:35:33 +00:00
Android Build Merger (Role)
84be14b98e Merge "Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df am: 91fb9b2a16 am: 677b6f5a7b am: 86ca0d2ad4" 2017-09-15 11:35:08 +00:00
Kevin Hufnagle
8f601e7da0 Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df am: 91fb9b2a16 am: 677b6f5a7b
am: 86ca0d2ad4

Change-Id: I9d616a940eac9b25cb1b7b5d630dd6c4401594ae
2017-09-15 11:33:20 +00:00
Android Build Merger (Role)
20158df14d Merge "Merge "Do not animate icons when leaving AoD" into oc-mr1-dev am: 06dc14cabc am: a6e4a02b7e" 2017-09-15 11:32:47 +00:00
Lucas Dupin
c271a0af26 Merge "Do not animate icons when leaving AoD" into oc-mr1-dev am: 06dc14cabc
am: a6e4a02b7e

Change-Id: I70ea8de8a19743859ca1226d7570db5fb1dfd03c
2017-09-15 11:31:03 +00:00
Android Build Merger (Role)
69f5126e60 Merge "Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev am: 33b1e1fe4d am: f42bf5904b" 2017-09-15 11:30:33 +00:00
Matthew Ng
6a5d5f72cb Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev am: 33b1e1fe4d
am: f42bf5904b

Change-Id: I46cffe55224ee5c7c58f794d802db7251e213ee8
2017-09-15 11:28:48 +00:00
Android Build Merger (Role)
9d2f38c35d Merge "Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev am: 03f8b068a9 am: 0acb9df191" 2017-09-15 11:28:21 +00:00
Matthew Ng
b9a74a5745 Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev am: 03f8b068a9
am: 0acb9df191

Change-Id: I27ce836328aad395c391b4ed21846abd6b3fa1bf
2017-09-15 11:26:36 +00:00
Android Build Merger (Role)
923cd00348 Merge "Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev am: 8bba760b4f am: cb68c2559c" 2017-09-15 11:25:59 +00:00
Beverly
a2437d80b5 Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev am: 8bba760b4f
am: cb68c2559c

Change-Id: Id87da8f0e49ef8095a290ba2393c237c6a15cf48
2017-09-15 11:24:14 +00:00
Android Build Merger (Role)
6369fd0990 Merge "Merge "Show big text on AoD" into oc-mr1-dev am: a4996f241f am: c86252c1dc" 2017-09-15 11:23:43 +00:00
Lucas Dupin
ea35a29229 Merge "Show big text on AoD" into oc-mr1-dev am: a4996f241f
am: c86252c1dc

Change-Id: I51d691cd2cec04cd9c0b979a87914e9b4cde49ce
2017-09-15 11:21:33 +00:00
Android Build Merger (Role)
81dc75e8c5 Merge "Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev am: c668bc0d92 am: 5b8476637d" 2017-09-15 11:21:04 +00:00
Alan Viverette
f91ebf5433 Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev am: c668bc0d92
am: 5b8476637d

Change-Id: I5b1063b5b787f814ef78d55f6f5868dfb21c4f9d
2017-09-15 11:19:07 +00:00
Android Build Merger (Role)
0fba1e39a2 Merge "Merge "Change battery icon to the side of bt icon" into oc-mr1-dev am: a57aea0d61 am: d5d9766793" 2017-09-15 11:18:27 +00:00
Lei Yu
c57a9334b6 Merge "Change battery icon to the side of bt icon" into oc-mr1-dev am: a57aea0d61
am: d5d9766793

Change-Id: I8dbc10eff33b8eeee0b5942a53080c7d504ec7d9
2017-09-15 11:14:58 +00:00
Android Build Merger (Role)
85a5609e80 Merge "Merge "Make changes to MBMS Streaming APIs per recommendations" am: 1bbf287859 am: 200d8f6242 am: 4de6420978 am: 9408a33b7e" 2017-09-15 11:14:21 +00:00
Hall Liu
69e4d0561f Merge "Make changes to MBMS Streaming APIs per recommendations" am: 1bbf287859 am: 200d8f6242 am: 4de6420978
am: 9408a33b7e

Change-Id: Ib8a57869ce456e65069c5d63d99f9a80aa7258ca
2017-09-15 11:12:08 +00:00
Android Build Merger (Role)
925c00b49d Merge "Merge "also log user-initiated notification collapse events" into oc-mr1-dev am: e72e8b1528 am: bd4d6dede5" 2017-09-15 11:11:24 +00:00
Chris Wren
fc47cb305c Merge "also log user-initiated notification collapse events" into oc-mr1-dev am: e72e8b1528
am: bd4d6dede5

Change-Id: I29a5f515983215f7600c613c1b11c1baa567d5a3
2017-09-15 11:09:37 +00:00
Android Build Merger (Role)
06b47e2a9c Merge "Merge "Do not fail session.commit on current thread" into oc-mr1-dev am: 304d267066 am: b1e0282aa3 -s ours" 2017-09-15 11:08:44 +00:00
Neil Fuller
1b11590743 Merge "Fix a no-op uninstall being treated as a failure" 2017-09-15 11:06:59 +00:00
Philip P. Moltmann
e16f94d5af Merge "Do not fail session.commit on current thread" into oc-mr1-dev am: 304d267066
am: b1e0282aa3  -s ours

Change-Id: I4adc45868a7c6bba1869ca4b41ef640664ea32ee
2017-09-15 11:06:48 +00:00
TreeHugger Robot
54c6fa09d9 Merge "Removing redundant setTimestamp call" 2017-09-15 09:50:06 +00:00
Android Build Merger (Role)
faadc69d4f Merge "Merge "Merge "Clear calling identity" into oc-mr1-dev am: bc0c5882c6" into oc-mr1-dev-plus-aosp am: 20a5244345" 2017-09-15 07:40:21 +00:00
Julia Reynolds
5a79f3a59d Merge "Merge "Clear calling identity" into oc-mr1-dev am: bc0c5882c6" into oc-mr1-dev-plus-aosp
am: 20a5244345

Change-Id: Ibfd85e6b9d840618f0d9f03d01abe124dd4f746d
2017-09-15 07:38:30 +00:00
Android Build Merger (Role)
76df28b45c Merge "Merge "Bluetooth: fix parameter name in onConnectionUpdated" am: 1f53eb76e4 am: 8ab1ed1789 am: dd71df9d41 am: 618ea49ccf" 2017-09-15 07:37:55 +00:00
Jakub Pawlowski
b6fc50bc39 Merge "Bluetooth: fix parameter name in onConnectionUpdated" am: 1f53eb76e4 am: 8ab1ed1789 am: dd71df9d41
am: 618ea49ccf

Change-Id: Idbd15dd35c85a456ade9cdbd2ee24e78671aceff
2017-09-15 07:35:59 +00:00
Android Build Merger (Role)
693a30f3d7 Merge "Merge "Display volume dialog for longer..." into oc-mr1-dev am: d5ca90a7af am: 379961a33f" 2017-09-15 07:35:17 +00:00
Julia Reynolds
a50fe10aac Merge "Display volume dialog for longer..." into oc-mr1-dev am: d5ca90a7af
am: 379961a33f

Change-Id: Iff68ede11094b517ec2c28ebdb721a9f65dc6c9e
2017-09-15 07:33:16 +00:00
Android Build Merger (Role)
f973a9a574 Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am: d740b2d09a -s ours am: fe5ce91c5f -s ours am: 9fbf077e80 -s ours am: 9eb5f2cd64 -s ours" 2017-09-15 07:32:38 +00:00
Beverly Tai
29c8b112bf Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am: d740b2d09a -s ours am: fe5ce91c5f -s ours am: 9fbf077e80 -s ours
am: 9eb5f2cd64  -s ours

Change-Id: Ib24fadaf19a0f200d0718e2e0aa863de3dd67054
2017-09-15 07:30:37 +00:00
Android Build Merger (Role)
98edf1c0a5 Merge "Merge "Unhide EMBMS download API" into oc-mr1-dev am: 5dab2f297c -s ours am: f82b39073e" 2017-09-15 07:30:02 +00:00
Hall Liu
437a0278de Merge "Unhide EMBMS download API" into oc-mr1-dev am: 5dab2f297c -s ours
am: f82b39073e

Change-Id: Iae2731c3f9ccb4c39ea87e3b3033d9f827439e09
2017-09-15 07:27:12 +00:00