Commit Graph

17413 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
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
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
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
Jeff Sharkey
bd3fa3c72c Merge "Change ClipData.addItem signature" into oc-dev
am: 5b26dac2c3

Change-Id: Iefe0521f3aaa7978e3805aae326b56c426885cef
2017-04-28 18:20:11 +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
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
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
Chris Craik
4226800aa4 Merge "Make SurfaceTexture#isReleased public API" into oc-dev am: 533538c96e
am: 7b026d8aa4

Change-Id: Ia6d5b4179881c20f30a4de3b3e2efde38bfa4c23
2017-04-28 17:32:16 +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
Chen Xu
763ff42a69 Merge "Updated javadocs for sendUssd APIs." 2017-04-28 17:26:13 +00:00
Chen Xu
ac29d38623 Merge "Update VVM API" 2017-04-28 17:25:54 +00:00
Chris Craik
7b026d8aa4 Merge "Make SurfaceTexture#isReleased public API" into oc-dev
am: 533538c96e

Change-Id: I03494906f51f88b3c650e3f0859bcac2148872e7
2017-04-28 17:23:24 +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
Chris Craik
533538c96e Merge "Make SurfaceTexture#isReleased public API" into oc-dev 2017-04-28 17:09:55 +00:00
Chris Wren
4d6b54d2bf expose the UID in the EventLog API
Bug: 32806111
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Change-Id: I16800a33bc6d4d37b3addd71b675fd760bd5d7b8
2017-04-28 11:18:07 -04:00
Pavel Grafov
776158ba4f Merge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev
am: 90357d62e9

Change-Id: I925165817781c3b0f4e37afe8ebcce1ac264d775
2017-04-28 14:23:42 +00:00
Pavel Grafov
90357d62e9 Merge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev 2017-04-28 14:16:04 +00:00
Andrew Scull
17e1b5da53 Expand abbreviation in constant identifier.
The abbreviation is not in common use. Also remove FBE from
documentation as it also isn't used elsewhere.

Test: Build success
Bug: 37621349
Change-Id: Icf19be5e96e71dcd45aa7cac8f58b05b6d77d02b
2017-04-28 11:49:50 +01:00
Felipe Leme
03214b8198 Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev am: 3dfd827574
am: 7c45398614

Change-Id: I5398a804be6f6674a0371fe319ba8789bd72e7f0
2017-04-28 06:55:57 +00:00
Svetoslav Ganov
633463af36 Merge "Implement the rest of autofill importance modes" into oc-dev am: 70c0221813
am: 1c4e06a3fe

Change-Id: Ie8a4a655770cb0175d335cf74cbb73b65a60e19d
2017-04-28 06:49:59 +00:00
Felipe Leme
7c45398614 Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev
am: 3dfd827574

Change-Id: I9e8a9b81c890eb08bb089faaa1c3b3bd9fc9893f
2017-04-28 06:48:47 +00:00
TreeHugger Robot
3dfd827574 Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev 2017-04-28 06:42:22 +00:00
Svetoslav Ganov
1c4e06a3fe Merge "Implement the rest of autofill importance modes" into oc-dev
am: 70c0221813

Change-Id: I5c03a2cde466a87b6f8067838b411319ba907fb2
2017-04-28 06:41:40 +00:00
Svetoslav Ganov
70c0221813 Merge "Implement the rest of autofill importance modes" into oc-dev 2017-04-28 06:30:07 +00:00
Daichi Hirono
2443a091b1 @hide non-Handler variant of SM.openProxyFileDescriptor
Bug: 37749462
Test: Build succeeded
Change-Id: I2e3d0cf9e219353eae4dae384c93d99b9ef60ea9
2017-04-28 14:58:27 +09:00
Felipe Leme
09a70628da Changed HtmlInfo.getAttributes() to return List instead of ArrayList
Fixes: 37747396
Test: CtsAutoFillServiceTestCases pass

Change-Id: Ief53e6d71805f561577b73e57a9d36bc3769862a
2017-04-28 04:56:29 +00:00
Lorenzo Colitti
25c28cc680 Merge "Address ConnectivityManager API comments." into oc-dev am: ce8eae73af
am: 5c34fceb3e

Change-Id: I8f7ec6d4a2ee8c74e015fdff0ef83fe4218b4efd
2017-04-28 04:11:54 +00:00
Lorenzo Colitti
5c34fceb3e Merge "Address ConnectivityManager API comments." into oc-dev
am: ce8eae73af

Change-Id: I7024b4fe23ab12760fb452a59929df886912b104
2017-04-28 04:04:21 +00:00
Phil Weaver
95e44168ec Merge "Rename FingerprintGestureCallback.onGesture" into oc-dev am: cfbe105e4b
am: c8885742db

Change-Id: I651bb7f6a3909b357cc07c015dbe21f5623b7809
2017-04-28 04:04:14 +00:00
Lorenzo Colitti
ce8eae73af Merge "Address ConnectivityManager API comments." into oc-dev 2017-04-28 03:58:16 +00:00