OSDN Git Service
Deepanshu Gupta [Thu, 2 Oct 2014 09:42:49 +0000 (09:42 +0000)]
am
a9787de3: am
735229c5: (-s ours) am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
a9787de33c703fbfbb89b02d9d3d5642305084f8':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:42:45 +0000 (09:42 +0000)]
am
75f2f993: am
925abb6d: (-s ours) am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
75f2f993392a3903d160e7fed81c0b7ff5cf76f1':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:42:41 +0000 (09:42 +0000)]
am
473a2708: am
a21ca344: (-s ours) am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
473a270852c4316f9840f5190b1cdde8db9e1fef':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:42:37 +0000 (09:42 +0000)]
am
d24b45c8: am
93bf0696: (-s ours) am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
d24b45c807aa788bbb25647166d155d0ed385ddf':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:42:33 +0000 (09:42 +0000)]
am
42099d45: am
ddbd9bec: (-s ours) am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
42099d45c3f39989c9c4ec1a5f67206f9c23342b':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:42:29 +0000 (09:42 +0000)]
am
b183c181: am
1cbf17f7: (-s ours) am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
b183c1812b76411161e9f71a313d2f6384ab9162':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:42:26 +0000 (09:42 +0000)]
am
9eb0cd12: am
d332ff3e: (-s ours) am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
9eb0cd12742bdd6098932eedfd33a0b14f2196c9':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:42:22 +0000 (09:42 +0000)]
am
82eecaf8: am
c2ffb54f: (-s ours) am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
82eecaf826ab06c4f3cb0716a009ff0c8ae00711':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Justin Koh [Thu, 2 Oct 2014 09:42:18 +0000 (09:42 +0000)]
am
f7aac12e: am
bf6f081c: (-s ours) am
37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '
f7aac12e1bc766a4357ca29d2f248eef265097f8':
DO NOT MERGE Hide the volume panel for watches for now
Andreas Gampe [Thu, 2 Oct 2014 09:42:14 +0000 (09:42 +0000)]
am
c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev
* commit '
c152c7aad6ece42d101aede8efe9cdb5ea3f5a3c':
Revert "Frameworks/base: Update to preloaded-classes"
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:58 +0000 (08:50 +0000)]
am
735229c5: (-s ours) am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
735229c5a8286f1ecff5cf54d9ce2c06d7f97d51':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:54 +0000 (08:50 +0000)]
am
925abb6d: (-s ours) am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
925abb6d983aef0016b5828349d53cc5a11ebad8':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:51 +0000 (08:50 +0000)]
am
a21ca344: (-s ours) am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
a21ca3449457c5a80b5f06ca9a1fe7b17eb33bff':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:47 +0000 (08:50 +0000)]
am
93bf0696: (-s ours) am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
93bf0696e74282fea614120f7e26951111150e48':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:43 +0000 (08:50 +0000)]
am
ddbd9bec: (-s ours) am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
ddbd9bec76036fb2ce9f1cd1b7ccb70bd859a1a5':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:38 +0000 (08:50 +0000)]
am
1cbf17f7: (-s ours) am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
1cbf17f7654d5ddb66ce76e0f50fe7f170726e20':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:34 +0000 (08:50 +0000)]
am
d332ff3e: (-s ours) am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
d332ff3e3f647b9514ecff1f146464fbc1a93372':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:31 +0000 (08:50 +0000)]
am
c2ffb54f: (-s ours) am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
c2ffb54fe29d5fcbdd866fd304a9e97af825221a':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Justin Koh [Thu, 2 Oct 2014 08:50:27 +0000 (08:50 +0000)]
am
bf6f081c: (-s ours) am
37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '
bf6f081cda7360810645cf6bf932687df1cfae00':
DO NOT MERGE Hide the volume panel for watches for now
Andreas Gampe [Thu, 2 Oct 2014 08:45:45 +0000 (08:45 +0000)]
Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev
Andreas Gampe [Thu, 2 Oct 2014 08:42:00 +0000 (08:42 +0000)]
Revert "Frameworks/base: Update to preloaded-classes"
Breaks shamu for unknown reason.
This reverts commit
da3050614fc9dc31d39ff87ae5df0261fb76f93c.
Bug:
17480683
Change-Id: Id10ff18ef6e3acb5eb84196f7e5608add7edeb66
Andreas Gampe [Thu, 2 Oct 2014 07:07:13 +0000 (07:07 +0000)]
am
152d9aae: am
31629651: Merge "Frameworks/base: Fix more aapt issues"
* commit '
152d9aae631381ea28f5701168d372a1486a7502':
Frameworks/base: Fix more aapt issues
Andreas Gampe [Thu, 2 Oct 2014 07:01:55 +0000 (07:01 +0000)]
am
31629651: Merge "Frameworks/base: Fix more aapt issues"
* commit '
316296511bf12c4e14dfb6f54731d1a515114abf':
Frameworks/base: Fix more aapt issues
Andreas Gampe [Thu, 2 Oct 2014 06:58:38 +0000 (06:58 +0000)]
Merge "Frameworks/base: Fix more aapt issues"
Andreas Gampe [Thu, 2 Oct 2014 06:36:41 +0000 (06:36 +0000)]
Merge "resolved conflicts for merge of
1dcc75b2 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
Andreas Gampe [Thu, 2 Oct 2014 06:34:43 +0000 (23:34 -0700)]
resolved conflicts for merge of
1dcc75b2 to lmp-dev-plus-aosp
Change-Id: I8e1c6ee2025b6acd90803545fb95ab1b98560d92
Sreeram Ramachandran [Thu, 2 Oct 2014 06:29:39 +0000 (06:29 +0000)]
am
5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
* commit '
5aaabc0fa66dd755843f040fe634962477107950':
Send app permissions to netd.
Sreeram Ramachandran [Thu, 2 Oct 2014 06:26:26 +0000 (06:26 +0000)]
Merge "Send app permissions to netd." into lmp-dev
Andreas Gampe [Thu, 2 Oct 2014 02:07:51 +0000 (19:07 -0700)]
Frameworks/base: Fix more aapt issues
Change-Id: I6da7dc674e9f9e3b0886a3cfd1e3194d6b5ac948
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:14 +0000 (03:34 +0000)]
am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
52af468b5e0b6daa1906694b37584366d616159f':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:10 +0000 (03:34 +0000)]
am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
891f38d181505406298bb3b922a33e24de6aaf02':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:06 +0000 (03:34 +0000)]
am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
a2f088b6775f0cd0a8b7e3b35e16f13de3f67b01':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:01 +0000 (03:34 +0000)]
am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
541e6e5d47b928f3cd73f9e8f1da83ff722892c8':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:57 +0000 (03:33 +0000)]
am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
2d77fad26b0fa2203366d08aeccec9b564a70647':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:53 +0000 (03:33 +0000)]
am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
ffa4115a0ed065d816171c68609cd738672f5e51':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:48 +0000 (03:33 +0000)]
am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
bae6442159838206d826775bcebf92fa86f64a93':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:42 +0000 (03:33 +0000)]
am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
60f3676e087db7baa8e67b9cbd18cffc90c4ac09':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:30:45 +0000 (03:30 +0000)]
am
7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev
* commit '
7b13c4d8ecc517ae64cc5bd14c40eaef29e8281c':
Always resolve enum when resolving resources.
Deepanshu Gupta [Thu, 2 Oct 2014 03:27:41 +0000 (03:27 +0000)]
Merge "Always resolve enum when resolving resources." into lmp-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:37 +0000 (03:26 +0000)]
Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:31 +0000 (03:26 +0000)]
Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:21 +0000 (03:26 +0000)]
Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:04 +0000 (03:26 +0000)]
Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:02 +0000 (03:26 +0000)]
Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:42 +0000 (03:25 +0000)]
Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:36 +0000 (03:25 +0000)]
Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:31 +0000 (03:25 +0000)]
Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
Sreeram Ramachandran [Wed, 24 Sep 2014 16:16:19 +0000 (09:16 -0700)]
Send app permissions to netd.
Based largely off Robert's http://ag/546170 (thanks!)
Bug:
15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
Dianne Hackborn [Thu, 2 Oct 2014 00:27:28 +0000 (00:27 +0000)]
am
c338784b: Merge "More work on issue #
17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '
c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
More work on issue #
17656716: Unhandled exception in Window Manager
Dianne Hackborn [Thu, 2 Oct 2014 00:23:17 +0000 (00:23 +0000)]
Merge "More work on issue #
17656716: Unhandled exception in Window Manager" into lmp-dev
Erik Pasternak [Thu, 2 Oct 2014 00:04:16 +0000 (00:04 +0000)]
am
4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
* commit '
4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
Implement auto-sleep functionality.
Erik Pasternak [Thu, 2 Oct 2014 00:00:39 +0000 (00:00 +0000)]
Merge "Implement auto-sleep functionality." into lmp-dev
Dianne Hackborn [Wed, 1 Oct 2014 21:59:58 +0000 (14:59 -0700)]
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
Jeff Sharkey [Wed, 1 Oct 2014 23:49:17 +0000 (23:49 +0000)]
am
f178591f: Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
* commit '
f178591f26a535ec3cffa3520c3ca387ec44959b':
Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
Jeff Sharkey [Wed, 1 Oct 2014 23:43:55 +0000 (23:43 +0000)]
Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
Andreas Gampe [Wed, 1 Oct 2014 23:38:25 +0000 (23:38 +0000)]
am
0ce259c2: Merge "Frameworks/base: Fix AAPT warnings"
* commit '
0ce259c2f69cefd09342a95fbbd4c1a63a0af484':
Frameworks/base: Fix AAPT warnings
Andreas Gampe [Wed, 1 Oct 2014 23:34:31 +0000 (23:34 +0000)]
Merge "Frameworks/base: Fix AAPT warnings"
Dianne Hackborn [Wed, 1 Oct 2014 23:33:55 +0000 (23:33 +0000)]
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.
ztenghui [Wed, 1 Oct 2014 23:33:51 +0000 (23:33 +0000)]
am
f9033048: Merge "+ correcting shadow visual appearance (b/
17610926)" into lmp-dev
* commit '
f903304896809039430c5e52bd0c24052f51b14f':
+ correcting shadow visual appearance (b/
17610926)
Dianne Hackborn [Wed, 1 Oct 2014 23:29:48 +0000 (23:29 +0000)]
Merge "Fix issue #
17740687: Device does not boot after flashing LMP dev TOT(
1478825) build." into lmp-dev
ztenghui [Wed, 1 Oct 2014 23:29:31 +0000 (23:29 +0000)]
Merge "+ correcting shadow visual appearance (b/
17610926)" into lmp-dev
Svetoslav [Wed, 1 Oct 2014 23:29:15 +0000 (23:29 +0000)]
am
d35b072d: Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev
* commit '
d35b072dca42d249c219c886322c122739b086d7':
Fix accessiblity introspection from the shell user regression.
Dianne Hackborn [Wed, 1 Oct 2014 23:29:10 +0000 (23:29 +0000)]
am
144508d5: Merge "Revert white space changes." into lmp-dev
* commit '
144508d5da4dec37183617ec259ab83d2db4f012':
Revert white space changes.
Jeff Sharkey [Wed, 1 Oct 2014 23:02:05 +0000 (16:02 -0700)]
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
Svetoslav [Wed, 1 Oct 2014 23:24:46 +0000 (23:24 +0000)]
Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev
Dianne Hackborn [Wed, 1 Oct 2014 23:21:10 +0000 (23:21 +0000)]
Merge "Revert white space changes." into lmp-dev
Andreas Gampe [Wed, 1 Oct 2014 03:55:57 +0000 (20:55 -0700)]
Frameworks/base: Fix AAPT warnings
Turn on -Wall -Werror. Fix warnings.
Change-Id: I287fb3c1e851c654479bcf9ea8c73bd354a6b2a1
ztenghui [Wed, 1 Oct 2014 23:10:16 +0000 (16:10 -0700)]
+ 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
Stephen Hines [Wed, 1 Oct 2014 23:01:40 +0000 (23:01 +0000)]
am
70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev
* commit '
70de9c0d585dcfe71e2cfd921438071e69ff5c45':
include direct.h for _mkdir
Winson Chung [Wed, 1 Oct 2014 23:01:36 +0000 (23:01 +0000)]
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)
Stephen Hines [Wed, 1 Oct 2014 22:53:59 +0000 (22:53 +0000)]
Merge "include direct.h for _mkdir" into lmp-dev
Winson Chung [Wed, 1 Oct 2014 22:53:27 +0000 (22:53 +0000)]
Merge "Fixing invalid check to get component enabled state. (Bug
17679693)" into lmp-dev
Dianne Hackborn [Wed, 1 Oct 2014 22:53:28 +0000 (15:53 -0700)]
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
Hui Shu [Wed, 1 Oct 2014 22:39:00 +0000 (22:39 +0000)]
am
4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev
* commit '
4e0ad44fcac48b2be77bd116ffdb696cb6490829':
Revert "Remove WebView DRP Setting from Developer Settings"
wsmlby [Wed, 1 Oct 2014 22:38:41 +0000 (22:38 +0000)]
am
7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev
* commit '
7e1ae00c5e34d50500cf00c83e41d589b61b88b9':
Throw error when no intent can be found
Patrick Tjin [Wed, 1 Oct 2014 22:38:31 +0000 (22:38 +0000)]
am
dea847c2: Skip over directories when iterating tombstones
* commit '
dea847c2ace8894a595cf9bd87764ce2ca9698ab':
Skip over directories when iterating tombstones
John Spurlock [Wed, 1 Oct 2014 22:38:16 +0000 (22:38 +0000)]
am
c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev
* commit '
c403a340cbb097a95b35b198b27cf44c80a7242e':
Doze: Route volume keys to music only while pulsing.
Winson Chung [Wed, 1 Oct 2014 22:38:02 +0000 (22:38 +0000)]
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 - Disable the debug mode o
* commit '
d092fc7076310fca5edd089df5bb5398096f6627':
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
Andreas Gampe [Wed, 1 Oct 2014 22:37:55 +0000 (22:37 +0000)]
am
bf417b4d: Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev
* commit '
bf417b4d384d2c55609a87a6f0529d57918b2c55':
Frameworks/base: Update to preloaded-classes
John Reck [Wed, 1 Oct 2014 22:37:41 +0000 (22:37 +0000)]
am
8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev
* commit '
8786a962f0aa9991e0bc668eb7d9eae45645409e':
Re-allow suppressing onDetachedFromWindow
Adam Powell [Wed, 1 Oct 2014 22:37:27 +0000 (22:37 +0000)]
am
c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
* commit '
c6a06d437cf2ee7926a01b2f8ee685555bfb3d81':
Revert "Fix issue with using locally defined attrs in a shared lib"
Hui Shu [Wed, 1 Oct 2014 22:37:23 +0000 (22:37 +0000)]
am
aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '
aee5c9e7c1f61126c61722a957daedf57cf26e7e':
Remove WebView DRP Setting from Developer Settings
kmccormick [Wed, 1 Oct 2014 22:36:57 +0000 (22:36 +0000)]
am
04e50c47: am
d1ba4c13: am
ae3bd63b: am
a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '
04e50c474ce5b6aa2e366bc057a29a16467a66bd':
Doc update: Update preprod (staging) instructions.
Ihab Awad [Wed, 1 Oct 2014 22:36:52 +0000 (22:36 +0000)]
am
24199873: Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev
* commit '
24199873ca3297555909914f92e3cab97169b057':
Refine implementation of GSM conferences (1/3)
Craig Mautner [Wed, 1 Oct 2014 22:36:47 +0000 (22:36 +0000)]
am
245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev
* commit '
245645ca460150b4030d84c88faa931345a90a50':
Don't clear visible-behind activity if it is top
Selim Cinek [Wed, 1 Oct 2014 22:36:07 +0000 (22:36 +0000)]
am
15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev
* commit '
15b2202bacdfcc249d7f51bcd3361e6694d24267':
Adapting translation length for a string in a dialog
Baligh Uddin [Wed, 1 Oct 2014 22:36:04 +0000 (22:36 +0000)]
am
ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ff99ff98cc1ab526c585992b8d1b48128677b192':
Import translations. DO NOT MERGE
John Spurlock [Wed, 1 Oct 2014 22:35:59 +0000 (22:35 +0000)]
am
c909e1b2: Zen: Fix new event category check.
* commit '
c909e1b2dfa2e47b786d96818f70f6308c5a78be':
Zen: Fix new event category check.
Narayan Kamath [Wed, 1 Oct 2014 22:35:50 +0000 (22:35 +0000)]
am
7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev
* commit '
7dc7f676d699c739128dcc7855cbc0dacddaaa57':
Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
Baligh Uddin [Wed, 1 Oct 2014 22:35:15 +0000 (22:35 +0000)]
am
42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
42d0c353ffbd4aa506025a60806348dd07d4082f':
Import translations. DO NOT MERGE
Brian Carlstrom [Wed, 1 Oct 2014 22:35:11 +0000 (22:35 +0000)]
am
7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev
* commit '
7123bd690fa14d0b9e33f5a70c58ea5b5f1b7d32':
Use VMRuntime.isBootClassPathOnDisk
Ricardo Cervera [Wed, 1 Oct 2014 22:34:53 +0000 (22:34 +0000)]
am
1ed09f9b: am
e906b38b: am
781c988a: am
ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '
1ed09f9b5bd7073f1a574499461dfbd47669da09':
docs: ADT beginner text fix
Jeff Brown [Wed, 1 Oct 2014 22:34:44 +0000 (22:34 +0000)]
am
62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev
* commit '
62434d6a4b4b5aa7d44aa4344b5cb0f82df2b923':
Reduce latency from doze to screen on.
Sungsoo Lim [Wed, 1 Oct 2014 22:34:34 +0000 (22:34 +0000)]
am
ee33c661: Merge "Update java doc for content rating systems" into lmp-dev
* commit '
ee33c661ef7055213a8e3d6d02240aab77a82756':
Update java doc for content rating systems
Jerome Poichet [Wed, 1 Oct 2014 22:34:24 +0000 (22:34 +0000)]
am
72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev
* commit '
72079f7f9b644e57169e26597ec7c727786071a1':
Make sure cancel is called on tear down.
Wink Saville [Wed, 1 Oct 2014 22:29:55 +0000 (15:29 -0700)]
Merge commit '
62321ab1' into fix-merge-conflict-lmp-dev-plus-aosp
* commit '
62321ab1':
Maybe fix issue #
17700474: manta: high occurrence of device booted...
Conflicts:
services/core/java/com/android/server/am/ActivityManagerService.java
Change-Id: I7d472115d83a3dde326f991c245b2c6fed29e00c
Dianne Hackborn [Wed, 1 Oct 2014 22:09:51 +0000 (15:09 -0700)]
Revert white space changes.
Change-Id: I3bc9995adf5cefd91f5a9fd4d2a701056dba3ca9
Hui Shu [Wed, 1 Oct 2014 22:10:20 +0000 (22:10 +0000)]
Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev
Svetoslav [Wed, 1 Oct 2014 19:50:58 +0000 (12:50 -0700)]
Fix accessiblity introspection from the shell user regression.
Accessibility introspection APIs are meant to query only the state of
the current user. There are command line tools that run as the shell
user and want to be able to intropspect the screen. When resolving
the calling user we were using the calling user id instead of the
special constant for the current user.
Now when resolving the calling user for intrspection we are using
the current user constant and consequentially only the current
user or a profile of the current user or the root or the shell or
the system or an app with cross user permission can introspect the
screen.
bug:
17674631
Change-Id: I36d1d7b65441d04c3b4204123c4b6d036ff032c0
Winson Chung [Wed, 1 Oct 2014 21:30:05 +0000 (14:30 -0700)]
Fixing invalid check to get component enabled state. (Bug
17679693)
Change-Id: I225d59bf766122d667d990d7e5b1971c6e8af2aa