Craig Mautner
a015e9d850
am 71bbf108: am b690557c: am 02fa2332: Merge "Make DimLayer size dependent on stack layout." into klp-dev
...
* commit '71bbf1086db0303ee8e5f8bea6bde68d25fcc57a':
Make DimLayer size dependent on stack layout.
2013-10-04 09:10:26 -07:00
John Spurlock
b7ba2630bd
am bee8af82: am c3752cfb: am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev
...
* commit 'bee8af8207938fb0d29b38d915be1803edc64d69':
Store decor rects per window for transition cropping.
2013-10-04 09:10:17 -07:00
John Reck
9aeb62cfa5
am 35f2dcd0: (-s ours) am cdc605c6: am b885435c: Merge "Update liblayout" into klp-dev
...
* commit '35f2dcd02ca3610c1712010d3189e620bdd7e9b6':
Update liblayout
2013-10-04 09:10:15 -07:00
Alan Viverette
913949dbd6
Merge "Simplify matrix calculations for display adjustment"
2013-10-04 01:05:10 +00:00
Alan Viverette
36f4b08341
Simplify matrix calculations for display adjustment
...
Removes MatrixUtils, which is now unused.
Change-Id: Ifa809d2aeafa415d3861e59e4c7a8b115e76a2df
2013-10-03 16:46:04 -07:00
Christopher Tate
f2d9391b33
am 64884eef: am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev
...
* commit '64884eef54bb110cead05d9b3f1a5928d5cf5349':
Fix cross-process race in initial files/cache dir creation
2013-10-03 16:43:20 -07:00
Adam Lesinski
38dc2ad85e
am b2db2fbc: am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev
...
* commit 'b2db2fbce33dbcfa52ccb20267ad4897c558c34f':
Private flags are masked in correct variable
2013-10-03 16:43:17 -07:00
Svetoslav
9bc6cdaed3
am a0867328: am 36f38f4e: am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev
...
* commit 'a0867328db32884d0791435da04ecdeb297d0246':
Fix screen magnifier scaling due to ScaleGestureDetector changes.
2013-10-03 16:43:13 -07:00
John Reck
eebcc0ff60
am cd6a2d30: am 47dc3248: am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev
...
* commit 'cd6a2d3079ee67658535773021c16787b9adba6e':
Reduce max recents on lowram
2013-10-03 16:43:09 -07:00
Craig Mautner
71bbf1086d
am b690557c: am 02fa2332: Merge "Make DimLayer size dependent on stack layout." into klp-dev
...
* commit 'b690557c84b33aa04d6fecf3e2c9fb737291a564':
Make DimLayer size dependent on stack layout.
2013-10-03 15:38:55 -07:00
John Spurlock
bee8af8207
am c3752cfb: am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev
...
* commit 'c3752cfb6d5381795433ccdbcd8f84cada832790':
Store decor rects per window for transition cropping.
2013-10-03 15:38:52 -07:00
John Reck
35f2dcd02c
am cdc605c6: am b885435c: Merge "Update liblayout" into klp-dev
...
* commit 'cdc605c69597649c8e71161791ae64be48ce1f11':
Update liblayout
2013-10-03 15:38:50 -07:00
Christopher Tate
64884eef54
am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev
...
* commit 'b61c82190d9d16cd4a7dff8af81aff7f43c19cc4':
Fix cross-process race in initial files/cache dir creation
2013-10-03 15:38:47 -07:00
Adam Lesinski
b2db2fbce3
am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev
...
* commit '6d90862f2387d24c28e9d1c8f080cb9a4ff15011':
Private flags are masked in correct variable
2013-10-03 15:38:44 -07:00
Svetoslav
a0867328db
am 36f38f4e: am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev
...
* commit '36f38f4efc52f195a7f30f986ed3e6633aa179f4':
Fix screen magnifier scaling due to ScaleGestureDetector changes.
2013-10-03 15:38:42 -07:00
John Reck
cd6a2d3079
am 47dc3248: am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev
...
* commit '47dc3248e09002a5a55dc427f752da8ebd623868':
Reduce max recents on lowram
2013-10-03 15:38:38 -07:00
Alex Klyubin
87e385effb
am aa947f15: am a9bce468: am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG."
...
* commit 'aa947f15314a4239de91a1cd0bea085e3399d43e':
Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
2013-10-03 15:23:23 -07:00
Alex Klyubin
aa947f1531
am a9bce468: am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG."
...
* commit 'a9bce46876d6f1f82727ab6922748fcc6b43c767':
Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
2013-10-03 15:21:08 -07:00
Alex Klyubin
a9bce46876
am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG."
...
* commit '84742149257554e804b155d15b0af762d6f737ca':
Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
2013-10-03 15:17:49 -07:00
Alex Klyubin
8474214925
Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG."
2013-10-03 22:12:36 +00:00
Alex Klyubin
6ab3d20d3c
Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
...
On devices with Hardware RNG (HW RNG), this makes EntropyMixer
periodically (every three hours) read 512 bytes from HW RNG and mix
them into the Linux RNG.
This is done without increasing Linux RNG's entropy estimates to
avoid having to trust the quality of the HW RNG. This approach cannot
reduce the quality of the Linux RNG output, but may increase it.
Change-Id: Ifde851004301ffd41b2189151a64a0c5989c630f
2013-10-03 15:07:37 -07:00
Alex Klyubin
6981a92433
am 3e64aa11: am 6a603e7b: am 1a07229b: Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes."
...
* commit '3e64aa117ad52c71d9676761b8f6a6947cb7ac15':
Reduce EntropyMixer seed size from 4096 to 512 bytes.
2013-10-03 15:00:45 -07:00
Alex Klyubin
3e64aa117a
am 6a603e7b: am 1a07229b: Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes."
...
* commit '6a603e7be9036c22d61a4977afd17bb227cf6ea2':
Reduce EntropyMixer seed size from 4096 to 512 bytes.
2013-10-03 14:57:20 -07:00
Alex Klyubin
6a603e7be9
am 1a07229b: Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes."
...
* commit '1a07229bc2042676c866051938ebe35d9cded900':
Reduce EntropyMixer seed size from 4096 to 512 bytes.
2013-10-03 14:36:49 -07:00
Alex Klyubin
1a07229bc2
Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes."
2013-10-03 21:34:23 +00:00
Alex Klyubin
3c2ae2f4ed
Reduce EntropyMixer seed size from 4096 to 512 bytes.
...
The suggested seed size from Linux drivers/char/random.c is 512 bytes
rather than the 4096 bytes currently used.
Change-Id: I3dd55105f0a95ce9cda34b4cf08987b8a28c4ac9
2013-10-03 13:56:09 -07:00
Ben Gruver
b70c534900
Merge "Check the return value of listFiles on the ifw directory"
2013-10-03 20:45:58 +00:00
Craig Mautner
b690557c84
am 02fa2332: Merge "Make DimLayer size dependent on stack layout." into klp-dev
...
* commit '02fa2332ac9f2972a0c651229ae456641f519363':
Make DimLayer size dependent on stack layout.
2013-10-03 12:18:33 -07:00
John Spurlock
c3752cfb6d
am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev
...
* commit 'e660ecc436c6bb9d3476298e97976a24b432482e':
Store decor rects per window for transition cropping.
2013-10-03 12:18:31 -07:00
John Reck
cdc605c695
am b885435c: Merge "Update liblayout" into klp-dev
...
* commit 'b885435c7c77d0610f449e413766d30780eeda37':
Update liblayout
2013-10-03 12:18:28 -07:00
Christopher Tate
b61c82190d
am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev
...
* commit 'ef4f8222fc671d2453e4bcb35978afdfa9734b78':
Fix cross-process race in initial files/cache dir creation
2013-10-03 12:18:26 -07:00
Adam Lesinski
6d90862f23
am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev
...
* commit 'd65825ab1cdbfd88122beaaad8cf815434cbf46d':
Private flags are masked in correct variable
2013-10-03 12:18:23 -07:00
Svetoslav
36f38f4efc
am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev
...
* commit '9907a109ced54cffc7b4f5e9e81365c78df1f1a9':
Fix screen magnifier scaling due to ScaleGestureDetector changes.
2013-10-03 12:18:17 -07:00
John Reck
47dc3248e0
am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev
...
* commit '9a93f6f039920c2e24cdef172c9cbd39586b949c':
Reduce max recents on lowram
2013-10-03 12:18:14 -07:00
Mike Lockwood
84b6292c33
move libandroidfw to frameworks/native
...
Change-Id: Ic5b8a2742c7141156ab0f00ca29097bfe92bce60
2013-10-03 10:30:18 -07:00
Satoshi Kataoka
92a6f3018a
Fix InputMethodSubtype#equals corresponding to hashCode
...
Change-Id: Ic9305a6f0f5d753f0ad674ad6c9ee648cc8a6ce9
2013-10-03 16:35:21 +09:00
Baligh Uddin
19db520069
Merge "Import translations. DO NOT MERGE"
2013-10-03 03:42:39 +00:00
Baligh Uddin
06e951e581
Merge "Import translations. DO NOT MERGE"
2013-10-03 03:41:37 +00:00
Baligh Uddin
291eea7e55
Merge "Import translations. DO NOT MERGE"
2013-10-03 03:41:16 +00:00
Baligh Uddin
0a6db6691b
Merge "Import translations. DO NOT MERGE"
2013-10-03 03:41:01 +00:00
Craig Mautner
02fa2332ac
Merge "Make DimLayer size dependent on stack layout." into klp-dev
2013-10-03 02:49:31 +00:00
John Spurlock
e660ecc436
Merge "Store decor rects per window for transition cropping." into klp-dev
2013-10-03 02:28:58 +00:00
John Reck
b885435c7c
Merge "Update liblayout" into klp-dev
2013-10-03 02:00:37 +00:00
John Reck
5623d5f80f
Update liblayout
...
Fix build
Change-Id: I6c9223205874f7709fcf9e69a7779c54f52ba48b
2013-10-02 18:59:10 -07:00
Christopher Tate
ef4f8222fc
Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev
2013-10-03 01:58:47 +00:00
Adam Lesinski
d65825ab1c
Merge "Private flags are masked in correct variable" into klp-dev
2013-10-03 01:52:18 +00:00
Svetoslav
9907a109ce
Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev
2013-10-03 01:17:10 +00:00
Christopher Tate
cc866da37d
Fix cross-process race in initial files/cache dir creation
...
Apps that run components in separate processes, especially that
host providers in separate processes, can hit a race condition
where two processes simultaneously discover that the files/cache
dir must be created, then each calls mkdirs(). One of these will
fail not because the dir couldn't be created, but because it lost
the race and mkdirs() returned false to signal that it already
existed -- and this was assumed to be a hard failure.
We now recheck existence after a mkdirs() failure to discern this
case and proceed appropriately.
Bug 10515463
Change-Id: I13fbdd838921223f75ab11faa47291c82b21c650
2013-10-02 18:16:24 -07:00
John Reck
9a93f6f039
Merge "Reduce max recents on lowram" into klp-dev
2013-10-03 01:13:58 +00:00
Svetoslav
1fdbaa100c
Fix screen magnifier scaling due to ScaleGestureDetector changes.
...
The scale gesture detector has a new behavior to make onScale
callbacks during swipe after a double tap. The screen magnification
is triggered after a trippe tap so if the user trippe taps and
holds to do a temporary magnification and tries to change the
zoom level with another finger, erroneous results are obtained.
The ScaleGestureDetector uses an APIs level check for the new
behavior but the ScreenMagnifier is a platform feature. We now
explicitly ask for the old behavior.
bug:11033376
Change-Id: I0dfb14dd3abcaa34ad1f40447c631b4203797378
2013-10-02 17:53:00 -07:00