drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,315 Commits 1 Branch 0 Tags
Commit Graph

152315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
7fe95529e6 Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 2014-10-02 11:05:21 +00:00
Deepanshu Gupta
107e1fb4b8 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]
 2014-10-02 08:51:09 +00:00
Deepanshu Gupta
d3adf40ee0 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]
 2014-10-02 08:51:06 +00:00
Deepanshu Gupta
ba526a2888 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]
 2014-10-02 08:51:02 +00:00
Deepanshu Gupta
a9787de33c 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]
 2014-10-02 08:50:58 +00:00
Deepanshu Gupta
75f2f99339 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]
 2014-10-02 08:50:54 +00:00
Deepanshu Gupta
473a270852 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]
 2014-10-02 08:50:51 +00:00
Deepanshu Gupta
d24b45c807 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]
 2014-10-02 08:50:47 +00:00
Deepanshu Gupta
42099d45c3 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]
 2014-10-02 08:50:43 +00:00
Deepanshu Gupta
b183c1812b 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]
 2014-10-02 08:50:38 +00:00
Deepanshu Gupta
9eb0cd1274 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]
 2014-10-02 08:50:34 +00:00
Deepanshu Gupta
82eecaf826 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]
 2014-10-02 08:50:31 +00:00
Justin Koh
f7aac12e1b 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
 2014-10-02 08:50:27 +00:00
Andreas Gampe
c152c7aad6 Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev 2014-10-02 08:45:47 +00:00
Andreas Gampe
16626a7ee9 Revert "Frameworks/base: Update to preloaded-classes" 
Breaks shamu for unknown reason.

This reverts commit da3050614fc9dc31d39ff87ae5df0261fb76f93c.

Bug: 17480683
Change-Id: Id10ff18ef6e3acb5eb84196f7e5608add7edeb66
 2014-10-02 08:45:09 +00:00
Sreeram Ramachandran
5aaabc0fa6 Merge "Send app permissions to netd." into lmp-dev 2014-10-02 06:26:27 +00:00
Deepanshu Gupta
ae74287e03 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]
 2014-10-02 03:38:44 +00:00
Deepanshu Gupta
ae4cb17a14 am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 
* commit '76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97':
  Resource resolution bug fix. [DO NOT MERGE]
 2014-10-02 03:34:24 +00:00
Deepanshu Gupta
d00d2ff207 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]
 2014-10-02 03:34:19 +00:00
Deepanshu Gupta
735229c5a8 am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev 
* commit '52af468b5e0b6daa1906694b37584366d616159f':
  Update intelliJ copyright profile [DO NOT MERGE]
 2014-10-02 03:34:14 +00:00
Deepanshu Gupta
925abb6d98 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]
 2014-10-02 03:34:10 +00:00
Deepanshu Gupta
a21ca34494 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]
 2014-10-02 03:34:06 +00:00
Deepanshu Gupta
93bf0696e7 am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 
* commit '541e6e5d47b928f3cd73f9e8f1da83ff722892c8':
  Build layoutlib_create tests. [DO NOT MERGE]
 2014-10-02 03:34:01 +00:00
Deepanshu Gupta
ddbd9bec76 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]
 2014-10-02 03:33:57 +00:00
Deepanshu Gupta
1cbf17f765 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]
 2014-10-02 03:33:53 +00:00
Deepanshu Gupta
d332ff3e3f 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]
 2014-10-02 03:33:48 +00:00
Deepanshu Gupta
c2ffb54fe2 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]
 2014-10-02 03:33:42 +00:00
Deepanshu Gupta
fca5e5577f Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:32:28 +00:00
Deepanshu Gupta
7b13c4d8ec Merge "Always resolve enum when resolving resources." into lmp-dev 2014-10-02 03:27:42 +00:00
Deepanshu Gupta
76aff1f6ab Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:49 +00:00
Deepanshu Gupta
5793383457 Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:43 +00:00
Deepanshu Gupta
52af468b5e Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:38 +00:00
Deepanshu Gupta
891f38d181 Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:32 +00:00
Deepanshu Gupta
a2f088b677 Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:22 +00:00
Deepanshu Gupta
541e6e5d47 Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:08 +00:00
Deepanshu Gupta
2d77fad26b Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:03 +00:00
Deepanshu Gupta
ffa4115a0e Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:25:44 +00:00
Deepanshu Gupta
bae6442159 Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:25:37 +00:00
Deepanshu Gupta
60f3676e08 Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:25:32 +00:00
Sreeram Ramachandran
e4a05afe85 Send app permissions to netd. 
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
 2014-10-01 20:22:34 -07:00
smain@google.com
77c81df2a2 fix confusing sentence 
https://memegen.googleplex.com/5524829602054144

Change-Id: I451c167bd1aedbde4b0e676f5f74a9dacb20fc10
 2014-10-02 01:26:59 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +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
Jeff Sharkey
f178591f26 Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev 2014-10-01 23:43:57 +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
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