Christopher Tate
7041420d9b
am 9b36d111: am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev
...
* commit '9b36d1117a2f0eb0402b0f9dda8bc5d94b110061':
Don't run full-data backups when backup is disabled
2015-01-30 00:17:19 +00:00
Christopher Tate
9b36d1117a
am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev
...
* commit 'b71ac193087dc768a25cebb0f06f0ccbb66e8ba9':
Don't run full-data backups when backup is disabled
2015-01-30 00:11:59 +00:00
Christopher Tate
b71ac19308
Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev
2015-01-30 00:06:18 +00:00
Christopher Tate
e77c12ba37
Don't run full-data backups when backup is disabled
...
If the scheduled job fires but backup is disabled or the device is
not yet provisioned (i.e. has not yet finished going through setup),
bow out gracefully without running any backup operations. Also, even
if a backup is directly invoked (e.g. via adb), verify again right
before we start collecting app data, and abandon the operation in
that path as well.
(This is redundant; having only the latter test would suffice, but
this lets us distinguish in the logging more easily.)
Finally, make sure that if we were waiting on setup before permitting
backup operations to begin, that we startup the full-data scheduling
as well as the [separate] key/value scheduling.
Bug 19197062
Change-Id: I3d8fb650c50f946d8ed7ac7170df361c707f2528
2015-01-29 15:47:43 -08: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
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
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
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
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
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
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
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
Craig Mautner
baf6bef001
Defer tap outside stack until multiwindows
...
Taps outside of the stack boundary were causing the current app to
lose focus. This led to timeouts waiting for the app to respond.
Disabling the tap recognition keeps the focus from changing. It will
be reenabled for multiwindows.
Fixes bug 17721767.
Change-Id: Iad854b19979390e73b97239e489ad7ef82e03d47
2015-01-27 11:44:59 -08:00
Lorenzo Colitti
94615260a8
am b84e0040: am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
...
* commit 'b84e0040d8c2f44790e7ceeda8cddf3524f33d29':
Make NetworkMonitor less aggressive on broken networks.
2015-01-27 11:55:51 +00:00
Lorenzo Colitti
b84e0040d8
am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
...
* commit '525588c593794cf52d93665e9cf55f06abd3d1b7':
Make NetworkMonitor less aggressive on broken networks.
2015-01-27 11:46:31 +00:00
Lorenzo Colitti
525588c593
Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev
2015-01-27 11:41:10 +00:00
Craig Mautner
8e72aa8a41
am 603d30b1: Merge "Stop logging service starts and stops." into lmp-mr1-dev automerge: 49880ee
...
* commit '603d30b1cfe7be61e4e352b58342b86e5cfb7612':
Stop logging service starts and stops.
2015-01-27 01:47:16 +00:00
Wonsik Kim
ae3e5e82b6
am b3c06e49: Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev automerge: cd8a80c
...
* commit 'b3c06e49c8e286f8960be65c3e96934ea2ab8b49':
TIF: fix loud volume after input switch when volume is 0
2015-01-27 01:47:11 +00:00
Craig Mautner
603d30b1cf
Merge "Stop logging service starts and stops." into lmp-mr1-dev
...
automerge: 49880ee
* commit '49880eeb00c71a2287db65717fd8a7ff5e87279d':
Stop logging service starts and stops.
2015-01-27 01:41:15 +00:00
Wonsik Kim
b3c06e49c8
Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev
...
automerge: cd8a80c
* commit 'cd8a80c7077ee1ef14888e1a735b20c7119c1aac':
TIF: fix loud volume after input switch when volume is 0
2015-01-27 01:39:56 +00:00
Craig Mautner
49880eeb00
Merge "Stop logging service starts and stops." into lmp-mr1-dev
2015-01-27 01:15:35 +00:00
Wonsik Kim
485e7e13f4
TIF: fix loud volume after input switch when volume is 0
...
Bug: 19134440
Change-Id: I6291f299a27315e79b505ea36bf96c79437e6b53
2015-01-27 01:06:37 +00:00
Craig Mautner
9851d03819
Stop logging service starts and stops.
...
Completes work on bug 18201239.
Change-Id: I80686351ac91e48bf113976a000b351b423d8dd2
2015-01-26 14:33:39 -08:00
Lorenzo Colitti
583dec84d9
am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
...
* commit '3d992507a09b4d32c1e961a99d77027db050f01b':
Only try to fetch time from NTP if there is a network connection.
2015-01-26 22:22:27 +00:00
Lorenzo Colitti
3d992507a0
am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
...
* commit '09dff843b8ed402564c4c89d7e1cabceb715e458':
Only try to fetch time from NTP if there is a network connection.
2015-01-26 22:16:03 +00:00
Lorenzo Colitti
09dff843b8
Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
2015-01-26 22:08:19 +00:00
Craig Mautner
2322ea558e
am 8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev
...
automerge: afc6d33
* commit 'afc6d332790166943302f051d32ec0874d9280aa':
Add reason string for bringing stack to front
2015-01-26 20:11:58 +00:00
Craig Mautner
afc6d33279
am 8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev
...
* commit '8995e140ad557c9f3f4667becbaaf0ba4c667638':
Add reason string for bringing stack to front
2015-01-26 20:09:48 +00:00