Dianne Hackborn
e322d1253c
Merge "Improve messaging of pre boot apps."
2015-01-30 01:27:21 +00:00
Dianne Hackborn
a92cbad2a9
Improve messaging of pre boot apps.
...
Have the system take care of showing the boot message
as it runs pre boot apps, rather than relying on them
doing this on their own.
Change-Id: Ife6db0691907cf413311dafb4b023e63e8795a79
2015-01-29 17:22:25 -08:00
Jinsuk Kim
1b68ce327a
am 7bf039b6: am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev
...
automerge: a6fc42a
* commit 'a6fc42aec58ab0d2dbb96f37d40e597bc39631fa':
CEC: Discard key event to itself
2015-01-29 22:46:33 +00:00
Jinsuk Kim
a6fc42aec5
am 7bf039b6: am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev
...
* commit '7bf039b67c89ac07a1b90d048bf1e4ff0e121ab8':
CEC: Discard key event to itself
2015-01-29 22:44:51 +00:00
Jinsuk Kim
7bf039b67c
am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev
...
* commit '9c5ccc3684e55e0ce7f2940bd13dfd7acdf85895':
CEC: Discard key event to itself
2015-01-29 22:39:57 +00:00
Jinsuk Kim
f0569c1651
am 1ebbe916: am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev
...
automerge: e7ff01e
* commit 'e7ff01ecc5c0ceda498dd476cb29ee663f1968dc':
CEC: Add CEC device upon receiving <Report Physical Address>
2015-01-29 22:39:52 +00:00
Jinsuk Kim
e7ff01ecc5
am 1ebbe916: am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev
...
* commit '1ebbe9165842707fd575ea61b8158463f93c35be':
CEC: Add CEC device upon receiving <Report Physical Address>
2015-01-29 22:36:55 +00:00
Jinsuk Kim
9c5ccc3684
Merge "CEC: Discard key event to itself" into lmp-mr1-dev
2015-01-29 22:33:43 +00:00
Jinsuk Kim
454fab5219
CEC: Discard key event to itself
...
Should discard keyevents if the target address is the device itself.
Bug: 19188660
Change-Id: Id47d79c996f60c9d90540f28c4b2509976d2f378
2015-01-30 07:28:10 +09:00
Jinsuk Kim
1ebbe91658
am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev
...
* commit '3f923474248e24706e7977a7512b0a35cff835a7':
CEC: Add CEC device upon receiving <Report Physical Address>
2015-01-29 22:25:57 +00:00
Jinsuk Kim
3f92347424
Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev
2015-01-29 22:21:54 +00:00
Jinsuk Kim
031cb522a3
am a6a01787: am 07600116: CEC: Ensure stable AVR connection
...
automerge: b3bae9d
* commit 'b3bae9dc1a649eb326d17c2035c0f567b797edf3':
CEC: Ensure stable AVR connection
2015-01-29 07:18:36 +00:00
Jinsuk Kim
7054f543d6
am f4e4eb54: am 2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low
...
automerge: 6da2c66
* commit '6da2c666d258a0ac3d65b867d7443a3e3f8cded0':
CEC: Stop ARC if hotplug event is asserted low
2015-01-29 07:17:09 +00:00
Jinsuk Kim
46cbf0f474
am 0cbbfb2b: am 7640d989: CEC: Fix a regression bug
...
automerge: 5b972d5
* commit '5b972d58cb9ccbbbc3302655f83b04ddd717c299':
CEC: Fix a regression bug
2015-01-29 07:15:44 +00:00
Jinsuk Kim
c87135946e
am 5e34b6b9: am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
...
automerge: c8ece53
* commit 'c8ece533b2c19001d9ada319c1cf480ba97377d8':
CEC: Let <Active Source> from the active source work
2015-01-29 07:14:40 +00:00
Jinsuk Kim
b3bae9dc1a
am a6a01787: am 07600116: CEC: Ensure stable AVR connection
...
* commit 'a6a01787fb657189202dec096c30b3d2f63197dc':
CEC: Ensure stable AVR connection
2015-01-29 07:01:16 +00:00
Jinsuk Kim
6da2c666d2
am f4e4eb54: am 2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low
...
* commit 'f4e4eb5401135fdc374d83317771ed87d1caeb86':
CEC: Stop ARC if hotplug event is asserted low
2015-01-29 07:01:11 +00:00
Jinsuk Kim
5b972d58cb
am 0cbbfb2b: am 7640d989: CEC: Fix a regression bug
...
* commit '0cbbfb2beab0cf63521e59904db31661a4832531':
CEC: Fix a regression bug
2015-01-29 06:55:26 +00:00
Jinsuk Kim
c8ece533b2
am 5e34b6b9: am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
...
* commit '5e34b6b9af93a50354a31f900455ec24e79c2528':
CEC: Let <Active Source> from the active source work
2015-01-29 06:55:19 +00:00
Jinsuk Kim
a6a01787fb
am 07600116: CEC: Ensure stable AVR connection
...
* commit '07600116b59e2accd1e95b9029c2c9819cd76c5a':
CEC: Ensure stable AVR connection
2015-01-29 06:54:15 +00:00
Jinsuk Kim
f4e4eb5401
am 2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low
...
* commit '2ee0d6f44d7274bb1846cc6ff7a60451539a2b51':
CEC: Stop ARC if hotplug event is asserted low
2015-01-29 06:54:11 +00:00
Jinsuk Kim
07600116b5
CEC: Ensure stable AVR connection
...
Make sure AVR device removal due to hotplug detection failure occur
in a less strict manner - doing it only if the failure is detected
3 times in a row.
Bug: 19171321
Change-Id: I1479663b05cdc957cc52123799c756f6b74f6708
2015-01-29 06:47:34 +00:00
Jinsuk Kim
0cbbfb2bea
am 7640d989: CEC: Fix a regression bug
...
* commit '7640d9895cf8fae7a99a7db5bba0079ba6022621':
CEC: Fix a regression bug
2015-01-29 06:46:43 +00:00
Jinsuk Kim
5e34b6b9af
am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
...
* commit '43b2746bcdfb49aed255ac0f6dd6fb95909dcfc1':
CEC: Let <Active Source> from the active source work
2015-01-29 06:46:39 +00:00
Jinsuk Kim
2ee0d6f44d
CEC: Stop ARC if hotplug event is asserted low
...
Updated to stop ARC as specified in HEAC 2.4 transmission condition.
Bug: 19170947
Change-Id: Ibf797ce3b49f32561ef0c36b6874e7ebe19ed65a
2015-01-29 06:45:02 +00:00
Jinsuk Kim
7640d9895c
CEC: Fix a regression bug
...
The HdmiControlService.getActiveSource() has a regression (exception)
when calling getDeviceInfoByPath since method should be called on
a service thread. Introduced a method that can be invoked safely
from the main thread.
Bug: 19170884
Change-Id: I393161e08c916270faf46147a97076bc573b808f
2015-01-29 06:41:49 +00:00
Jinsuk Kim
7cd4a589af
CEC: Add CEC device upon receiving <Report Physical Address>
...
Help devices be processed sooner when new device detection operation
takes longer than usual.
Bug: 19181472
Change-Id: I96c29081a9c7c9f73ebcd027ed9d18056dc89bf9
2015-01-29 11:20:53 +09:00
Fyodor Kupolov
0e8f037ded
Merge "Added primaryUserOnly attribute for activities"
2015-01-28 22:52:19 +00:00
Jinsuk Kim
c9914a22d8
CEC: Let <Active Source> from the active source work
...
<Active Source> from the device which is already in active
source state is being ignored now, but it should work with an effect
of putting input view foreground in case it is hidden behind
home launcher overlay.
For better user experience, this change lets the command from
the active source takes effect to hide the overlay if present.
Bug: 19171319
Change-Id: I43d2646f2ad470b3636e82ff71ac83cf0031ef6c
2015-01-28 16:37:17 +09:00
Craig Mautner
5d49712960
Merge "Remove TYPE_UNIVERSE_BACKGROUND from system"
2015-01-28 02:35:15 +00:00
Christopher Tate
715437763c
am 0c607b97: am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev
...
automerge: ff1876d
* commit 'ff1876d1fb8dfcaba61d3fc7de296d663a4e160e':
Fix 'always' preferred app assignment
2015-01-28 01:38:08 +00:00
Christopher Tate
ff1876d1fb
am 0c607b97: am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev
...
* commit '0c607b97f068ca486036a501052572e9207c0926':
Fix 'always' preferred app assignment
2015-01-28 01:35:58 +00:00
Christopher Tate
0c607b97f0
am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev
...
* commit 'f37b20e1aa03fe662e7cef8e6aee2ded9ea5e514':
Fix 'always' preferred app assignment
2015-01-28 01:20:44 +00:00
Christopher Tate
f37b20e1aa
Merge "Fix 'always' preferred app assignment" into lmp-mr1-dev
2015-01-28 01:14:12 +00:00
Tim Kilbourn
616c118f8e
am a8a4ce97: am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
...
automerge: 0048355
* commit '00483559b3f5fbdb6bc28ac617fbc0eaea2aa503':
Add a config for whether to start in touch mode.
2015-01-28 00:29:28 +00:00
Craig Mautner
4baf8d9e9e
am 604a9e28: am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
...
automerge: bf6af73
* commit 'bf6af73de6b24e53e9656da75b542d2f8caa77e6':
Defer tap outside stack until multiwindows
2015-01-27 23:43:26 +00:00
Lorenzo Colitti
b805dd3a8e
am b84e0040: am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
...
automerge: 9461526
* commit '94615260a8fc51fc6b9a0407b1caa13849082af5':
Make NetworkMonitor less aggressive on broken networks.
2015-01-27 23:29:02 +00:00
Craig Mautner
165be0c70d
Remove TYPE_UNIVERSE_BACKGROUND from system
...
An experiment that is over and has been occupying space.
Fixes bug 18088522 item #7
Change-Id: Ib0fcaa24243ed9b0581143e1d5114c1fd2b0aa6e
2015-01-27 15:16:58 -08:00
Wale Ogunwale
783f28691e
Merge "Support activities in the same process having different resources."
2015-01-27 22:24:15 +00:00
Craig Mautner
a171ae1bb2
Merge "Precompute FLAG_ACTIVITY_NO_ANIMATION"
2015-01-27 22:15:56 +00:00
Tim Kilbourn
00483559b3
am a8a4ce97: am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
...
* commit 'a8a4ce97b3dd901d047a436943e9f80e0e8be820':
Add a config for whether to start in touch mode.
2015-01-27 22:15:42 +00:00
Craig Mautner
1ab8674be0
Merge "Eliminate groupId and add task to AppWindowToken"
2015-01-27 22:15:19 +00:00
Tim Kilbourn
a8a4ce97b3
am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
...
* commit '597bb6968be56c1b8b0629ba89fec409084cc112':
Add a config for whether to start in touch mode.
2015-01-27 22:09:21 +00:00
Craig Mautner
8f5f7e9245
Precompute FLAG_ACTIVITY_NO_ANIMATION
...
Save lots of passing around of ActivityRecords when all you care
about is the flag.
Fixes bug 18088522 item #14
Change-Id: Ib6d95ef06b44faa1715a196ab710f96ed4517213
2015-01-27 13:56:39 -08:00
Craig Mautner
83162a9027
Eliminate groupId and add task to AppWindowToken
...
Simplifies access by eliminating indirect referencing.
Fixes bug 18088522 item #15 .
Change-Id: I9049192a7f3e1028d60c4f2d4d4a0d4aad590aa4
2015-01-27 13:56:20 -08:00
Christopher Tate
57792912ee
Fix 'always' preferred app assignment
...
In the case when some possible resolutions of a given intent are at
different priorities (typically when they're intended as fallbacks when
no "normal" handler for the intent exists) the check for "is this the
same set of possible handlers that we saw last time?" was broken. We
now ignore resolver priority entirely in that check: match set comparison
should be orthogonal to prioritization within the set, and indeed the
priority is dealt with separately in any event.
Bug 19011225
Change-Id: I3c1658442cc88b1f4a5c5f2fe9f64472799e156c
2015-01-27 13:52:17 -08:00
Tim Kilbourn
9626854543
Add a config for whether to start in touch mode.
...
Bug: 18925810
Change-Id: Ic9b956cde380cffcad7ca229f1669692b1743e6d
2015-01-27 13:51:58 -08:00
Craig Mautner
bf6af73de6
am 604a9e28: am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
...
* commit '604a9e280e8273f6ed1f1a50724c0d510cf09bb0':
Defer tap outside stack until multiwindows
2015-01-27 21:00:29 +00:00
Craig Mautner
604a9e280e
am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
...
* commit '5426e7ae93e0e728e0e12bc98a02c957d464cfe0':
Defer tap outside stack until multiwindows
2015-01-27 20:54:42 +00:00
Craig Mautner
5426e7ae93
Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
2015-01-27 20:48:55 +00:00