3620 Commits

Author SHA1 Message Date
Lorenzo Colitti
34eae0f4ce am 71915080: am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
* commit '7191508022f6f5babcd1aa789f973d365b8fa1c5':
  Block address families with routes, not NetworkAgent side channel
2014-09-24 03:29:10 +00:00
Dianne Hackborn
b5ae7858ee am fa3089f8: am 0d18d08d: Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev
* commit 'fa3089f8e7bd35890518021f4b51190e60c429fb':
  Work on issue #17628623: Need to update default preferred activities for YouTube
2014-09-24 03:28:05 +00:00
Matthew Williams
12096490d9 am a58a31ac: am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev
* commit 'a58a31acbbd2bb4a971cb82530495051dcf1d7d8':
  Fix lock ordering in JobScheduler
2014-09-24 03:28:01 +00:00
Lorenzo Colitti
e034716628 Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev 2014-09-24 01:21:06 +00:00
Dianne Hackborn
58817f502c Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev 2014-09-24 01:00:03 +00:00
Matthew Williams
8cfd9e6c11 Merge "Fix lock ordering in JobScheduler" into lmp-dev 2014-09-24 00:58:55 +00:00
Matthew Williams
48a30db75d Fix lock ordering in JobScheduler
BUG: 17625667
Two part clean-up.
1) Don't try to lock in onControllerStateChanged. Do it in the handleMessage
instead where the rest of the locking is. This is sufficient to fix this bug.
2) The other side of the deadlock came b/c we lock when cancelling and calling
stopTrackingJob. Controllers handle their own locking so this isn't
necessary. B/c of a potential race from the controller side, added an explicit
check for the JSS to only run an expired job if it still exists.

Change-Id: Iaeebbc19437eb5b73e3ced3168f1fc13e564a4be
2014-09-23 17:34:46 -07:00
Dianne Hackborn
eeb2c7e712 Work on issue #17628623: Need to update default preferred activities for YouTube
Improve the warning logs when setting up preferred activities
to help identify when there are issues and what they are.  Also
improve the algorithm a little to still apply permissions when
resetting them and there are additional third party apps, as long
as the additional app is something like another browser and the
preferred activity being set is more specific (has a better match).

And add an example of using manifest-based preferred activities
in to ActivityTest -- and yes it DOES work! :p

Change-Id: I1ff39e03a5df6526206e0c3882085396b355d814
2014-09-23 16:45:39 -07:00
Jeff Brown
0dc92f3a43 am e43684a6: am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev
* commit 'e43684a64c35e3a627037a671d351bda12e5eb0a':
  Move setting the display state out of the critical section.
2014-09-23 21:15:27 +00:00
Dianne Hackborn
588016f72e am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev
* commit 'c39f4fc2c4110170deec0deaae104ae474022c59':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
2014-09-23 21:15:20 +00:00
Jeff Brown
6800e1b921 Merge "Move setting the display state out of the critical section." into lmp-dev 2014-09-23 21:02:43 +00:00
Dianne Hackborn
d0e0154c1f Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 2014-09-23 20:55:05 +00:00
John Spurlock
7ecc4852d6 am 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev
* commit '1cabe53d61c17743800df7d58df5c5bd7ea6685f':
  Remove redundant wifi-display notification.
2014-09-23 20:27:24 +00:00
Jeff Brown
e75926d6dc Move setting the display state out of the critical section.
Setting the display power state currently happens while holding the
display manager lock.  This change moves it out of the lock to
ensure other services don't get stuck for several hundred
milliseconds.

Unfortunately, surface flinger ends up stalled a little later
so this only solves part of the problem.

Bug: 17623774
Change-Id: I201137c5e7f82c776f28a436845fcf3191fd0ca5
2014-09-23 13:12:00 -07:00
John Spurlock
def101127a Merge "Remove redundant wifi-display notification." into lmp-dev 2014-09-23 20:08:13 +00:00
Dianne Hackborn
c36662b042 am 559e3516: am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev
* commit '559e3516e98c94343b551394b7f6871be5161b1d':
  Fix issue #17307700: retarget a relinquished task is not working
2014-09-23 20:04:35 +00:00
John Spurlock
03365ccc39 Remove redundant wifi-display notification.
Since all devices now appear in quick settings, remove the
framework notification and obsolete artifacts.

Bug:17607193
Change-Id: If952b826d79c77068285373c6b44a430f78c20b1
2014-09-23 15:51:11 -04:00
Dianne Hackborn
193b27cd3d Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev 2014-09-23 19:50:00 +00:00
Tsuwei Chen
9a031f93b9 am 935559c6: am 28cec256: Merge "Better detection for SIM information readyness. 1) listen to SUBINFO broadcast intent to better capture SIM info update. 2) notify HAL about SUPL server/host everytime they get set." into lmp-dev
* commit '935559c69b6bdf30b236306b0ddeb835938a6efb':
  Better detection for SIM information readyness. 1) listen to SUBINFO broadcast intent to better capture SIM info update. 2) notify HAL about SUPL server/host everytime they get set.
2014-09-23 19:08:44 +00:00
Tsuwei Chen
23e79fcef9 Merge "Better detection for SIM information readyness. 1) listen to SUBINFO broadcast intent to better capture SIM info update. 2) notify HAL about SUPL server/host everytime they get set." into lmp-dev 2014-09-23 18:54:03 +00:00
Jorim Jaggi
5facc2f829 am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev
* commit 'f8704ea3351907b7f6eb066e53f00b45406d529b':
  Only wait for relevant windows when turning on the screen
2014-09-23 18:46:00 +00:00
Jorim Jaggi
2fb173a34b Merge "Only wait for relevant windows when turning on the screen" into lmp-dev 2014-09-23 18:26:09 +00:00
Tsuwei Chen
678c13c02a Better detection for SIM information readyness.
1) listen to SUBINFO broadcast intent to better capture SIM info update.
2) notify HAL about SUPL server/host everytime they get set.

Bug: 17288144

Change-Id: I65cb4e0879c55c078e85d062877e491904e78222
2014-09-23 11:23:13 -07:00
Dianne Hackborn
39569afc9f Fix issue #17307700: retarget a relinquished task is not working
Missed by 1!

Change-Id: If6504e37563d1242df8da4609cbcbcd550d68fdd
2014-09-23 10:56:58 -07:00
Dianne Hackborn
25e1ecaabb Maybe fix issue #17614177 APR: system process restarting due to infinite loop
Also try to get rid of a huge wtf we are seeing across a lot of devices
where we incorrectly change real states on a service that is restarting,
and get rid of one of the noisier boot logs in the package manager.

Change-Id: I2510b6fb082eac3f6168cbd57bc3b70ad006114d
2014-09-23 10:33:30 -07:00
Jeff Brown
45712f2e6d am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit 'c91bd121db79e5ea3c6ba6b333637f296992f11e':
  Fix window manager policy state when waking from doze.
2014-09-23 17:00:06 +00:00
Jorim Jaggi
dc9ead4409 Only wait for relevant windows when turning on the screen
Bug: 17536119
Change-Id: Ibe8da9fdd52a1a46eb856425b28ffc4f505b2697
2014-09-23 18:55:46 +02:00
Jeff Brown
55fa020713 Merge "Fix window manager policy state when waking from doze." into lmp-dev 2014-09-23 16:42:52 +00:00
Jeff Brown
3ee549ca24 Fix window manager policy state when waking from doze.
Once upon a time when the world was fresh and new, the heavens
had an easy rhythm.  Day and night.  Night and day.  In the day,
the pixel fairies would cavort and play in the bright gardens
with narry a mark of shadow or gloom.  In the night, they would
rest peacefully, dreaming no dreams and knowing no fear.

Then one night a fairy dreamed the first dream.  At first
the dream was peaceful, full of colors and delight, hopes and
memories.  Then all at once, jarringly, it awoke in bright
daylight.  The pixel fairy knew fear, for the world had changed
and it was unprepared.

Time passed and the pixel fairies grew accustomed to their
fate, day and night, night and day, sometimes dreaming, until
there came a night when a fairy did not sleep.  It roamed
the land in a dreamless doze, lost and afraid amid a grim haze
of grey and darkness.  The fairy despaired.  It wanted no
part of this place.  It pretended for a time to be awake but
the bright daylight would not come.  It pretended for a time to
be dreaming but the colors and memories would not come.
That is when the fairy wished for oblivion.  Then just as
suddenly, it awoke in the daylight.  It fell to the ground,
stunned as if it had forgotten how to walk in the too bright
daylight.

Though the world again grew softer and kinder in time, the pixel
fairies were never the same.  For the night is dark and full
of terrors.

---

It used to be easy.  Screen on and screen off could explain almost
everything about the state of the device but it's different now with
ambient display.  We need to be able to wait for all windows to be
drawn even in the case where the device is still nominally asleep.
In truth, the window manager policy which drives a lot of these
interactions is a thicket of outdated assumptions.

Added a new method to tell the window manager policy when the screen
is being turned off so that it can correctly account for changes
to the interactive state (wakeUp and goingToSleep) and screen state
(screenTurningOn and screenTurnedOff).  Now we can independently
poke keyguard during interactive state changes and we can apply
screen on blocking during screen state changes.

Moved the code which manages screen on blocking (which is what
ensures the UI has fully drawn before revealing screen contents)
from the power manager to the display manager since the display
manager is in a better position to accurately track the state of
the screen, particularly when the screen is being turned off.

Fixed a bunch of synchronization issues.  Previously some work
had been moved to a handler without considering what might
happen if it became reordered relative to other work happening
elsewhere.  Documented the desired behavior in the code to
prevent this from happening again.

There's still a bunch of stuff in here that isn't quite right,
particularly the assumption that there's only one screen, but
it's good enough for now.  Hopefully there aren't too many bugs.

Bug: 17605802
Change-Id: Ic7319e09948c8a3cda014d7e169c964a3ad86f14
2014-09-23 09:38:05 -07:00
Paul Jensen
337553071a am f1980965: am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev
* commit 'f19809653a6601459c5a9167396bb461a6d2ee52':
  Remove needless locking of mRulesLock that caused deadlocks.
2014-09-23 12:18:46 +00:00
Paul Jensen
74971c75dc Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 2014-09-23 12:00:35 +00:00
Lorenzo Colitti
a8aeb61508 am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev
* commit '5570a0d024a83bba723b3847a95128c222607203':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
2014-09-23 03:37:58 +00:00
Amith Yamasani
4872bdd74e am 92ab28b1: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev
* commit '92ab28b14b820888737fce7ff76b503e3f20f0b6':
  Fix regression in launching CantAddAccountActivity for correct user
2014-09-23 03:37:54 +00:00
Dianne Hackborn
babf33608a am 2b2e213c: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev
* commit '2b2e213c7c78cd773bd1cfd756e6f24390e4e28a':
  I am such an idiot.
2014-09-23 02:48:39 +00:00
Lorenzo Colitti
60446165d8 Block address families with routes, not NetworkAgent side channel
Now that we support unreachable routes, use those to block
address families on VPNs. This is a much more elegant solution.
Also update LinkProperties when IP addresses are added and
removed, fixing a TODO.

Bug: 17462989
Change-Id: Ib749d84710dca70d672350b9f129bb91419ec77e
2014-09-23 10:48:28 +09:00
Lorenzo Colitti
1e2b63d91d Merge changes I3ebf0cec,I8635472c into lmp-dev
* changes:
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
2014-09-23 01:46:48 +00:00
Yuncheol Heo
f0f7f1b33d Merge "Fix the hotplug behaviors in TV." into lmp-mr1-dev 2014-09-23 01:44:11 +00:00
Amith Yamasani
fee7ad1619 Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 2014-09-23 01:09:11 +00:00
Dianne Hackborn
c7437dd7c0 Merge "I am such an idiot." into lmp-dev 2014-09-23 00:57:28 +00:00
Dianne Hackborn
4a1ef0b171 I am such an idiot.
Seriously, don't look at this.  It is so dumb.

Brought up by issue #17307700: retarget a relinquished
task is not working

Change-Id: I947438d3502f75510e2974211bb78d31008eaa90
2014-09-22 17:39:07 -07:00
xinhe
abbc202431 Merge "Fix for empty RSSI triangle after boot" into lmp-dev 2014-09-23 00:13:22 +00:00
Yuncheol Heo
b8d62e70bf Fix the hotplug behaviors in TV.
- Don't run the local address allocation in the case of TV and the removed event.
- Let isTvDevice() return the value based on mLocalDevices, since tv() is
  unstable during the intialization period.

Bug: 17601460
Change-Id: Ic5701f1f86f51171960033bd97e169270a0021bf
2014-09-23 08:28:23 +09:00
Adam Lesinski
2e51cc6842 Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 2014-09-22 23:17:47 +00:00
Adam Lesinski
246a8bcadd Revert behavior of Lockscreen Activity Launch to KK
There exists a lifecycle regression where launching an
app from the lockscreen (camera, etc.) causes a series
of onResume, onPause, onRestart, onStart, onResume.

This CL reverts the behavior to what it was in KK, which
is to say that the Launcher is first resumed/paused, then
the Activity being launched has a simple onRestart,onStart, onResume
lifecycle.

Bug:17459745
Change-Id: I04091d2f86a929ee972c8d6debc1beb033c135a8
2014-09-22 16:04:32 -07:00
Dianne Hackborn
5d47a09352 Merge "Fix issue #17609716: Frequent crash in system_server (RT restarts)" into lmp-dev 2014-09-22 22:46:54 +00:00
John Spurlock
e35c9bf9ba Merge "Zen: Add events as a new config attribute." into lmp-dev 2014-09-22 21:09:39 +00:00
John Spurlock
2dac62c2e9 Zen: Add events as a new config attribute.
Decouple events from alarms in the zen interception function,
and default the new allowEvents to true.

Bug:17580878
Change-Id: Iff10df385206ad73c3423ff118c79e94a10918d9
2014-09-22 16:44:37 -04:00
Dianne Hackborn
19c3b5d0d9 Merge "Work on issue #17581375: Nexus 5 getting low on RAM" into lmp-dev 2014-09-22 20:40:17 +00:00
Dianne Hackborn
c2f6f947b6 Fix issue #17609716: Frequent crash in system_server (RT restarts)
There was some code here locking on the lock object instead of
the main activity manager lock...!!!

Change-Id: Ic85151fbef915f6fb8fd5ce3c1a7e9b810412cb6
2014-09-22 13:36:42 -07:00
Michael Wright
3119b82c43 Merge "Monitor MediaRouter for remote display connections." into lmp-dev 2014-09-22 20:04:30 +00:00