Suprabh Shukla
2fa6412a86
Merge "Package installer related changes to javadoc" into oc-dev am: 52312298b6
...
am: a2450bacdc
Change-Id: I7bf7b87bfc5f4eb71b8cc1177375c257e5c79499
2017-04-20 14:37:05 +00:00
Jakub Pawlowski
d911bf886b
Merge "Merge "Expose LE advertiser address for easier PTS tests (1/6)" am: f2e6988350 am: fc99848b96 am: f3732e2fe2" into oc-dev-plus-aosp
...
am: 88522c5f5d
Change-Id: I8a07a4e8a6466d5629d504e900c11d5164ba9490
2017-04-20 13:56:06 +00:00
Ian Lake
dcdbd97caa
Create a valid ActivityOptions Bundle even for default animations am: b759bd3b4a
...
am: d85e60aa46
Change-Id: I4c863de66246d6d9a6c64ea1e428094a15c682c1
2017-04-20 13:39:13 +00:00
Ian Lake
083641c47a
Remove scale up animation for startActivity from RemoteViews am: 95b193fdca
...
am: 594f401e26
Change-Id: Ifd958d94b0032d486e01e1be8d44d1b68ca1c4b7
2017-04-20 13:37:42 +00:00
Chad Brubaker
696ab6b7ff
Merge "Change ANDROID_ID for Instant Apps" into oc-dev am: 904e6cad28
...
am: 97eecf8d09
Change-Id: Ibbea27ef27bfaa43649d0ff86e23f0ffd559d7f6
2017-04-20 13:34:06 +00:00
Jeff Sharkey
3ea7c8b6d5
Merge "Flesh out more API docs." into oc-dev am: 3a427c3bd9
...
am: 750d6d12f6
Change-Id: I3778fa0ead9c23909875f88f7debba1f56c867a0
2017-04-20 13:15:28 +00:00
Eugene Susla
cbe10269b5
Merge "Make javadoc of companion service name more like others" into oc-dev am: 4d95e40bb3
...
am: aaa64afd83
Change-Id: Idbae279855b0851cf53fc1a7e17594a0590acbf3
2017-04-20 12:50:25 +00:00
Jeff Sharkey
fb303617f8
Merge "Some folks like sending null fields." into oc-dev am: 9a1967e157
...
am: 218c2135b6
Change-Id: I56fe999c3edb167aac57284700d3ccbbc5d4f9ea
2017-04-20 12:46:37 +00:00
TreeHugger Robot
e54a1877e9
Merge "Add more explicit documentation for install reason"
2017-04-20 12:05:49 +00:00
TreeHugger Robot
7a7fe4c9d8
Merge "Handle runtime exception in clip data"
2017-04-20 07:48:46 +00:00
Daichi Hirono
3d9f3fccf2
Handle runtime exception in clip data
...
When invoking ContentProvider through binder, ContentProvider may return
any type of RuntimeException. To let ClipData fall back to URI when it
failes to obtain text explanation, the CL add a catch closure for
RuntimeException.
Bug: 37260995
Test: Manually
Change-Id: I54ffbbcb05be3f3ff1ebc1c3dc68c074e6eb9825
2017-04-20 15:05:16 +09:00
Evan Rosky
1d603abc3a
Merge "Improve ViewDebug reporting for focus properties" into oc-dev am: 4ab21012a7
...
am: a5f350fbb6
Change-Id: I70dde5b45f07d4af510e37073e22a9f3679715cc
2017-04-20 00:35:11 +00:00
Abodunrinwa Toki
7013c0d0ff
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev am: ef0512a87a
...
am: a98659942a
Change-Id: Id71eabec30d32c70301aa8f454a35ed97fe39a57
2017-04-20 00:29:23 +00:00
George Mount
d7076453d9
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev am: 681ff5c7d8
...
am: 300a24c282
Change-Id: I29988d21eaaf1b1e49d8f90be921b77b5f3a368d
2017-04-20 00:25:56 +00:00
George Mount
ffb489ec29
Merge "Merge "Adds getLayoutInflater() to return a cached value." into oc-dev am: f3ff7b8207" into oc-dev-plus-aosp
...
am: 5c08716a58
Change-Id: I6ece7583fe6305f08eac7605d171b3d3779f3883
2017-04-20 00:10:42 +00:00
Evan Rosky
8e95d6a9a1
Merge "Merge "Handle edge-case where no focusables exist" into oc-dev am: f4c31bf67b" into oc-dev-plus-aosp
...
am: a5abe8f1d1
Change-Id: Ic5dc4d9ddb8626196ea16638e431869f3fbb5536
2017-04-20 00:02:00 +00:00
Suprabh Shukla
a2450bacdc
Merge "Package installer related changes to javadoc" into oc-dev
...
am: 52312298b6
Change-Id: I3c6b175caef36517ed739622831d080b48aae9ac
2017-04-19 23:44:19 +00:00
Adam Lesinski
6db2ee975e
Merge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev am: 83c9413b75" into oc-dev-plus-aosp
...
am: a79d516e63
Change-Id: Ib158c3a45ec89b7374418c064d7b46cc4ab8f551
2017-04-19 23:34:56 +00:00
TreeHugger Robot
52312298b6
Merge "Package installer related changes to javadoc" into oc-dev
2017-04-19 23:34:27 +00:00
Jiaquan He
31d5f7ee7c
Merge "Opt out default focus highlight for TV." into oc-dev
...
am: 6a08dfab0e
Change-Id: I94e6a4fc0d7ab06fc5fd477c0d0160e061e8b3ae
2017-04-19 23:13:56 +00:00
Sunny Goyal
89106cdbdf
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev am: 7790695bf2
...
am: fa7cc65529
Change-Id: Ic916650a42614c88dca4050078bd854c3546288a
2017-04-19 23:01:03 +00:00
TreeHugger Robot
5f21d7befa
Merge "Merge commit '695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c"
2017-04-19 22:56:55 +00:00
TreeHugger Robot
54639924c3
Merge "Add implementation alternatives for OemLockManager."
2017-04-19 22:53:17 +00:00
TreeHugger Robot
1dcb94632a
Merge "Opt out default focus highlight for TV."
2017-04-19 22:18:57 +00:00
TreeHugger Robot
92dd7193d4
Merge "Pre-merge hide API for a11y service state"
2017-04-19 21:52:07 +00:00
Jakub Pawlowski
83f5d516a1
Merge "Expose LE advertiser address for easier PTS tests (1/6)" am: f2e6988350 am: fc99848b96
...
am: f3732e2fe2
Change-Id: I73bc945099ab07b5c1f29896be6135e574821602
2017-04-19 21:50:42 +00:00
Jakub Pawlowski
f3732e2fe2
Merge "Expose LE advertiser address for easier PTS tests (1/6)" am: f2e6988350
...
am: fc99848b96
Change-Id: Ie3ded1b0237b56bb4c81ad7a51c50b82267bc536
2017-04-19 21:44:50 +00:00
Ian Lake
d85e60aa46
Create a valid ActivityOptions Bundle even for default animations
...
am: b759bd3b4a
Change-Id: Ib9b61f2bf4ac6b6001664ebbc40d115089e75326
2017-04-19 21:39:49 +00:00
Ian Lake
594f401e26
Remove scale up animation for startActivity from RemoteViews
...
am: 95b193fdca
Change-Id: I5c3d5865b2f12be5375503678c7bea2d8d831986
2017-04-19 21:38:43 +00:00
Chad Brubaker
97eecf8d09
Merge "Change ANDROID_ID for Instant Apps" into oc-dev
...
am: 904e6cad28
Change-Id: Ia1f22e10846d1e6ecc2b6830c1d3156267174563
2017-04-19 21:34:14 +00:00
Jakub Pawlowski
4bc4a44100
Expose LE advertiser address for easier PTS tests (1/6)
...
This patchset adds a hidden method getOwnAddress, that lets app with
BLUETOOTH_PRIVILEGED permission to lear their own addreess. This is done
exclusively for PTS tests.
Bug: 35147497
Test: manual
Change-Id: Iaf0f2fe0613de44b8430ac25e691d66a4ad44f8d
2017-04-19 21:32:57 +00:00
Jeff Sharkey
750d6d12f6
Merge "Flesh out more API docs." into oc-dev
...
am: 3a427c3bd9
Change-Id: I2031389cf3de22134af6ca48c0537e7ec3d150bc
2017-04-19 21:22:10 +00:00
Jiaquan He
85cee7ab38
Opt out default focus highlight for TV.
...
Test: Checked that the default focus highlight doesn't show on TV.
Bug: 37160940
Change-Id: Id3719ce1aa602ba6792cc94c9fa034670509cda0
2017-04-19 21:14:05 +00:00
TreeHugger Robot
28602c0921
Merge changes from topic 'chooser' into oc-dev
...
* changes:
Rely on view animations for ResolverActivity
Create a valid ActivityOptions Bundle even for default animations
Remove scale up animation for startActivity from RemoteViews
2017-04-19 21:04:26 +00:00
Robert Greenwalt
2a7fee4e33
Merge commit '695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c
...
Change-Id: I768181b347ac5676f3535d94a26ca9e81178a110
2017-04-19 14:03:30 -07:00
Chad Brubaker
904e6cad28
Merge "Change ANDROID_ID for Instant Apps" into oc-dev
2017-04-19 21:00:55 +00:00
Tomasz Wasilczyk
66519b9083
Merge "Make RadioService actually talking to the HAL."
2017-04-19 20:51:36 +00:00
TreeHugger Robot
3a427c3bd9
Merge "Flesh out more API docs." into oc-dev
2017-04-19 20:31:05 +00:00
Eugene Susla
aaa64afd83
Merge "Make javadoc of companion service name more like others" into oc-dev
...
am: 4d95e40bb3
Change-Id: I93645144f78139c95ca4e8b9bf61efcfb25296bf
2017-04-19 20:26:14 +00:00
Jeff Sharkey
218c2135b6
Merge "Some folks like sending null fields." into oc-dev
...
am: 9a1967e157
Change-Id: I90ea9660add142eb9286791134103f346f155add
2017-04-19 20:19:28 +00:00
TreeHugger Robot
4d95e40bb3
Merge "Make javadoc of companion service name more like others" into oc-dev
2017-04-19 20:15:04 +00:00
Jeff Sharkey
9a1967e157
Merge "Some folks like sending null fields." into oc-dev
2017-04-19 20:11:26 +00:00
Evan Rosky
a5f350fbb6
Merge "Improve ViewDebug reporting for focus properties" into oc-dev
...
am: 4ab21012a7
Change-Id: I8f5fa248a28b495c225d598eb9f5a98b8c5123f9
2017-04-19 19:56:38 +00:00
Evan Rosky
4ab21012a7
Merge "Improve ViewDebug reporting for focus properties" into oc-dev
2017-04-19 19:50:30 +00:00
Abodunrinwa Toki
a98659942a
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
...
am: ef0512a87a
Change-Id: Ibe0a7a52ab7122d720fc95f1dd6d8fe8d45c9a50
2017-04-19 19:25:10 +00:00
TreeHugger Robot
ef0512a87a
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
2017-04-19 19:20:43 +00:00
George Mount
300a24c282
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
...
am: 681ff5c7d8
Change-Id: I97976893f65b5f688f0319e5eaba5610bede73f4
2017-04-19 19:14:08 +00:00
TreeHugger Robot
681ff5c7d8
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
2017-04-19 19:06:09 +00:00
George Mount
defb888aac
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
...
am: f3ff7b8207
Change-Id: I447d517cba4f694896dc9319ba7b93dda4b1d01f
2017-04-19 18:53:02 +00:00
Evan Rosky
fdac44dc74
Merge "Handle edge-case where no focusables exist" into oc-dev
...
am: f4c31bf67b
Change-Id: I463f9cc2852cf085dc278fc080a583828d4311a9
2017-04-19 18:47:10 +00:00