4942 Commits

Author SHA1 Message Date
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
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
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
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
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
Craig Mautner
8995e140ad Merge "Add reason string for bringing stack to front" into lmp-mr1-dev 2015-01-26 20:05:45 +00:00
Craig Mautner
299f960e5e Add reason string for bringing stack to front
Additional debug and useful information.
Also removed am_resume_activity verbosity and refactored method to
eliminate unused parameter.

For bug 17721767.

Change-Id: Ie1c0652a38a0c6ae6db27a52a9e5da29e252e300
2015-01-26 10:57:11 -08:00
Lorenzo Colitti
351bfad339 Make NetworkMonitor less aggressive on broken networks.
1. Retry validation 3 times instead of 10.

Reducing the number of retries speeds up dead network detection
and saves battery on networks that are don't have Internet access
(or block our connectivity checks).

Retrying 10 times is overkill. Each attempt sends 5-10 DNS
requests, waits 10 seconds to transfer only 3 or 4 packets, and
can last up to tens of seconds. Also, in MR1 we now retry every
10 minutes.

2. Make periodic revalidation only try once.

When validating periodically to see if a non-working connection
is working again, only make one attempt every 10 minutes, not
three.

3. Rename "retries" to "attempts" to make things a bit clearer.

Bug: 18922569
Bug: 18869302
Change-Id: I5f70b420c4f1bac0c33bb9ab6afb322902cdac4b
2015-01-26 17:30:22 +09:00
Lorenzo Colitti
df59053588 Only try to fetch time from NTP if there is a network connection.
Bug: 19046107
Change-Id: Iff647ee33fe0eb9b530d7baad636d32b386e4fa7
2015-01-26 15:24:07 +09:00
Jinsuk Kim
ca1384dc5a am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev
* commit '56c119abde951146951e3887796eb64ee05d25d3':
  CEC: Handles initiation of press-and-hold correctly
2015-01-23 21:16:48 +00:00
Jinsuk Kim
56c119abde Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 2015-01-23 21:10:38 +00:00
Jinsuk Kim
c4228a7281 CEC: Handles initiation of press-and-hold correctly
Previously the time gap between the first and the second key event
for repeated keys(press-and-hold) can be bigger than the threshold,
which violates CEC spec. This CL rectifies it by managing its own
state rather than relying on Android key handler.

Bug: 19117830

Change-Id: Iedfa48f9ab826252e8616d1c3b7491e8b8333c81
2015-01-23 18:20:20 +09:00
Jinsuk Kim
9ae7d4975c am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
* commit '76cf035513d843c66d2fafe85b6a37c4c19b9223':
  CEC: Add logic to return to internal source
2015-01-23 06:56:24 +00:00
Jinsuk Kim
76cf035513 Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 2015-01-23 06:51:58 +00:00
Craig Mautner
5cb31f2179 Merge "Even more debug for bug 17721767." into lmp-mr1-dev
automerge: dbabf37

* commit 'dbabf37fd3a6b70be5cf9639f11656e12601154d':
  Even more debug for bug 17721767.
2015-01-22 23:24:11 +00:00
Craig Mautner
dbabf37fd3 Merge "Even more debug for bug 17721767." into lmp-mr1-dev 2015-01-22 23:17:47 +00:00
Craig Mautner
de313753d0 Even more debug for bug 17721767.
This time adding events for stack movement and focus change.

Change-Id: Icdff9763ac2daf85c615992fa2c8e418e907908c
2015-01-22 14:28:03 -08:00
Jinsuk Kim
cb8661c08f CEC: Add logic to return to internal source
This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.

Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.

Bug: 19008579

Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48
2015-01-22 16:58:26 +09:00
Erik Kline
4f3615036d Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
automerge: 147cf4b

* commit '147cf4b8c4345f2d086251313583888356317d2d':
  Log interface name and uid when filtering a blocked network.
2015-01-22 07:10:58 +00:00
Erik Kline
147cf4b8c4 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 2015-01-22 07:07:36 +00:00
Jinsuk Kim
c988e15e1f Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev
automerge: 7de1ed9

* commit '7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d':
  CEC: Let playback device switch TV input after bootup
2015-01-22 02:21:59 +00:00
Jinsuk Kim
7de1ed9d63 Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev 2015-01-22 02:19:37 +00:00
Wonsik Kim
67add1d262 Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev
automerge: 0313a0e

* commit '0313a0e9b786f9d5d83113d574bcc8f27f2206dc':
  TIF: TvInputHardwareManager puts multiple sink ports into audio patch
2015-01-22 01:54:49 +00:00
Wonsik Kim
0313a0e9b7 Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev 2015-01-22 01:52:08 +00:00
Craig Mautner
d56352dbcb am c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
* commit 'c79a8ea0c4e1cb30c667f84276820f7e14bfb3b1':
  Resume home activity can skip resume and cause ANR. DO NOT MERGE
2015-01-22 00:29:56 +00:00
Craig Mautner
c79a8ea0c4 Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev 2015-01-22 00:25:19 +00:00
Robert Greenwalt
9e7cb40ddf am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev
* commit 'ab42bbb9024d10579a913049147f6fc25b57df83':
  Fix legacy request removal.
2015-01-21 23:56:07 +00:00
Robert Greenwalt
0343e1a704 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
  Rerun entitlementcheck on sim change.
2015-01-21 23:56:02 +00:00
Robert Greenwalt
ab42bbb902 Merge "Fix legacy request removal." into lmp-mr1-dev 2015-01-21 23:50:27 +00:00
Robert Greenwalt
7ca16ff8c6 Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 2015-01-21 23:49:12 +00:00
Jinsuk Kim
8913a0e1e8 CEC: Let playback device switch TV input after bootup
Saves users from having to switch TV input manually to a playback device
after it boots up.

Bug: 19046176
Change-Id: I0a4fae1036138ce2e19cbac9fdd9dda41bdcf89f
2015-01-21 22:47:10 +00:00
louis_chang
b4d43538d7 Resume home activity can skip resume and cause ANR. DO NOT MERGE
Symptom:
In some scenario, there might have two home tasks
in the home stack. If the top home task was finishing
and expected to return to home stack, no activity
will resume.

Root Cause:
Unable to perform resumeHomeStackTask() because the
resumeTopActivityLocked() has been prevented to invoke
recursively.

Solution:
Just resume the next activity if already in home stack

Change-Id: I24ecbcac6cee4ddbd90cdd27c4f4915cffb9b354
2015-01-21 21:38:31 +00:00
Dianne Hackborn
5346a21bad Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev
automerge: 2132695

* commit '213269599bdec3d83d3d811f5e8f62b9fd8d245c':
  Work on issue #18201239: ANRs in com.google.process.gapps:
2015-01-21 18:47:11 +00:00
Dianne Hackborn
213269599b Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 2015-01-21 18:41:38 +00:00
Dianne Hackborn
455625e298 Work on issue #18201239: ANRs in com.google.process.gapps:
Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService

Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.

Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
2015-01-21 09:55:13 -08:00
Erik Kline
338317edd5 Log interface name and uid when filtering a blocked network.
Bug: 18707263
Change-Id: Ide9a1670a97eae787b785933de0c80750c2b5601
2015-01-21 12:02:11 +09:00
Jinsuk Kim
f8d2f3284f am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev
* commit 'f23829d64ff6fdae6f8b1d2b0fbe3f2715b313d4':
  CEC: Switch active input after routing control
2015-01-21 02:16:37 +00:00
Jinsuk Kim
f23829d64f Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 2015-01-21 02:10:54 +00:00
Jinsuk Kim
337ce19bef CEC: Switch active input after routing control
Makes sure the previous HDMI input gets switched to upon receiving
<Inactive Source> from the current active source device.

Bug: 18986597
Change-Id: I7120e81d75b5fd4cafd4b483e9b232b96e50f597
2015-01-21 09:38:33 +09:00
Dianne Hackborn
8781dbf3df Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev
automerge: 66f8d9b

* commit '66f8d9bb693d5e410ac6f6ba3029cf6c7dc2f104':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
2015-01-21 00:27:47 +00:00
Dianne Hackborn
66f8d9bb69 Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev 2015-01-21 00:23:53 +00:00
Craig Mautner
f1eb1cdc65 am d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev
* commit 'd22c8d9961340ba1b7d7601d1c99e2557b6a9f0b':
  Revert "Remove debugging and skip InputMethod windows"
2015-01-20 23:12:33 +00:00