Erik Pasternak
d68362b962
am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
...
* commit 'c6646b0cb4ca34f1f0842b94367a5b34191f9976':
Implement auto-sleep functionality.
2014-10-02 00:14:41 +00:00
Erik Pasternak
c6646b0cb4
am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
...
* commit '739bf81dd130957c9bc09abc4e25732af2d675c0':
Implement auto-sleep functionality.
2014-10-02 00:09:47 +00:00
Erik Pasternak
739bf81dd1
am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
...
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
Implement auto-sleep functionality.
2014-10-02 00:04:01 +00:00
Jeff Sharkey
67c96fd710
am b6ea4676: am 3a14bc84: am f178591f: Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
...
* commit 'b6ea4676aa108e13c5f82361148796d285b7b5c9':
Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
2014-10-02 00:01:14 +00:00
Erik Pasternak
4d82c46ef5
Merge "Implement auto-sleep functionality." into lmp-dev
2014-10-02 00:00:40 +00:00
Dianne Hackborn
8d05172112
More work on issue #17656716 : Unhandled exception in Window Manager
...
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock. This was the original intention
of it, but part was missed.
Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it. And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing. So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.
Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.
Oh and fix a crash in the settings provider I noticed in APR.
Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
2014-10-01 16:58:56 -07:00
Alan Viverette
d3cf7420ee
Remove Holo fast scroll preview from Material overlay themes
...
These were supposed to be removed when we updated the fast scroll
preview background for Material.
BUG: 17765143
Change-Id: I596398ea2e105fef9c92545d16955e684d980f73
2014-10-01 16:54:19 -07:00
Jeff Sharkey
b6ea4676aa
am 3a14bc84: am f178591f: Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
...
* commit '3a14bc8430dbdafbf8d2484b0b4396034f78ae48':
Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
2014-10-01 23:54:04 +00:00
Jeff Sharkey
3a14bc8430
am f178591f: Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
...
* commit 'f178591f26a535ec3cffa3520c3ca387ec44959b':
Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
2014-10-01 23:48:49 +00:00
Alan Viverette
3c062db994
am a5ecdbb1: Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev
...
* commit 'a5ecdbb1a82f93a4feeefb2a905cb3881ab3bc3a':
Manage pressed state during drag-to-open
2014-10-01 23:46:58 +00:00
Dianne Hackborn
f96d125c56
am 84402777: am 9a4afb3f: am c3e7f87b: Merge "Fix issue #17740687 : Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev
...
* commit '84402777841a1e884d867ff1ccff301b3a49259a':
Fix issue #17740687 : Device does not boot after flashing LMP dev TOT(1478825) build.
2014-10-01 23:46:54 +00:00
ztenghui
3fb458653e
am 5f243860: am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev
...
* commit '5f243860a79ec158fc9f769bda7202dfd202da59':
+ correcting shadow visual appearance (b/17610926)
2014-10-01 23:46:50 +00:00
Jeff Sharkey
f178591f26
Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
2014-10-01 23:43:57 +00:00
Alan Viverette
a5ecdbb1a8
Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev
2014-10-01 23:43:03 +00:00
Svetoslav
0671790c28
am c088ecc3: am 304a3528: am d35b072d: Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev
...
* commit 'c088ecc390917f82cdd4898533e892070316350c':
Fix accessiblity introspection from the shell user regression.
2014-10-01 23:42:20 +00:00
Alan Viverette
62a8b61f92
Manage pressed state during drag-to-open
...
BUG: 17573390
Change-Id: Ia85d7b51d6e4a18dcbf99b930f9f7c045697a31b
2014-10-01 16:41:31 -07:00
Dianne Hackborn
8440277784
am 9a4afb3f: am c3e7f87b: Merge "Fix issue #17740687 : Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev
...
* commit '9a4afb3f5172cdd68e14fb0e48f48d619420cd89':
Fix issue #17740687 : Device does not boot after flashing LMP dev TOT(1478825) build.
2014-10-01 23:41:07 +00:00
ztenghui
5f243860a7
am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev
...
* commit '9ad17521ac073562991cddb78f14d6df8d5fd05a':
+ correcting shadow visual appearance (b/17610926)
2014-10-01 23:41:00 +00:00
Andreas Gampe
1dcc75b2db
am 0ce259c2: Merge "Frameworks/base: Fix AAPT warnings"
...
* commit '0ce259c2f69cefd09342a95fbbd4c1a63a0af484':
Frameworks/base: Fix AAPT warnings
2014-10-01 23:38:25 +00:00
Dianne Hackborn
def99c9da6
am 51bd2041: am bfa6190f: am 144508d5: Merge "Revert white space changes." into lmp-dev
...
* commit '51bd204112a032f7b65d90532e77400fc3a3f0fd':
Revert white space changes.
2014-10-01 23:36:34 +00:00
Svetoslav
c088ecc390
am 304a3528: am d35b072d: Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev
...
* commit '304a35287adc757562e03345dc17899522a43a35':
Fix accessiblity introspection from the shell user regression.
2014-10-01 23:36:26 +00:00
Dianne Hackborn
9a4afb3f51
am c3e7f87b: Merge "Fix issue #17740687 : Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev
...
* commit 'c3e7f87bf9930a20c37609f567f5d88305fb1ddd':
Fix issue #17740687 : Device does not boot after flashing LMP dev TOT(1478825) build.
2014-10-01 23:35:49 +00:00
ztenghui
9ad17521ac
am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev
...
* commit 'f903304896809039430c5e52bd0c24052f51b14f':
+ correcting shadow visual appearance (b/17610926)
2014-10-01 23:35:45 +00:00
Andreas Gampe
0ce259c2f6
Merge "Frameworks/base: Fix AAPT warnings"
2014-10-01 23:34:31 +00:00
Dianne Hackborn
51bd204112
am bfa6190f: am 144508d5: Merge "Revert white space changes." into lmp-dev
...
* commit 'bfa6190fcc5ac607bf7045963d57b06cc2b16207':
Revert white space changes.
2014-10-01 23:31:49 +00:00
Svetoslav
304a35287a
am d35b072d: Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev
...
* commit 'd35b072dca42d249c219c886322c122739b086d7':
Fix accessiblity introspection from the shell user regression.
2014-10-01 23:30:22 +00:00
Dianne Hackborn
c3e7f87bf9
Merge "Fix issue #17740687 : Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev
2014-10-01 23:29:49 +00:00
ztenghui
f903304896
Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev
2014-10-01 23:29:32 +00:00
Jeff Sharkey
270e1f4297
Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
...
Some system apps doing hotword training need low-level access to
audio hardware, beyond what the existing HAL offers. For now, give
them the audio GID.
Bug: 17763721
Change-Id: I8025c3abacae13a6ffec4e10e4976a67ab505bdf
2014-10-01 16:26:49 -07:00
Dianne Hackborn
bfa6190fcc
am 144508d5: Merge "Revert white space changes." into lmp-dev
...
* commit '144508d5da4dec37183617ec259ab83d2db4f012':
Revert white space changes.
2014-10-01 23:25:43 +00:00
Svetoslav
d35b072dca
Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev
2014-10-01 23:24:47 +00:00
Dianne Hackborn
144508d5da
Merge "Revert white space changes." into lmp-dev
2014-10-01 23:21:11 +00:00
Andreas Gampe
2412f84064
Frameworks/base: Fix AAPT warnings
...
Turn on -Wall -Werror. Fix warnings.
Change-Id: I287fb3c1e851c654479bcf9ea8c73bd354a6b2a1
2014-10-01 16:18:06 -07:00
Stephen Hines
25a8e43b13
am 7d92ae6d: am 5b3be618: am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev
...
* commit '7d92ae6d973cd93cf9034c2f38b964b329ca2eaf':
include direct.h for _mkdir
2014-10-01 23:14:53 +00:00
Winson Chung
7f54b3a914
am 6b59887e: am f7d4eb52: am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev
...
* commit '6b59887e57e37ef33c80a8dc93c0cfede55184cb':
Fixing invalid check to get component enabled state. (Bug 17679693)
2014-10-01 23:14:49 +00:00
ztenghui
8def74de33
+ correcting shadow visual appearance (b/17610926)
...
+ adjusting spot and ambient shadow opacity constants to achieve desired appearance
+ reducing ambient scale ratio back to 1.0 to address over-lightening at higher elevations
+ partially revert ag/546290
Change-Id: I9d7f664f73a7b9b83df73b739103c97054bd4f6e
2014-10-01 16:12:28 -07:00
Stephen Hines
7d92ae6d97
am 5b3be618: am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev
...
* commit '5b3be618b1063c95ea3d2be760f62edeaa89b00d':
include direct.h for _mkdir
2014-10-01 23:05:40 +00:00
Winson Chung
6b59887e57
am f7d4eb52: am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev
...
* commit 'f7d4eb52aef5670270d5ba727431d0b2411cbc58':
Fixing invalid check to get component enabled state. (Bug 17679693)
2014-10-01 23:05:36 +00:00
Stephen Hines
5b3be618b1
am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev
...
* commit '70de9c0d585dcfe71e2cfd921438071e69ff5c45':
include direct.h for _mkdir
2014-10-01 22:59:30 +00:00
Winson Chung
f7d4eb52ae
am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev
...
* commit '7f76e505624fddbc4ba3350f3e381ccd275a5a75':
Fixing invalid check to get component enabled state. (Bug 17679693)
2014-10-01 22:59:26 +00:00
Stephen Hines
70de9c0d58
Merge "include direct.h for _mkdir" into lmp-dev
2014-10-01 22:54:00 +00:00
Winson Chung
7f76e50562
Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev
2014-10-01 22:53:29 +00:00
Dianne Hackborn
9449a6162e
Fix issue #17740687 : Device does not boot after flashing LMP dev TOT(1478825) build.
...
There was a path through idle where we could clear mBooting but not set
mBooted, so we would no longer start activities. This is probably happening
because if you start a user or userdebug build with the device plugged in
to adb, the system early on starts the USB security dialog, before home is
started. If that goes idle first, we will end up in the case where we
clear booting (because something went idle) but not set booted (because it
was not home that went idle).
Change this so that we always set booted when clearing booting.
Change-Id: I40053710eefa939315aeb9475ecdd2e8a87351ff
2014-10-01 15:53:28 -07:00
Hui Shu
724fe35eac
am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev
...
* commit '5f961157c4480e3abbde0f80e5f682da4224b528':
Revert "Remove WebView DRP Setting from Developer Settings"
2014-10-01 22:38:53 +00:00
Hui Shu
5f961157c4
am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev
...
* commit '888fd710cd9ae569d47e1795f47e2ad909b5c8df':
Revert "Remove WebView DRP Setting from Developer Settings"
2014-10-01 22:25:53 +00:00
wsmlby
49049aef19
am 2e7aa675: am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev
...
* commit '2e7aa67585778cc4ef518ee259103c7dfd384ee9':
Throw error when no intent can be found
2014-10-01 22:23:33 +00:00
Patrick Tjin
d104aae815
am cae74017: am f7c59190: am dea847c2: Skip over directories when iterating tombstones
...
* commit 'cae740173f2797209bea31f3df23e6b664754498':
Skip over directories when iterating tombstones
2014-10-01 22:23:28 +00:00
John Spurlock
a0aa089bcf
am eac9f30c: am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev
...
* commit 'eac9f30c94fbfd0ca2db51c1e8f73c3605153062':
Doze: Route volume keys to music only while pulsing.
2014-10-01 22:23:24 +00:00
Winson Chung
983917288d
am 0dad6a07: am d8ab73d7: am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition
...
* commit '0dad6a0732633a11fa780135c3c1f52defac9f16':
Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
2014-10-01 22:23:20 +00:00
Andreas Gampe
dc12e1092e
am 7569294e: am 0a5f518e: am bf417b4d: Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev
...
* commit '7569294eb76106de3e4549e1589c1db2ce6ec554':
Frameworks/base: Update to preloaded-classes
2014-10-01 22:23:16 +00:00