Commit Graph

77899 Commits

Author SHA1 Message Date
Dianne Hackborn
fcab4e793b Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev am: fb5840b0e6
am: 0ef4ea95f2

Change-Id: Ib196133e3affc2a9adc8bb66ffdf7dbf0792d307
2017-04-28 22:52:35 +00:00
Dianne Hackborn
0ef4ea95f2 Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev
am: fb5840b0e6

Change-Id: Ib6855dbaec382426038855ab43d5be6d7dcb8892
2017-04-28 22:44:35 +00:00
Dianne Hackborn
fb5840b0e6 Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev 2017-04-28 22:34:53 +00:00
Jakub Pawlowski
ec92e3e7dd Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898 am: 62fc08f684
am: 9cc225e482

Change-Id: I9a3be0d19c13029aaf3ecdde3608e8fdf246229d
2017-04-28 22:10:23 +00:00
Jakub Pawlowski
9cc225e482 Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898
am: 62fc08f684

Change-Id: I98bf6fc7d8d58f102b1268cb3e6d27fb6fd86b78
2017-04-28 22:02:52 +00:00
Tomasz Wasilczyk
7dda2cb65b Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2 am: 5acbf70872 am: 3329b63b40
am: ffe7134de5

Change-Id: I8697d26ff3f3cd13a5504432e2689d219d8bba1d
2017-04-28 21:56:47 +00:00
Jakub Pawlowski
62fc08f684 Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276
am: 6af9bde898

Change-Id: I20d885ee7f12821885767a13cafac6c3dec4ba2d
2017-04-28 21:55:50 +00:00
Tomasz Wasilczyk
ffe7134de5 Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2 am: 5acbf70872
am: 3329b63b40

Change-Id: I45bf3234ccc66e5bcac071c0931846eed2e27f2b
2017-04-28 21:46:20 +00:00
Jakub Pawlowski
9d4abb5631 Bluetooth: bluetooth.le API fixes
Fix minor spelling problems.
Throw IllegalStateException instead of IllegalArgumentException in
build().

Bug: 37532634
Test: none
Change-Id: I73b6f04aec98f5baffb06a363e2a3f71e8cec3c4
2017-04-28 21:35:53 +00:00
Felipe Leme
e7555f04dc Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev am: c21f723ca2
am: 977cbc6690

Change-Id: Ibc07c8b9b614e5fbfc1fbedd609f45f1a2fe7398
2017-04-28 20:49:56 +00:00
Dianne Hackborn
1be5354aba Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo
targetProcess -> targetProcesses

Test: bit CtsAppTestCases:InstrumentationTest

Change-Id: I859985c689cc588c585cd0ec6e0a20411493a7c0
2017-04-28 13:38:34 -07:00
Felipe Leme
977cbc6690 Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev
am: c21f723ca2

Change-Id: I275df43deb93de8b228484fe164e11227ab95311
2017-04-28 20:37:38 +00:00
Felipe Leme
c21f723ca2 Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev 2017-04-28 20:29:49 +00:00
Tomasz Wasilczyk
3329b63b40 Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2
am: 5acbf70872

Change-Id: I57e6fa0f946f25048da1524f07fa4eb13fdb2f1c
2017-04-28 20:25:43 +00:00
Tomasz Wasilczyk
30a34ec0e2 Merge "Fix equality method implementation in BandConfig class." 2017-04-28 20:09:04 +00:00
Dianne Hackborn
d3439c7ab5 Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev am: 9cd47a8ff2
am: a0f1fb6b06

Change-Id: Id761a81dd6127f2a1bd05f2e392d8867d7e86e1c
2017-04-28 18:56:44 +00:00
Jeff Sharkey
71af5d35d7 Merge "Change ClipData.addItem signature" into oc-dev am: 5b26dac2c3
am: bd3fa3c72c

Change-Id: I475d9eca8667005959c5578548b622ed7460b2b0
2017-04-28 18:42:27 +00:00
Dianne Hackborn
a0f1fb6b06 Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev
am: 9cd47a8ff2

Change-Id: I3b0c2cd18126792c6bd7e3894f8ff7753aecc078
2017-04-28 18:42:20 +00:00
Shane Brennan
1a0e5ac3cc Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev
am: 8bfbb0af21

Change-Id: Iadb42396a450c70049544b967a3220db751158ed
2017-04-28 18:33:03 +00:00
Andrew Scull
5cf5494744 Merge "Expand abbreviation in constant identifier." into oc-dev am: 2c20a0f885
am: 7d32c0bd04

Change-Id: I435db9c38e42cb0d2dbf82441470e45dc37728cc
2017-04-28 18:25:23 +00:00
Shane Brennan
3ea6d1931d Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev
am: 7eec245c62

Change-Id: I5cb8c194e5f6b233720771db8fabb0b7eef3b0b0
2017-04-28 18:22:22 +00:00
Jeff Sharkey
bd3fa3c72c Merge "Change ClipData.addItem signature" into oc-dev
am: 5b26dac2c3

Change-Id: Iefe0521f3aaa7978e3805aae326b56c426885cef
2017-04-28 18:20:11 +00:00
Android Build Merger (Role)
53de9dd517 Merge "Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636 am: 21abf1cd20" 2017-04-28 18:15:56 +00:00
Dianne Hackborn
9cd47a8ff2 Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev 2017-04-28 18:10:39 +00:00
Felipe Leme
37a440fd8b Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE.
Test: CtsAutoFillServiceTestCases pass

Fixes: 37775662

Change-Id: I85c016c3eb84a439371ac707f78b01d9882b75e9
2017-04-28 11:03:57 -07:00
Chris Wren
d8cc90c303 Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636
am: 21abf1cd20

Change-Id: Id1ccf3fa7a50f276003e98cfebee1407e0fa4090
2017-04-28 18:02:57 +00:00
Shane Brennan
8bfbb0af21 Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev 2017-04-28 18:02:46 +00:00
Glenn Kasten
f74d6810c3 Merge "USB audio: increase protection of member fields" 2017-04-28 18:02:35 +00:00
Andrew Scull
7d32c0bd04 Merge "Expand abbreviation in constant identifier." into oc-dev
am: 2c20a0f885

Change-Id: I2556528e6eed48196c622695c7d1e48043b5000e
2017-04-28 18:02:08 +00:00
Shane Brennan
7eec245c62 Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev 2017-04-28 17:56:56 +00:00
Jeff Sharkey
5b26dac2c3 Merge "Change ClipData.addItem signature" into oc-dev 2017-04-28 17:53:14 +00:00
Jeff Sharkey
c80e06ea26 Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev am: 4315c1e3d5
am: 1737e50fa1

Change-Id: I92766efee7b312e9dd09bc7fcac42850f457a5e9
2017-04-28 17:51:04 +00:00
Jeff Sharkey
dd6a433163 Merge "Respond to API council feedback." into oc-dev am: 77cc43e0d2
am: 86e27f65f8

Change-Id: I7933a8ba6858d38423b29a52dfc5f9f65c641faf
2017-04-28 17:48:26 +00:00
Chris Wren
21abf1cd20 Merge "expose the UID in the EventLog API" into oc-dev
am: 8ae5e04636

Change-Id: Id199e23d3024c9b137946e7802ee57e5e85281db
2017-04-28 17:46:02 +00:00
Andrew Scull
2c20a0f885 Merge "Expand abbreviation in constant identifier." into oc-dev 2017-04-28 17:42:00 +00:00
Jeff Sharkey
1737e50fa1 Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev
am: 4315c1e3d5

Change-Id: I8ec2d24a8b6bda9641bbb627e69521914240942f
2017-04-28 17:38:33 +00:00
TreeHugger Robot
8ae5e04636 Merge "expose the UID in the EventLog API" into oc-dev 2017-04-28 17:28:05 +00:00
Jeff Sharkey
86e27f65f8 Merge "Respond to API council feedback." into oc-dev
am: 77cc43e0d2

Change-Id: I0c2b86d34cfd2b2f5b94bc693657b40ecbd764fe
2017-04-28 17:27:53 +00:00
Jeff Hao
d4f657a1b1 Merge "Prepend shared libraries in their original order." 2017-04-28 17:27:06 +00:00
Evan Rosky
b2e1fec142 Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev am: 7666d6f967
am: adcc61d65f

Change-Id: I91829dceceaf3d2a273f43d9f1d7732cd30b8ff4
2017-04-28 17:19:38 +00:00
Evan Rosky
adcc61d65f Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev
am: 7666d6f967

Change-Id: Idc3a8f95bea47bad543d90e9ad18c606255e55ae
2017-04-28 17:13:23 +00:00
Jeff Sharkey
4315c1e3d5 Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev 2017-04-28 17:10:26 +00:00
TreeHugger Robot
77cc43e0d2 Merge "Respond to API council feedback." into oc-dev 2017-04-28 17:10:16 +00:00
Evan Rosky
7666d6f967 Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev 2017-04-28 17:05:46 +00:00
Pavel Grafov
e2fe7e5e1c Merge "Clarify DISALLOW_BLUETOOTH_SHARING javadoc." 2017-04-28 16:30:24 +00:00
Glenn Kasten
20137dc148 USB audio: increase protection of member fields
Replace public by private or package access in field declarations,
and add getters and setters as needed.

Test: compiles OK
Change-Id: Ief3fffb6a21d2e4d05153839f444617ea5e70846
2017-04-28 09:13:14 -07:00
Felipe Leme
02adf09e5b Merge "Improved Autofill logging." into oc-dev am: 2d5c0d89e5
am: eb9a99c3d4

Change-Id: Iefa99c2578934ba959d075e5b620d9cc81df668c
2017-04-28 16:02:56 +00:00
Felipe Leme
eb9a99c3d4 Merge "Improved Autofill logging." into oc-dev
am: 2d5c0d89e5

Change-Id: I222ecf081d1d841350191fcfe36aa457fdbeb305
2017-04-28 15:55:58 +00:00
TreeHugger Robot
2d5c0d89e5 Merge "Improved Autofill logging." into oc-dev 2017-04-28 15:50:29 +00:00
Tomasz Wasilczyk
dd767065fe Fix equality method implementation in BandConfig class.
Test: instrumentation (in master branch)
Bug: b/36863239
Change-Id: I2f3b68ba3fac75b849ee99dc06d0a13478168b7e
2017-04-28 08:19:34 -07:00