Commit Graph

57758 Commits

Author SHA1 Message Date
Igor Murashkin
2b268d7f8f am e3ad6ff8: am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
* commit 'e3ad6ff81c8913ea55df88d8af019769a55f51e3':
  camera2-legacy: Workaround max jpeg/preview size AR mismatch
2014-09-23 23:12:15 +00:00
Igor Murashkin
a040e44417 am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
* commit 'c79b145f0216d2f9b099a409fee2c154de1f7019':
  camera2-legacy: Workaround max jpeg/preview size AR mismatch
2014-09-23 22:59:56 +00:00
vandwalle
e70f3bbfb7 am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
* commit '9794dc9569fd33ea706370ee153446645a7b1474':
  handle bssid blacklist in case of dhcp failures
2014-09-23 22:53:20 +00:00
Igor Murashkin
4f17981fdc Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev 2014-09-23 22:50:30 +00:00
vandwalle
5a94fd7c04 am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
* commit '0829f6b6e1c5dc79b8feb3cebfede2d89384ba85':
  handle bssid blacklist in case of dhcp failures
2014-09-23 22:41:28 +00:00
vandwalle
ba46bac83a Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 2014-09-23 22:31:34 +00:00
Igor Murashkin
a0496d34ff camera2-legacy: Workaround max jpeg/preview size AR mismatch
Filter out the largest preview sizes (from the stream configuration map)
until we find one whose aspect ratio matches the max jpeg aspect ratio.
Keep all other (smaller) preview sizes.

Bug: 17589233
Change-Id: I8ebcaef6439691eff3312da2c37b9abe08a067ad
2014-09-23 15:11:36 -07: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
Adam Powell
3b00941049 am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
* commit '0bff30ba60607232054d80090fb22916f1f7e551':
  Track persistent nested Y offset for fling velocity
2014-09-23 21:06:47 +00:00
Dianne Hackborn
14f10be0bf am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev
* commit '5a9cfe3ea7fdcec78094530032217fca477561b1':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
2014-09-23 21:06:17 +00:00
Adam Powell
6c0b8b794a am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
* commit 'c8d72a97c53da122d41b8238f23609f99aca2e02':
  Track persistent nested Y offset for fling velocity
2014-09-23 20:55:35 +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
Adam Powell
01db31f899 Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 2014-09-23 20:46:47 +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
John Spurlock
5d3c840a87 am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev
* commit 'c107ea7321829d7c4b7f22f9967ffd0250569b56':
  Remove redundant wifi-display notification.
2014-09-23 20:15:11 +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
vandwalle
176a27f3ab handle bssid blacklist in case of dhcp failures
Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6
2014-09-23 12:38:06 -07:00
Etan Cohen
b9e142ce71 am 5f44592f: am dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
* commit '5f44592f930205ee037229b988580baef139a06d':
  Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
2014-09-23 18:46:06 +00:00
Etan Cohen
164a91ae0d am dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
* commit 'dd2b9f0754948f844517b3c82062c02d91762b28':
  Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
2014-09-23 18:34:17 +00:00
Etan Cohen
5e418a6692 Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
Configuration RAT replacement value will be used in any ambiguous (LTE:14) or
unknown (UNKNOWN:0) scenario.

Bug: 16962905
Change-Id: Ica1cc809521df5836143d8a94849541f28342a89
2014-09-23 18:28:11 +00:00
Alan Viverette
31260dfd65 am a3494fed: am 043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev
* commit 'a3494fedb2dcac5647f45abb80e612374234dc7b':
  Update refresh icon to tinted material vector asset
2014-09-23 18:27:45 +00:00
Ruben Brunk
8563395665 am 56bd6a6b: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
* commit '56bd6a6b2ff9eb944f155294c669279bd99839cd':
  camera2: Update EACCES to throw correct exception in LEGACY.
2014-09-23 18:27:41 +00:00
Alan Viverette
4d2b60d136 am 043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev
* commit '043fc017b713c88122f8d7b6b9cba606e254805a':
  Update refresh icon to tinted material vector asset
2014-09-23 18:16:43 +00:00
Ruben Brunk
6a90fa0c20 am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
* commit '30306d89bd83fe884b11816f5cfc33d5ab3048cb':
  camera2: Update EACCES to throw correct exception in LEGACY.
2014-09-23 18:16:39 +00:00
Alan Viverette
a93e58f888 Merge "Update refresh icon to tinted material vector asset" into lmp-dev 2014-09-23 18:15:27 +00:00
Ruben Brunk
b0ddd2e0d6 Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev 2014-09-23 18:08:42 +00: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
Ruben Brunk
3084c2f519 camera2: Update EACCES to throw correct exception in LEGACY.
Bug: 17595068
Change-Id: I1a88568822237d3609c3342a21e2ca81ca935408
2014-09-23 10:32:18 -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
Jeff Brown
651def483c am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit '3f51958b1911ffa49ca3d7eb2a9304348ccbf04e':
  Fix window manager policy state when waking from doze.
2014-09-23 16:48:43 +00: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
George Mount
00e28744af am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev
* commit 'd0f0f86b3a6a8086efc468a0ee8728605cdfc9e3':
  Force transitioning views to be visible when transition interrupted.
2014-09-23 14:44:48 +00:00
George Mount
004b7a3f19 am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev
* commit 'cced7645aae3e2fd65297ac75cecfde31dc1c636':
  Force transitioning views to be visible when transition interrupted.
2014-09-23 14:33:08 +00:00
George Mount
cbd333b256 Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 2014-09-23 14:27:36 +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
Lorenzo Colitti
633b7bb8ed am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev
* commit 'bb17a717750c558ece69344ecd93d96d4fbc4aca':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
2014-09-23 03:21:21 +00: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
Alan Viverette
c2e08a010e Update refresh icon to tinted material vector asset
BUG: 17594602
Change-Id: I52f55580bfa22e335608cea0b1fcafe275752bf8
2014-09-23 01:25:25 +00:00
Amit Mahajan
f6848fe8d4 am 4936c2c8: am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev
* commit '4936c2c831a2fe4dbc34343b81d9df9475d90895':
  Don't disconnect data for some carrier
2014-09-23 00:35:29 +00:00
Amit Mahajan
65811e94bf am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev
* commit 'e9259ce9de43096ca1aaf24acb8fcb54c1f69583':
  Don't disconnect data for some carrier
2014-09-23 00:24:22 +00:00
Ruben Brunk
4883dee074 am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev
* commit 'a34b25cc9274c1fa35110e2d937b257ac5d87003':
  camera2: Docs update for available AF modes.
2014-09-23 00:23:24 +00:00
Adam Powell
744beffb6a Track persistent nested Y offset for fling velocity
Track the nested offsets applied persistently in AbsListView and
ScrollView. This allows accurate velocity to be reported to nested
fling/pre-fling.

Bug 17548219

Change-Id: I66199c534aca7fb81746eff6d04c931e4c4e48da
2014-09-22 17:18:42 -07:00
Ruben Brunk
e48fcfb38f am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev
* commit '12f73fcf874eccaea8e56a4ac547dc86ae9259a6':
  camera2: Docs update for available AF modes.
2014-09-23 00:16:01 +00:00
Amit Mahajan
322582447e Merge "Don't disconnect data for some carrier" into lmp-dev 2014-09-23 00:15:31 +00:00
Ruben Brunk
52d62193d6 am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev
* commit 'e134e81aa076acbd10551b3d39217e9d438b492d':
  camera2: Add missing whitebalance mapping.
2014-09-23 00:11:03 +00:00
Alan Viverette
51fc9ea5cd am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
* commit '20b9a6c458f998d1a5d3896e859a65371db9fce2':
  Fix inaccurate TypedArray.getDrawable() documentation
2014-09-23 00:10:59 +00:00
George Mount
f1abef6fc2 Force transitioning views to be visible when transition interrupted.
Bug 17553034

When an Activity Transition was interrupted prior to starting the
enter transition, the views were not being made visible.

Override the return ActivityOptions if interrupted so that the
entering activity doesn't launch with a transition when coming
back from recents.

Change-Id: Id4e00c7bb138babfee4de71247a9df4431376e21
2014-09-22 17:06:24 -07:00
Ruben Brunk
fcb086c8e7 Merge "camera2: Docs update for available AF modes." into lmp-dev 2014-09-23 00:06:15 +00:00
Ruben Brunk
75192fb790 am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev
* commit '4b3c7f852a22c27bc31c3710c631ef5fae10788f':
  camera2: Add missing whitebalance mapping.
2014-09-23 00:03:49 +00:00