summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-06-15merge in nyc-release history after reset to nyc-devandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r3android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-cts-releasenougat-bugfix-releaseThe Android Automerger
2016-06-14Revert "Fingerprint: Add an API to support throttling."nougat-devJim Miller
This reverts commit 7e9204a954deeeb6c2fad6752b87af0638ef0d5d. Fixes bug 29248095 Change-Id: I60ce4dd96affbc263a14921cbdda59df7e7a65f4
2016-06-14Use UINT16 for GATT attribute id fieldJakub Pawlowski
Id field is equal to attribute handle, so it must be 16bits. Otherwise only piece of GATT database can be used. Bug: 29253825 Change-Id: I75c0c993a987bf0a48e910fa3c0f41f9d876bec6
2016-05-26merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-05-25Merge "Ensure we get a default sample rate for "query" cases in ↵Paul Mclean
open_input_device()." into nyc-dev
2016-05-25Ensure we get a default sample rate for "query" cases in open_input_device().Paul McLean
Bug: 28474561 Change-Id: I2946dda95ab47bd38a582f49e566541bc4e20bbf
2016-05-25Merge "Lock input and output sample rates" into nyc-devPaul Mclean
2016-05-25Lock input and output sample ratesPaul McLean
Bug: 28474561 Change-Id: I551d346aea9c4f36b51a9c1a1c557c5e2757334b
2016-05-25merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-05-24Add guest mode functionality (1/3) am: 4e10135ef4 am: 6e98ba09a2 am: ↵Ajay Panicker
4137555a77 am: 9ed5e051f0 -s ours am: 07c1c4dd8d am: d22d07f82b am: 9de98af266 am: 2fc4aebcdd * commit '2fc4aebcdd48084125645340e5baeefc46f4c6a6': Add guest mode functionality (1/3) Change-Id: I33613e8d89b198dbda2bc37bcbf25e355bedb201
2016-05-24Add guest mode functionality (1/3) am: 4048610354 am: 1b89c8c0dd -s ours ↵Ajay Panicker
am: 4c7e952d48 am: 45c6e0013a * commit '45c6e0013ab131b045ac9d42aed883789153e3ae': Add guest mode functionality (1/3) Change-Id: Id1fc54275a9ed8c8126a52b2b885496c6a279992
2016-05-24Add guest mode functionality (1/3) am: 4e10135ef4 am: 6e98ba09a2 am: ↵Ajay Panicker
4137555a77 am: 9ed5e051f0 -s ours am: 07c1c4dd8d am: d22d07f82b am: 9de98af266 * commit '9de98af266ab4b15a539950da67dfa3b1cfaadf8': Add guest mode functionality (1/3) Change-Id: I582f40a1780d529f9ec91786470743bb7c74578b
2016-05-24Add guest mode functionality (1/3) am: 4048610354 am: 1b89c8c0dd -s oursAjay Panicker
am: 4c7e952d48 * commit '4c7e952d48bba7876ddbc3c2aff0b2b79c12c86e': Add guest mode functionality (1/3) Change-Id: Id2aceac8aa59a1c49261428a0b0c7d2d0aaada1a
2016-05-24Add guest mode functionality (1/3) am: 4e10135ef4 am: 6e98ba09a2 am: ↵Ajay Panicker
4137555a77 am: 9ed5e051f0 -s ours am: 07c1c4dd8d am: d22d07f82b * commit 'd22d07f82b2f6a30fba60b32463ac3d16010ad60': Add guest mode functionality (1/3) Change-Id: Ibc2e00534f707c70977ff64207fae05ba43addd2
2016-05-24Add guest mode functionality (1/3) am: 4048610354Ajay Panicker
am: 1b89c8c0dd -s ours * commit '1b89c8c0ddf76ce8c6ff96cc7997f87e166b7ac6': Add guest mode functionality (1/3) Change-Id: I69d69431c767ecd615839f97cef1faaa912f2f50
2016-05-24Add guest mode functionality (1/3) am: 4e10135ef4 am: 6e98ba09a2 am: ↵Ajay Panicker
4137555a77 am: 9ed5e051f0 -s ours am: 07c1c4dd8d * commit '07c1c4dd8da9eb7b6bd46ff83c831e7ad9383cd2': Add guest mode functionality (1/3) Change-Id: I4be5d4c2d2095ce288bc4b80970359265a714b4d
2016-05-24Add guest mode functionality (1/3) am: 4e10135ef4 am: 6e98ba09a2 am: 4137555a77Ajay Panicker
am: 9ed5e051f0 -s ours * commit '9ed5e051f0b633308bb66acf4660e89eb52037c2': Add guest mode functionality (1/3) Change-Id: I252ab37ea484800f920ad224b85e2cad9ed28032
2016-05-24Add guest mode functionality (1/3) am: 4e10135ef4 am: 6e98ba09a2Ajay Panicker
am: 4137555a77 * commit '4137555a77c5fd68eedbf63a0a351599edcbbcac': Add guest mode functionality (1/3) Change-Id: I5cc9b7d8082908d2c64012b63e5183365366ed1e
2016-05-24Add guest mode functionality (1/3) am: 4e10135ef4Ajay Panicker
am: 6e98ba09a2 * commit '6e98ba09a2722b8aa9242797c379016e0bb42de7': Add guest mode functionality (1/3) Change-Id: I3dd89a69243cdacb5b8ebe5227a2b718b17968d4
2016-05-24Add guest mode functionality (1/3)Ajay Panicker
am: 4048610354 * commit '4048610354bc6fff0eea733d46df502a29487b9f': Add guest mode functionality (1/3) Change-Id: Ic2bd8be69bbe1dc2a247e1d152e95d158ad3161c
2016-05-24Add guest mode functionality (1/3)Ajay Panicker
am: 4e10135ef4 * commit '4e10135ef499073711944860ccf9a7c43b8bf6ac': Add guest mode functionality (1/3) Change-Id: I8942fea871b1c1721d0644a5eedf9fdd6a6bc0eb
2016-05-22Add guest mode functionality (1/3)Ajay Panicker
Add a flag to enable() to start Bluetooth in restricted mode. In restricted mode, all devices that are paired during restricted mode are deleted upon leaving restricted mode. Right now restricted mode is only entered while a guest user is active Bug: 27410683 Change-Id: I994a2933fd60301927ff2df65da634f81d4c9428
2016-05-22merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-05-20HWC2: Add format to VD create, surface damageDan Stoza
Adds a format in/out parameter to createVirtualDisplay so that the device knows what format the consumer prefers, but can override it if it is not capable of rendering to it. Also adds a surface damage region to the setClientTarget call. Bug: 22767098 Change-Id: I58801aed2d95fd7dbf63db2e303bc3079caaba25
2016-05-19Merge "Glonass ID Revision" into nyc-devWyatt Riley
2016-05-19merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-05-18Glonass ID RevisionWyatt Riley
Comments only Change-Id: Ie61367fcdb20fb1f580aa739c98e05bfbb2f40ca
2016-05-17Remove gralloc1 headerDan Stoza
Removes the gralloc1 header until such time as framework support can be added. Bug: 28401203 Change-Id: I7fbaf60d5b1c3c2267cf8d2216e94736c70bf8bb
2016-05-05merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-05-04Merge "Update VR HAL docs." into nyc-devRuben Brunk
2016-05-04Merge "HWC2: Clarify null client target handle" into nyc-devTreeHugger Robot
2016-05-04Add guest mode functionality (1/3)Ajay Panicker
Add a flag to enable() to start Bluetooth in restricted mode. In restricted mode, all devices that are paired during restricted mode are deleted upon leaving restricted mode. Right now restricted mode is only entered while a guest user is active Bug: 27410683 Change-Id: I994a2933fd60301927ff2df65da634f81d4c9428
2016-05-04HWC2: Clarify null client target handleDan Stoza
Documentation-only change that clarifies that in the case where the client isn't compositing any of the layers, the buffer handle provided to setClientTarget may be null, and that this should not be treated as an error by the device. Bug: 28569722 Change-Id: Ia5825eb0a80c7f838894642654db7d7be14a3b6b
2016-05-04Update VR HAL docs.Ruben Brunk
Bug: 28526281 Change-Id: If9673af47962f6fadd10f8a622e9587245f7ffb6
2016-05-03Revert "tv_input: add signal detection flag to stream config"Dongwon Kang
This reverts commit d15399e13d219c26d68cfe65a24eaf8788503f6b. Change-Id: I02ef4ac7b796f3380616c08a42ecc4ad2d5e3474
2016-05-03merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-05-02merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-05-02merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-05-02Merge "nanohub HAL: define magic value for nanoapp" into nyc-devAlexey Polyudov
2016-05-01merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-04-29Merge "Add definition of an event send from a nano app to host." into nyc-devDaniel Estrada Alva
2016-04-28Add definition of an event send from a nano app to host.destradaa
Bug: 28273520 Change-Id: I4d5f7a6a844d542078a69155f166b0a7b0bc814c
2016-04-28nanohub HAL: define magic value for nanoappAlexey Polyudov
Bug: 28265099 Change-Id: Ifd8082aa7a72af9a02e9ad6bc66100e465f46ec0 Signed-off-by: Alexey Polyudov <apolyudov@google.com>
2016-04-28merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-04-27Merge "power: Platform-level low power state stats" into nyc-devBadhri Jagan Sridharan
2016-04-27power: Platform-level low power state statsBadhri Jagan Sridharan
Add interface to export export platform-level power stats to BatteryStatsService. Bug: 26564574 Change-Id: Ibd452c46d91b0055bc5aa0e6b2cc8ee7b428ea31
2016-04-27DO NOT MERGE ANYWHERE Add new foreground load power hint. am: ae4fc8f -s oursBryce Lee
am: ab93a6d -s ours * commit 'ab93a6d6b681bf2bdcbd4cf4d20bb0c6412978d1': DO NOT MERGE ANYWHERE Add new foreground load power hint. Change-Id: I3c2200326c2878609403f3f92801aedca6391b33
2016-04-27DO NOT MERGE ANYWHERE Add new foreground load power hint.Bryce Lee
am: ae4fc8f -s ours * commit 'ae4fc8f4d4877c31d8d1925184427390d539c637': DO NOT MERGE ANYWHERE Add new foreground load power hint. Change-Id: I210ccf49820e3a10bed2ded67a7d92b36d10c9d0
2016-04-27Merge "[sensor] clarify definition of the uuid field" into nyc-devPeng Xu
2016-04-27DO NOT MERGE ANYWHERE Add new foreground load power hint.Bryce Lee
This power hint allows the underlying hardware to be aware when an intensive foreground activity is active, allowing for resources to be adjusted accordingly. Bug: 26987295 Change-Id: I834d2227c7f86e9426d0fab20910d565125bd184