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
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
ztenghui
86ec6088b5
VD:test:Remove open animation AVD
...
This is for unbundle apps, so it is not a good idea to put in open source.
b/18171696
Change-Id: I4272a9cd12904b90b4421e88304795a292ceec58
2014-11-04 15:59:46 -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
Tyler Gunn
3b4b1dcb60
Support disconnecting conference participants from conference.
...
- Added "onDisconnectConferenceParticipant" method used to inform a
connection acting as the conference host that one of the participants
should be disconnected.
- Added "VIRTUAL_CALL" PhoneCapability used to indicate that a call cannot
be the active or background call, but only be a child of another call.
Bug: 18228141
Bug: 18176606
Change-Id: I7aec631cc89c0f08e174b24ce3a9cb547b47e36b
2014-11-04 14:53:37 -08:00
Stuart Scott
8b564c2af8
Use CharSequence for DisplayName
...
Change-Id: Ibb93424b85b11913282a4980e756b66a8d7946d5
2014-11-04 14:47:47 -08: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
0610ff97f1
Merge "Don't use framework permission strings for netd permissions." into lmp-mr1-dev
2014-11-04 21:59:23 +00:00
RoboErik
131e63adaa
Add extras to the PlaybackState
...
This allows apps to include extras that are atomic with play state
changes.
bug:18189125
bug:18103891
Change-Id: Ia3bc5b0dcf29960cb70e2ff3a67ec1fdd48b7a5a
2014-11-04 13:47:45 -08: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
RoboErik
566c1ed18f
Add setRatingType to MediaSession
...
This was missing in L. Needed to tell controllers how to rate content.
bug:18051829
Change-Id: I26e662ff04f77ed7f2922bf9e74acf74c850547b
2014-11-04 13:14:19 -08:00
Bryce Lee
55e846d4a2
Add config to control going to sleep when entering theater mode.
...
Bug: 18241209
Change-Id: I7fa29d92391b1c8ab74585008d6599fd7174cc61
2014-11-04 12:43:44 -08: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
Justin Koh
7c1ad0cac6
Hide Surface#lockHardwareCanvas DO NOT MERGE
...
Hide this for now, will be public in a later release.
Change-Id: Ie13438ed10918df8b044103ef04016494aed1d10
2014-11-04 11:26:14 -08:00
mike dooley
1cf14ac5dc
Adding method to get disconnect cause from conference
...
Bug: 17842499
Change-Id: Ifb6e61d50d66aa8e8299e7024b2ab6d1d0f9d878
2014-11-04 11:21:21 -08:00
Tom Taylor
6209d4e4d8
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 '7c570346082f7f0399614b87f9a4c67d1ae1f1c6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 19:18:50 +00:00
Scott Kennedy
50567bb1f0
am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
...
* commit '4b28b1c3f579e285b9b030ea1612bf7cb0ef04e1':
Fix a small typo in a variable name
2014-11-04 19:16:55 +00:00
Ricardo Cervera
aa74347713
am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
...
* commit 'c190e7ee015202b6bc2be08a3c874efaf42b779f':
docs: Fix the circularReveal example.
2014-11-04 19:16:48 +00:00
Tom Taylor
7c57034608
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 '47419a443591ea3c641da8720514e1384dd75440':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 19:14:26 +00:00
Tom Taylor
47419a4435
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 '192a39044290be84a1086a876a9d4ab0571ab97b':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 19:08:16 +00:00
Tom Taylor
192a390442
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 '23fb29723c47b2aeb6aecc382a503630a8d8e983':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 19:00:42 +00:00
Wale Ogunwale
d54b578e47
Fix issue #17305377 : Don't kill process if it still has tasks.
...
We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.
Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.
Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
2014-11-04 10:59:31 -08:00
Jeff Davidson
161977998f
Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
...
This is necessary/desired for two reasons:
1. UX around network scoring shipped with L despite lacking underlying
platform support. We do not want network scoring applications to
trigger this UX on L devices, and therefore we must break the contract
of what defines a network scorer so that apps build against the new
contract don't trigger the old UX.
2. As a start towards generalizing the term "score" for a potentially
broader role in the future, though that role is very much undefined.
Bug: 18160480
Change-Id: If228977513e32e45bc44dbeda24aa18436fdfca6
2014-11-04 10:55:49 -08:00
Tom Taylor
23fb29723c
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 'd7044fe1f12b48cc7ba6803772ec4a2f2fe14c19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 18:50:31 +00:00
Tom Taylor
d7044fe1f1
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 'b2e54c1b46c275d017fb5bef17add3eb4c465508':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 18:39:38 +00:00
Tom Taylor
b2e54c1b46
am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '75e7fbaa83448753a1db9647e58693f1a281900c':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 18:30:23 +00:00
Tom Taylor
75e7fbaa83
am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '37906e6ebc1985ad4b7151116b7cf4fef8322b19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 18:23:51 +00:00
Tom Taylor
37906e6ebc
am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '44f6d0d5810ce507394cc514481d977315d2496f':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 18:18:16 +00:00
Sreeram Ramachandran
0f8f120839
Don't use framework permission strings for netd permissions.
...
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
2014-11-04 10:15:03 -08:00
Scott Kennedy
4b28b1c3f5
am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
...
* commit 'cf57296da6a22bff03eefda7b704787769ad4d37':
Fix a small typo in a variable name
2014-11-04 18:12:05 +00:00
Tom Taylor
44f6d0d581
am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '4c5b16d7409bbd947af3e0dadf4b1901b48e4cd7':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 18:11:02 +00:00
Ricardo Cervera
c190e7ee01
am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
...
* commit 'af002b352ade0d7f9eeff15221f487c3912ebb34':
docs: Fix the circularReveal example.
2014-11-04 18:07:11 +00:00
Scott Kennedy
cf57296da6
am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
...
* commit 'd78ce50372ec473b6a895d053f9ffc2956e933ef':
Fix a small typo in a variable name
2014-11-04 18:06:32 +00:00
Tom Taylor
4c5b16d740
am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '66aa87ae0355a4e6c8ed56704fec4fb225ed18f6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 18:03:07 +00:00
Scott Kennedy
d78ce50372
Merge "Fix a small typo in a variable name" into lmp-docs
2014-11-04 18:01:28 +00:00
Ricardo Cervera
af002b352a
am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
...
* commit '61f91724a9375732cd95333921388a3e5a64ac33':
docs: Fix the circularReveal example.
2014-11-04 18:00:56 +00:00
Ricardo Cervera
61f91724a9
Merge "docs: Fix the circularReveal example." into lmp-docs
2014-11-04 17:56:22 +00:00
Tom Taylor
66aa87ae03
am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '90743d6409eaecdc869fdcf891ffff8b0a5757ec':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 17:53:14 +00:00
Tom Taylor
db864e4ddc
am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '5244937248b7283b5cf586b5637a108579217d4e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 17:49:26 +00:00
Tom Taylor
90743d6409
am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit 'bfb7ffeb3e240784c1ea2a50187c120e6445b20e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 17:43:41 +00:00
Tom Taylor
5244937248
am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit 'bc57a1f81317f765865e3e0c00d3421a3084955e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-04 17:42:20 +00:00
Ricardo Cervera
2871e05b48
docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
...
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
2014-11-04 09:36:12 -08:00
Eric Laurent
fe91d4e6a2
Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev
2014-11-04 17:02:25 +00:00
Jorim Jaggi
6fd88022c2
Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev
2014-11-04 16:54:12 +00:00
Adrian Roos
e94a84d2a7
Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev
2014-11-04 16:40:38 +00:00
Adrian Roos
261d5ab8f4
Refactor LockSettingsService into storage and logic
...
Creates a new LockSettingsStorage class to handle
stroring and retreiving data.
Bug: 18163444
Change-Id: Ia3bc4ad679c5e1217756ae6b3b80cfce3599baed
2014-11-04 17:38:20 +01:00