Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
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
Igor Murashkin
4f17981fdc Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev 2014-09-23 22:50:30 +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
Michael Wright
c93fbd1fae Specify a device identifier for keyboard layout notification. 
Bug: 17614683
Change-Id: If53489b09212bfa487d7dc3a7f9b000731d949ac
 2014-09-23 14:59:23 -07:00
Dianne Hackborn
8a4257e160 am 723d3906: am a85c287d: am 0394c8bc: am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit '723d390690286c813b3a80e6fa3914cf60175ae9':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:43:04 +00:00
Adam Powell
c2dd3f5a53 am 7d43ca63: am 7c673645: am 76cedc5b: am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 
* commit '7d43ca63709351c88f7386abb4163aec1bb500d4':
  Track persistent nested Y offset for fling velocity
 2014-09-23 21:42:52 +00:00
Dianne Hackborn
d96238d02e am a85c287d: am 0394c8bc: am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit 'a85c287d53335cdc2fbdde711216a6f5db5a1a24':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:31:00 +00:00
Adam Powell
bbceeffebe am 7c673645: am 76cedc5b: am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 
* commit '7c673645310530dc22ee99719f3538dabbd69a02':
  Track persistent nested Y offset for fling velocity
 2014-09-23 21:30:55 +00:00
Dianne Hackborn
c21c6ab3a7 am 076741d5: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit '076741d5776be95a19259827d1e1b2b196eb4ba3':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:14:20 +00:00
Adam Powell
006dd76bd2 am abadb107: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 
* commit 'abadb107b8d1bb55feb2217c7fa4417257d4e369':
  Track persistent nested Y offset for fling velocity
 2014-09-23 21:06:26 +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
Ruben Brunk
92273d4ae2 am 9763d624: am fba543e3: am b38a6f80: am 56bd6a6b: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev 
* commit '9763d624dd0fba01ee2b2c3ff775fd57436c1d85':
  camera2: Update EACCES to throw correct exception in LEGACY.
 2014-09-23 20:56:32 +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
Jeff Brown
7f0a933196 am 82b1767d: am 87c18cc6: am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit '82b1767d33a698e8be960b4bd84bbb8d26575dfb':
  Fix window manager policy state when waking from doze.
 2014-09-23 19:08:17 +00:00
Ruben Brunk
53f6963d73 am fba543e3: am b38a6f80: am 56bd6a6b: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev 
* commit 'fba543e3d7afce12bc656d53e836fd61d520f05e':
  camera2: Update EACCES to throw correct exception in LEGACY.
 2014-09-23 18:51:19 +00:00
Ruben Brunk
bdb14e9383 am 13993e03: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev 
* commit '13993e03f7173c0b1ee66790b5a04119d3e64c69':
  camera2: Update EACCES to throw correct exception in LEGACY.
 2014-09-23 18:29:00 +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
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
578628741b am 87c18cc6: am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit '87c18cc6d01fa553bc72e7d2b66f15f58863113a':
  Fix window manager policy state when waking from doze.
 2014-09-23 17:23:04 +00:00
Jeff Brown
b0697d1e8c am a9b97c68: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit 'a9b97c6839ebf7364552c3c7b1e8eed2c2e56e1a':
  Fix window manager policy state when waking from doze.
 2014-09-23 17:00:11 +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
Zoltan Szatmary-Ban
0bec95d052 Register ActivityManagerService.PackageMonitor for all users. 
With the introduction of managed profiles, ActivityManagerService.PackageMonitor
can receive Intents from users other than current one.

Bug: 17580914, 17314317
Change-Id: I7c601618f7819d6775cf422dca70a929ee1089d9
 2014-09-23 17:27:17 +01:00
George Mount
acf163b682 am 70fccb3c: am 27b46d35: am a17365ef: am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit '70fccb3c3dad8431f8cc3c0069c0e2ea47cb0827':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 16:22:40 +00:00
Lorenzo Colitti
3cf006a0ce am 1b3c16a0: am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit '1b3c16a06a43e98de8341535003b4d8fba2ba08a':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 16:22:01 +00:00
Ruben Brunk
a0006633ff am e39469e5: am 04ddd954: am c947ff9e: am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit 'e39469e500de0d5ef1845d3f6c01b99adb835390':
  camera2: Docs update for available AF modes.
 2014-09-23 16:21:27 +00:00
Ruben Brunk
95bd128b3f am 64e0b657: am b95f6de6: am 6b68644e: am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit '64e0b657df23f612875d0fae204e6c3291fdc9e6':
  camera2: Add missing whitebalance mapping.
 2014-09-23 16:21:23 +00:00
Alan Viverette
2eeaba6252 am 49a20330: am 17cdbe10: am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '49a20330f238fb9e72c5ad32d35c1147ccebaf9b':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 16:21:18 +00:00
Ruben Brunk
ab204faaf7 am d3894f50: am 969be13e: am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit 'd3894f50bd04de40fb09b24ca6f4a05a4e954c0f':
  camera2: Avoid spurious IDLE transitions.
 2014-09-23 16:21:13 +00:00
John Reck
0110911b38 am 316ad883: am fa19b7aa: am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit '316ad883b5d5a37c4d39c328e9acb2995403337b':
  Aggressively trim memory for system_process
 2014-09-23 16:20:58 +00:00
Wink Saville
8c437b99d4 am 5530638d: am d428d7bf: am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev 
* commit '5530638d98085ddcbd538809e9c12f4b9102de09':
  Cleanup NetworkCapabilities.
 2014-09-23 16:20:48 +00:00
John Spurlock
8f2cf915a7 am 3b828d21: am 91c77f04: am fbe1df94: am f8580a4c: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev 
* commit '3b828d215f7acaf9d5f12826f58e9c7caa2055f0':
  Zen: Add events as a new config attribute.
 2014-09-23 16:19:53 +00:00
Alan Viverette
75c0a9e394 am 3df164ce: am be2fb16c: am 8ae47443: am 8183ba88: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev 
* commit '3df164ce61a9f322e11ca610de5bbf945e0b6c4d':
  Pass explicit null theme when preloading drawables
 2014-09-23 16:18:04 +00:00
Yohei Yukawa
b78013f247 am df82c72f: am fb8bdc11: am 79a12ba6: am 8fe1ca2c: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 
* commit 'df82c72ff1e4f97abed37f7d65dda146f23e0ff0':
  Work on issue #17506095: Plumb a new configuration to IMMS
 2014-09-23 16:16:56 +00:00
Przemyslaw Szczepaniak
1641693113 am 2a94d26f: am 949ea9f0: am 32190676: am 90ae2778: am 299bb1fb: Fix issues with new TTS API 
* commit '2a94d26fc3b13ea89412ddac4f1b83f29b9244b8':
  Fix issues with new TTS API
 2014-09-23 16:16:44 +00:00
Ruben Brunk
9d3e024267 am 03e4e0a3: am 3d608a42: am d314f286: am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* commit '03e4e0a3aa7cead96c21d86c64e188836f8fee74':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-23 16:16:28 +00:00
Yigit Boyar
f0d7dd7474 am d1cb7046: am e17fd940: am 0b380581: am a9faefb3: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit 'd1cb704634fd4d739c861480ddcb3b13388bbee4':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-23 16:16:19 +00:00
Ruben Brunk
c539813a19 am 5ad61b7b: am f1a9ccb5: am 6e13d7fd: am 252bfab5: am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 
* commit '5ad61b7b16ae63baf58b9f5a1c459a4a69eaa5be':
  camera2: refactor LEGACY mode error handling.
 2014-09-23 16:16:08 +00:00
Svetoslav
b7e80d961f am e9ff6bb4: am 20178a82: am 35c764cf: am 562f38ee: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev 
* commit 'e9ff6bb4c1f77661de9fea02c28b3b80aed1b393':
  Fix memory leak in accessibility cache.
 2014-09-23 16:15:54 +00:00
George Mount
9296bcc75f am 27b46d35: am a17365ef: am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit '27b46d350dcd89efde25dc1e0bae35156a6c1346':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 15:53:42 +00:00
Lorenzo Colitti
11ebb69d50 am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'd0d59156e69d9f33eea68e783b2835867bdaa67f':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 15:51:32 +00:00
Ruben Brunk
0498c04857 am 04ddd954: am c947ff9e: am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit '04ddd954e3ccad653441762d1f289b2945dc061e':
  camera2: Docs update for available AF modes.
 2014-09-23 15:50:33 +00:00
Ruben Brunk
79a7e78c0d am b95f6de6: am 6b68644e: am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit 'b95f6de6a4b23b7e95c61446f4879dbedf444156':
  camera2: Add missing whitebalance mapping.
 2014-09-23 15:50:27 +00:00
Alan Viverette
a83de9cf9d am 17cdbe10: am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '17cdbe10616e38450064d758232f78c7cacc83f4':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 15:50:22 +00:00
Ruben Brunk
e2120388c8 am 969be13e: am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit '969be13ecc9ec7d9e35575d46f22fdd2da5866af':
  camera2: Avoid spurious IDLE transitions.
 2014-09-23 15:49:58 +00:00