Scott Main
01dc133b35
am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed.
...
* commit 'f1bc39b8ae9d63f3c7d89f3d07ec026c62de6e6e':
fix code error. The data type was wrong, but it's actually not needed.
2014-05-06 23:50:27 +00:00
Winson Chung
5269a01c6d
Merge "Fixing regression in calculating which activities to apply recents values to."
2014-05-06 23:46:00 +00:00
Scott Main
f1bc39b8ae
fix code error.
...
The data type was wrong, but it's actually not needed.
Change-Id: I50275fd16c72de42b75f24be6192ca974bd67488
2014-05-06 16:34:30 -07:00
Adam Powell
f4a3941ebe
Clean up WindowInsets API for release
...
Hide window decor inset methods and rename the clone* methods to have
less baggage.
Bug 14566960
Change-Id: Ia06bb959fd77acd6ff69f337c3200047a529612a
2014-05-06 16:27:59 -07:00
Glenn Kasten
8547e7022e
Merge "Add AudioFormat.getBytesPerSample and use it"
2014-05-06 23:09:07 +00:00
Winson Chung
3aeaebb6fc
Fixing regression in calculating which activities to apply recents values to.
2014-05-06 15:44:36 -07:00
Heather Lee Wilson
9da8301e0a
Prevent crashing when disabling MCU during dream wakeup
...
AmbientMode attempting to send message to DozeHardware no longer results in an
uncaught IllegalStateException. The exception was crashing Android Wear when
DozeHardware had already been released by PowerManagementService at time of
AmbientMode's message.
Change-Id: I5956a453802b5b764e88638f6b6d899cbc94cc8d
2014-05-06 15:31:57 -07:00
Brian Carlstrom
7395a8ab8a
Add BackgroundDexOptService
...
Change-Id: I0439a04f693ba92df906cbda34f8e53b32f63329
2014-05-06 15:14:29 -07:00
Brian Carlstrom
ff1ec4d9e7
Use package usage information to decide what dex files to optimize in PackageManagerService
...
Change-Id: Iac137311e2e9d5139b5aa8651c6f3d296802612a
2014-05-06 15:06:25 -07:00
Kenny Root
2cfedd94b3
Unhide new SSL APIs
...
Change-Id: Ic58d5571754f434bb8f72b09329e8803d4343ba2
2014-05-06 15:00:45 -07:00
Martijn Coenen
2f6f3a0181
HCE/SE foreground support.
...
Allow apps to tell the OS they prefer a specific
CardEmulation service to handle a transaction
whenever they are in the foreground.
Change-Id: I8489ba6018f62164ed7e3504f31c8d09accf494e
2014-05-06 14:49:57 -07:00
Zhijun He
379af01292
Camera2: Add missing capture result tags
...
All capture request tags should be available in capture result.
Bug: 14059883
Change-Id: I0aa8d7341b14fbbd627b17eb316bb016ff1fc316
2014-05-06 21:46:27 +00:00
Tim Kilbourn
0652842400
am 1a556b99: (-s ours) am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev
...
* commit '1a556b996156b71bdbb60f6f9cd7bd3e16947a4f':
DO NOT MERGE Hide banner manifest attribute.
2014-05-06 21:26:56 +00:00
Tim Kilbourn
1a556b9961
am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev
...
* commit '17c5e990379baf887221c0776b4152613c2a8a2d':
DO NOT MERGE Hide banner manifest attribute.
2014-05-06 21:24:02 +00:00
Tim Kilbourn
17c5e99037
Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev
2014-05-06 21:21:37 +00:00
Dan Stoza
9bd01ef0c6
Merge "Enable changing display configuration"
2014-05-06 21:08:15 +00:00
RoboErik
e7880d8eb1
Add APIs for creating a system priority session and getting controllers
...
This adds a hidden call to set flags and a flag for making a session an
exclusive high priority session. This will cause all media button events
to be sent to that session as long as it is stillr egistered. This
requires the MODIFY_PHONE_STATE permission like the old forCalls API.
This also adds a way to get controllers for all the ongoing sessions.
This is protected by the MEDIA_CONTENT_CONTROL permission like the
old RemoteController APIs.
Change-Id: I51540e8dcf3a7dbe02a0f8ee003821e40af653a3
2014-05-06 14:06:29 -07:00
Jeff Brown
cedde01622
am a93369a8: (-s ours) am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
...
* commit 'a93369a819c9d4cfd4fe7ce3dd519f1c974bce4d':
Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
2014-05-06 20:34:12 +00:00
Jeff Brown
a93369a819
am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
...
* commit '84aaf124b762b9eeb0957aaea9df8424a429b148':
Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
2014-05-06 20:30:49 +00:00
Jeff Brown
996e269d93
Merge "Plumb display state and interactive information to BatteryStats."
2014-05-06 20:28:36 +00:00
Jeff Brown
84aaf124b7
Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
2014-05-06 20:27:34 +00:00
Adam Powell
5f97930fc5
am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev
...
* commit 'c41fa708271e204a7983aba291389ea1554227b2':
onWindowDismissed API cleanup
2014-05-06 20:24:23 +00:00
Jeff Brown
e95c3cd895
Plumb display state and interactive information to BatteryStats.
...
Fixes an issue where dozing was treated the same as the screen
being fully on. Now dozing is treated the same as the screen
being fully off which is slightly better. The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.
Removed noteInputEvent() since it is unused.
Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
2014-05-06 13:23:53 -07:00
Adam Powell
c41fa70827
am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev
...
* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
onWindowDismissed API cleanup
2014-05-06 20:20:40 +00:00
Jeff Brown
01ee6f6cf7
Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
...
Fixes an issue where dozing was treated the same as the screen
being fully on. Now dozing is treated the same as the screen
being fully off which is slightly better. The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.
Removed noteInputEvent() since it is unused.
Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
2014-05-06 13:18:19 -07:00
Adam Powell
a0516e7ad1
Merge "onWindowDismissed API cleanup" into klp-modular-dev
2014-05-06 20:17:31 +00:00
Chris Craik
55d47f6be8
Merge "Fix pivot update rejection logic"
2014-05-06 20:17:29 +00:00
Jorim Jaggi
ef3b18b101
Merge "Never close Keyguard automatically."
2014-05-06 20:01:43 +00:00
Tim Kilbourn
d689db4f0c
DO NOT MERGE Hide banner manifest attribute.
...
Bug: 14116162
Change-Id: I42a73183bee52286ff315fa5b0f58bfdfc020485
2014-05-06 12:02:42 -07:00
Dan Stoza
00101052b5
Enable changing display configuration
...
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.
Bug: 14320401
Change-Id: Ie4363bc8353d95428f1114ea48e5b1c8976e1730
2014-05-06 11:34:06 -07:00
Chris Craik
6c1787cfea
Fix pivot update rejection logic
...
bug:14228573
Change-Id: Ia4c88f878ce325ee961117cf255c971d9947d5c6
2014-05-06 11:02:39 -07:00
Tim Kilbourn
a2d106d470
Fix bad merge.
...
Change-Id: I4d3aa71f5a4ae13c01e57df25ae7f76d25384f5d
2014-05-06 10:54:00 -07:00
Eric Laurent
4a5eeb9c72
AudioService/WireAccessoryManager: change boot completion detection method
...
BOOT_COMPLETED intent is not a reliable way for system services
to detect boot completion. The intent broadcast can be significantly
delayed and there is no guaranty that system services
receive it before apps.
Use a systemReady() method called by SystemServer instead.
Bug: 14323903.
Change-Id: I781596a3545e7a1e719799982347cbcd9a4c9009
2014-05-06 10:49:04 -07:00
Tim Kilbourn
d06b29d0f7
am f7330ac7: am 989dab11: Update current.txt after hiding isGame.
...
* commit 'f7330ac754d02089dedef5d7191bde9a75b91c2c':
Update current.txt after hiding isGame.
2014-05-06 17:46:02 +00:00
Tim Kilbourn
23b0d53541
am a7b267b8: (-s ours) am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute.
...
* commit 'a7b267b81b611058ddf7c268f5d21705f5306047':
DO NOT MERGE Hide isGame manifest attribute.
2014-05-06 17:45:58 +00:00
Tim Kilbourn
f7330ac754
am 989dab11: Update current.txt after hiding isGame.
...
* commit '989dab11d1e34d5f49ac19345a3ce440d32d6f64':
Update current.txt after hiding isGame.
2014-05-06 17:42:36 +00:00
Tim Kilbourn
a7b267b81b
am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute.
...
* commit '0f3a98f5c93581cc511684b92e11e2ed2a17581e':
DO NOT MERGE Hide isGame manifest attribute.
2014-05-06 17:42:31 +00:00
Tim Kilbourn
989dab11d1
Update current.txt after hiding isGame.
...
Change-Id: I034126f464fdd759c19ff55000004d36463d9cd6
2014-05-06 10:40:24 -07:00
ztenghui
0b3a706188
Merge "First step on API cleaning on the VectorDrawable to disable animation support"
2014-05-06 17:12:34 +00:00
Jessica Hummel
96599a05ac
Disallow the INTERACT_ACROSS_USERS permission for system apps
...
This reverts a temporary hack which was required for a temporary launcher version to work for development purposes.
Change-Id: Ifd17447076bf5c67ad2ce8df8f184fe6f12baad3
2014-05-06 18:11:26 +01:00
Tim Kilbourn
0f3a98f5c9
DO NOT MERGE Hide isGame manifest attribute.
...
Bug: 14116162
Change-Id: I72a0210124f22009914a860097e286c5ea9af345
2014-05-06 09:49:56 -07:00
John Reck
ebb9e69513
Merge "Implement loadSystemProperties"
2014-05-06 16:17:13 +00:00
Glenn Kasten
34a37bdebb
Add AudioFormat.getBytesPerSample and use it
...
Change-Id: I90a40987ea99006af4a6e31136078c04976eb54d
2014-05-06 09:11:52 -07:00
Baligh Uddin
594b9dcc1a
am ddaacaa7: (-s ours) am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit 'ddaacaa7ceb6d41658eeea0079c9882510697dac':
Import translations. DO NOT MERGE
2014-05-06 14:59:03 +00:00
Baligh Uddin
ddaacaa7ce
am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '37c954c044b28b708528c074e7172a1bd91521eb':
Import translations. DO NOT MERGE
2014-05-06 14:54:27 +00:00
Baligh Uddin
37c954c044
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-05-06 14:49:57 +00:00
Baligh Uddin
dccbb6706b
Merge "Import translations. DO NOT MERGE"
2014-05-06 14:49:53 +00:00
Nicolas Prevot
ae949571f0
Merge "Cleaning code related to the forwarding intent filters."
2014-05-06 13:57:56 +00:00
Nicolas Prevot
834bb1cc37
Merge "Introducing removable and non-removable ForwardingIntentFilters."
2014-05-06 13:55:59 +00:00
Jorim Jaggi
fd4235f268
Merge "Fix overly huge PanelView."
2014-05-06 13:24:20 +00:00