Alan Viverette
6a98dde8df
am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
...
* commit '9342b049b9a605b1904e03f904ec3cbf90f7742d':
Use default token instead of wrapped window manager
2014-11-05 04:50:50 +00:00
Alan Viverette
9342b049b9
Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
2014-11-05 04:44:22 +00:00
Tom Taylor
53a5acd096
am 8da5180d: am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQ
...
* commit '8da5180d3debf8bf47e8d19e8d606e38580b0a84':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:41:34 +00:00
Tom Taylor
0e69335f1a
am 77037113: am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '77037113a8d654451a3890fecb2e6be4bd679634':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:41:28 +00:00
Alan Viverette
3ea1a3e781
am 44eb8b77: Revert "When keyguard exits use same anim for all windows"
...
* commit '44eb8b772984164666195ea71c685292b234549a':
Revert "When keyguard exits use same anim for all windows"
2014-11-05 04:41:23 +00:00
Tom Taylor
8da5180d3d
am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection i
...
* commit '865a6582462a132c3d579b0cae0792062d76833e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:36:34 +00:00
Tom Taylor
77037113a8
am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit 'dd41b6292433915b5b470c61476afca11df043e3':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:36:20 +00:00
Alan Viverette
44eb8b7729
Revert "When keyguard exits use same anim for all windows"
...
Broke window animations.
This reverts commit b83408018176ec58f50e792590a22fdc9eb87fff.
BUG: 18248641
Change-Id: Ic456a5666c3199e8bb8c9c2fb1ecdbb82afaad86
2014-11-04 20:34:41 -08:00
Tom Taylor
865a658246
am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushMana
...
* commit '4e9851183daf26d602d641917378d55a9516f128':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:26:13 +00:00
Tom Taylor
dd41b62924
am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit 'f2f59e7ab916e37d510db151904c95c42006ae08':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:26:09 +00:00
Tom Taylor
4e9851183d
am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '6209d4e4d8a8662628c53cd5e1944abf30293d87':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:21:07 +00:00
Tom Taylor
f2f59e7ab9
am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit 'db864e4ddc788a21db6793bbcb5f559131f20736':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:20:11 +00:00
Alan Viverette
405165b6cd
am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
...
* commit 'a446195b0d22659ff402e3b6ac76b1b876e5fe3b':
Fix hasSurfaceInsets check when creating hardware renderer
2014-11-05 02:35:15 +00:00
Andres Morales
4f781559ec
am 67198830: Merge "Increase min free levels for cached processes on 64bit" into lmp-mr1-dev
...
* commit '671988302e344f18a0b6b2257c968a707c2189aa':
Increase min free levels for cached processes on 64bit
2014-11-05 02:35:09 +00:00
Alan Viverette
a77e349a36
am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
...
* commit '9c95264e847b02b688e12a3dd75b1e54502b3246':
Abort accessibility node prefetch if parent node is null
2014-11-05 02:35:04 +00:00
Craig Mautner
bf8e9884f1
am 26a733ce: Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
...
* commit '26a733ce339380f98b4206654b38bf8fd000dda9':
When keyguard exits use same anim for all windows
2014-11-05 02:34:57 +00:00
Stuart Scott
fc1e84777c
am 8585e0dd: Merge "Use CharSequence for DisplayName" into lmp-mr1-dev
...
* commit '8585e0dd4c7cf7b883de9cd40dc81099abe246c4':
Use CharSequence for DisplayName
2014-11-05 02:18:35 +00:00
Alan Viverette
a446195b0d
Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
2014-11-05 02:09:30 +00:00
Andres Morales
671988302e
Merge "Increase min free levels for cached processes on 64bit" into lmp-mr1-dev
2014-11-05 01:48:22 +00:00
Alan Viverette
9c95264e84
Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
2014-11-05 01:41:28 +00:00
Alan Viverette
d2fa514391
Use default token instead of wrapped window manager
...
BUG: 18248602
Change-Id: Id7f06c896dc71db3564fa21d3704222557613035
2014-11-04 17:40:29 -08:00
Andres Morales
97621e05c0
Increase min free levels for cached processes on 64bit
...
Requires less memory pressure to start killing cached
processes.
Bug: 18241791
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
2014-11-05 01:36:27 +00:00
Wale Ogunwale
ed24700385
Merge "Fix issue #18240452 : No recents screenshot when resuming from keyguard." into lmp-mr1-dev
...
automerge: c56a1f1
* commit 'c56a1f17153844c8015a440ed52e84bbce0b894f':
Fix issue #18240452 : No recents screenshot when resuming from keyguard.
2014-11-05 01:25:09 +00:00
Craig Mautner
26a733ce33
Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
2014-11-05 01:23:04 +00:00
Stuart Scott
8585e0dd4c
Merge "Use CharSequence for DisplayName" into lmp-mr1-dev
2014-11-05 01:19:12 +00:00
Wale Ogunwale
c56a1f1715
Merge "Fix issue #18240452 : No recents screenshot when resuming from keyguard." into lmp-mr1-dev
2014-11-05 01:14:22 +00:00
Alan Viverette
2cd23e6b9d
Fix hasSurfaceInsets check when creating hardware renderer
...
BUG: 17729606
Change-Id: I8c7092428b790e0ff3bbf84b64ba385ef2b2f521
2014-11-04 17:04:02 -08:00
Alan Viverette
a04a5e82f0
am 6e85abd4: Merge "Default gradient radius to %p when no intrinsic width or height set" into lmp-mr1-dev
...
* commit '6e85abd45b890bf583346a0935d1f24a789dc88b':
Default gradient radius to %p when no intrinsic width or height set
2014-11-05 00:48:09 +00:00
Alan Viverette
6e85abd45b
Merge "Default gradient radius to %p when no intrinsic width or height set" into lmp-mr1-dev
2014-11-05 00:43:16 +00:00
Eric Gilmore
ffcc5657b9
am 9fe0017d: am 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
...
* commit '9fe0017dd1a2908d00b35a39edd00af5f9b79e14':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:34:05 +00:00
Eric Gilmore
9fe0017dd1
am 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
...
* commit '1c9860f9285709cddff2e570a50e3afc66091135':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:26:49 +00:00
Eric Gilmore
1c9860f928
am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
...
* commit '4f82acd810601c4d055906cb2b671cafd15d3fc8':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:20:18 +00:00
Eric Gilmore
4f82acd810
am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
...
* commit 'bf78adb25e80b9107fcd682d30e7157093681547':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:12:16 +00:00
Wale Ogunwale
d3e2a0891b
Fix issue #18240452 : No recents screenshot when resuming from keyguard.
...
WindowManager.keyguardGoingAway() isn't called early enough when you exit
the keyguard by clicking on a notification. So, the WindowState for the
preivous activity behind the keyguard is never transitioned to visible
and the activity manager then fails to take the screenshot for recents.
We will now be taking a screenshot of the activity before we go to sleep
so we are not dependent on signals from the keyguard.
Change-Id: I2acb2ad7a627d4e446ba11c9a0842d21fa6922d3
2014-11-04 16:09:19 -08:00
Alan Viverette
e9596818e5
am aa33a487: Merge "Always update date picker position after change in range" into lmp-mr1-dev
...
* commit 'aa33a487c8bfa0503a4c744a932a8344a96d52e1':
Always update date picker position after change in range
2014-11-05 00:05:33 +00:00
Alan Viverette
aa33a487c8
Merge "Always update date picker position after change in range" into lmp-mr1-dev
2014-11-05 00:00:52 +00:00
Alan Viverette
84feea1185
Abort accessibility node prefetch if parent node is null
...
BUG: 18004444
Change-Id: I80757daeb6b381947c4f3abbd762711cff2a978c
2014-11-04 15:59:55 -08:00
Craig Mautner
b834080181
When keyguard exits use same anim for all windows
...
The entering animations were only applied to the incoming windows
one time. If those windows weren't drawn yet then they never had
an animation assigned.
Furthermore if a starting window was drawn in time it would get the
animation but its main window would not get it if it weren't drawn.
Even if an animation were assigned later they wouldn't be synced
with each other.
This change creates a single animation which is shared by all
incoming windows. As windows are drawn they can then animate with
the starting window.
(Also refactorings to eliminate redundant code and unnecessary
variables.)
Fixes bug 15991916.
Change-Id: I9949ef0a1639c831754316da34de97cb86403f5a
2014-11-04 15:38:05 -08:00
Eric Gilmore
bf78adb25e
Adding 5.0 emulator image and removing older image.
...
2nd patch set includes low/high res. images.
Bug: 18026943
Change-Id: I102e5de616251e742c8e7b9cf1948be1cbbc4a1c
2014-11-04 15:01:24 -08:00
Stuart Scott
8b564c2af8
Use CharSequence for DisplayName
...
Change-Id: Ibb93424b85b11913282a4980e756b66a8d7946d5
2014-11-04 14:47:47 -08:00
Adam Lesinski
af53bfd06e
am efd8a85d: Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev
...
* commit 'efd8a85d30c35ca4a274835f10e371289bb9bc5e':
Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService
2014-11-04 22:37:03 +00:00
Adam Lesinski
efd8a85d30
Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev
2014-11-04 22:32:31 +00:00
Sreeram Ramachandran
9b32f9a466
am 0610ff97: Merge "Don\'t use framework permission strings for netd permissions." into lmp-mr1-dev
...
* commit '0610ff97f11d37d514ea20fcbd73a96ede3518ce':
Don't use framework permission strings for netd permissions.
2014-11-04 22:03:47 +00:00
Sreeram Ramachandran
0610ff97f1
Merge "Don't use framework permission strings for netd permissions." into lmp-mr1-dev
2014-11-04 21:59:23 +00:00
Adam Lesinski
32e580604d
Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService
...
- Forgot to increment loop variable :S
Bug:18239732
Change-Id: Ie37a83584d7849108dbfd3bd4cbb595520d488b1
2014-11-04 13:38:46 -08:00
Alan Viverette
3fff156e13
am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev
...
* commit '18b055e106d5452ef390716d3ea8d1641a225361':
Pass surface insets from window attributes rather than params
2014-11-04 19:34:13 +00:00
Alan Viverette
18b055e106
Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev
2014-11-04 19:30:34 +00:00
Alan Viverette
93cad8c4d4
Pass surface insets from window attributes rather than params
...
Params only gets set in certain situations, whereas the actual window
attributes always contain the correct surface insets.
BUG: 18214798
Change-Id: Ib5236ccf3f120b26c5abc8671bf29cb3dc269186
2014-11-04 11:27:19 -08:00
Scott Kennedy
9f07eb3503
am 50567bb1: am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
...
* commit '50567bb1f047fbed512551534bff6ce017690588':
Fix a small typo in a variable name
2014-11-04 19:21:28 +00:00
Ricardo Cervera
9433c87b8a
am aa743477: am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
...
* commit 'aa743477137e615ab35b9f6c0d131542cb9c6c41':
docs: Fix the circularReveal example.
2014-11-04 19:21:23 +00:00