OSDN Git Service
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:34 +0000 (09:30 +0000)]
am
107e1fb4: am
ae74287e: (-s ours) am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
107e1fb4b8ec4c16c5a6ed4635cb0acaea8e2b39':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:31 +0000 (09:30 +0000)]
am
d3adf40e: am
ae4cb17a: (-s ours) am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
d3adf40ee0845844ed132dd0b25ec0102b9bf919':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:28 +0000 (09:30 +0000)]
am
ba526a28: am
d00d2ff2: (-s ours) am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
ba526a288811bc6520ad9a70d57e7ef774bbb802':
Fix Tests after cherry picks. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:24 +0000 (09:30 +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:30:21 +0000 (09:30 +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:30:18 +0000 (09:30 +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:30:14 +0000 (09:30 +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:30:11 +0000 (09:30 +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:30:08 +0000 (09:30 +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:30:04 +0000 (09:30 +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:30:01 +0000 (09:30 +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:29:57 +0000 (09:29 +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:29:54 +0000 (09:29 +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:51:09 +0000 (08:51 +0000)]
am
ae74287e: (-s ours) am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
ae74287e036b432ca394cbc497386547b16c17ff':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:06 +0000 (08:51 +0000)]
am
ae4cb17a: (-s ours) am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
ae4cb17a14d2a66961728d3cbd907cdba3f2f6d6':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:02 +0000 (08:51 +0000)]
am
d00d2ff2: (-s ours) am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
d00d2ff2079ca4e77173e3389834416494c7900f':
Fix Tests after cherry picks. [DO NOT MERGE]
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
Sreeram Ramachandran [Thu, 2 Oct 2014 06:29:37 +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
Deepanshu Gupta [Thu, 2 Oct 2014 03:44:59 +0000 (03:44 +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:38:44 +0000 (03:38 +0000)]
am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
fca5e5577f3690b03e783e4208379011aec46d28':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:24 +0000 (03:34 +0000)]
am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:19 +0000 (03:34 +0000)]
am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
579338345721351313d4c3cd2a5114a0d135028d':
Fix Tests after cherry picks. [DO NOT MERGE]
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:32:27 +0000 (03:32 +0000)]
Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
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:48 +0000 (03:26 +0000)]
Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:43 +0000 (03:26 +0000)]
Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-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
Benson Huang [Tue, 23 Sep 2014 02:57:40 +0000 (10:57 +0800)]
[FM] Add FM permission to support FM radio app
Add FM permission like KK to support FM radio app.
Change-Id: Ifb76f63e3136a5f88306903fd28e9abbb01e69c9
Signed-off-by: Benson Huang <benson.huang@mediatek.com>
Conflicts:
data/etc/platform.xml
Dianne Hackborn [Thu, 2 Oct 2014 00:27:48 +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:01 +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:48:49 +0000 (23:48 +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
Dianne Hackborn [Wed, 1 Oct 2014 23:35:49 +0000 (23:35 +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:35:45 +0000 (23:35 +0000)]
am
f9033048: Merge "+ correcting shadow visual appearance (b/
17610926)" into lmp-dev
* commit '
f903304896809039430c5e52bd0c24052f51b14f':
+ correcting shadow visual appearance (b/
17610926)
Svetoslav [Wed, 1 Oct 2014 23:30:22 +0000 (23:30 +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: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
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
Dianne Hackborn [Wed, 1 Oct 2014 23:25:43 +0000 (23:25 +0000)]
am
144508d5: Merge "Revert white space changes." into lmp-dev
* commit '
144508d5da4dec37183617ec259ab83d2db4f012':
Revert white space changes.
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
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 22:59:30 +0000 (22:59 +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 22:59:26 +0000 (22:59 +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:15:20 +0000 (22:15 +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"
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
Jeff Brown [Wed, 1 Oct 2014 03:54:30 +0000 (20:54 -0700)]
Implement auto-sleep functionality.
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity. By default this
value is set to -1 which maintains today's existing behavior.
We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM. When the sleep timeout expires, the state is cleared and
the dream ends.
Bug:
17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
wsmlby [Wed, 1 Oct 2014 21:45:28 +0000 (21:45 +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
Hui Shu [Wed, 1 Oct 2014 21:41:07 +0000 (21:41 +0000)]
Revert "Remove WebView DRP Setting from Developer Settings"
This reverts commit
eb487c63017ae5cb0f3f35bf8b17c5f3bbb0f456.
Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
wsmlby [Wed, 1 Oct 2014 21:38:42 +0000 (21:38 +0000)]
Merge "Throw error when no intent can be found" into lmp-dev
Patrick Tjin [Wed, 1 Oct 2014 21:29:52 +0000 (21:29 +0000)]
am
dea847c2: Skip over directories when iterating tombstones
* commit '
dea847c2ace8894a595cf9bd87764ce2ca9698ab':
Skip over directories when iterating tombstones
Patrick Tjin [Wed, 1 Oct 2014 17:13:44 +0000 (10:13 -0700)]
Skip over directories when iterating tombstones
Bug:
17380601
Change-Id: Idb6e559a89c7438751bd7a52375b9789454e0334
wsmlby [Wed, 1 Oct 2014 19:47:25 +0000 (12:47 -0700)]
Throw error when no intent can be found
bug:
17396762
Change-Id: I10502d5d1e2332d9e6820ee645234c125e937b7a
John Spurlock [Wed, 1 Oct 2014 20:23:39 +0000 (20:23 +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.
John Spurlock [Wed, 1 Oct 2014 20:17:34 +0000 (20:17 +0000)]
Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev
Winson Chung [Wed, 1 Oct 2014 20:07:38 +0000 (20:07 +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
Winson Chung [Wed, 1 Oct 2014 20:03:18 +0000 (20:03 +0000)]
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 option" into lmp-dev
Andreas Gampe [Wed, 1 Oct 2014 19:49:53 +0000 (19:49 +0000)]
am
bf417b4d: Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev
* commit '
bf417b4d384d2c55609a87a6f0529d57918b2c55':
Frameworks/base: Update to preloaded-classes
Jeff Hao [Fri, 28 Mar 2014 18:33:53 +0000 (11:33 -0700)]
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Needed to bypass new access checks for fields, methods, and
constructors.
Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
(cherry picked from commit
e3abd2ccbef4c50b48df3605c65d732fa49a980b)
Andreas Gampe [Wed, 1 Oct 2014 19:46:08 +0000 (19:46 +0000)]
Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev
Deepanshu Gupta [Fri, 19 Sep 2014 21:29:02 +0000 (14:29 -0700)]
Resource resolution bug fix. [DO NOT MERGE]
Fix a bug where "?attr/foo" in framework resources wasn't resolved
properly.
Change-Id: I9a56974f526774fde79685f668f01021136d68f1
(cherry picked from commit
19c7842082d831ad432abe906f4c37c6ed08e414)
Deepanshu Gupta [Fri, 19 Sep 2014 18:48:58 +0000 (11:48 -0700)]
Fix Tests after cherry picks. [DO NOT MERGE]
1. Updated the intelliJ run configuration for the layoutlib_create tool.
2. Updated the code to search for the platform.dir.
3. Update tests to use AppTheme and Target SDK 19
Change-Id: I6f1cc6ff2a53e4474c746537029c7f89c6dd6dc1
(cherry picked from commit
8592eeafd01370d1a17e34602290becf7f611c75)
Deepanshu Gupta [Wed, 13 Aug 2014 19:30:40 +0000 (12:30 -0700)]
Update intelliJ copyright profile [DO NOT MERGE]
Change-Id: Ib9386b686cb24e1f187d0b636b59b4b13d59bbcd
(cherry picked from commit
91fa62ac67a5e294124b5bfb70b35addc7687c34)
Deepanshu Gupta [Tue, 9 Sep 2014 01:38:57 +0000 (18:38 -0700)]
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
LayoutLib Create tests are now built whenever LayoutLib create is built.
Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
(cherry picked from commit
4efe6264f1251fa200427f54ea6f5dd4c4d03665)