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

158146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
548bb3d352 Merge "resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-10-02 06:43:47 +00:00
Andreas Gampe
8daabceb2e resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp 
Change-Id: I8e1c6ee2025b6acd90803545fb95ab1b98560d92
 2014-10-01 23:35:41 -07:00
Sreeram Ramachandran
06b4f45899 am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.
 2014-10-02 06:29:39 +00:00
Sreeram Ramachandran
5aaabc0fa6 Merge "Send app permissions to netd." into lmp-dev 2014-10-02 06:26:27 +00:00
Andreas Gampe
b8dc7bc582 Frameworks/base: Fix more aapt issues 
Change-Id: I6da7dc674e9f9e3b0886a3cfd1e3194d6b5ac948
 2014-10-01 20:42:00 -07: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
9f905f37b2 am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev 
* commit '7b13c4d8ecc517ae64cc5bd14c40eaef29e8281c':
  Always resolve enum when resolving resources.
 2014-10-02 03:30:45 +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
e2aa87b8e2 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
 2014-10-02 00:27:28 +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
9d96c9fa05 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
 2014-10-02 00:04:16 +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
7e46456dc3 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:49:17 +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
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
Andreas Gampe
0ce259c2f6 Merge "Frameworks/base: Fix AAPT warnings" 2014-10-01 23:34:31 +00:00
Dianne Hackborn
383ce6dc74 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:33:55 +00:00
ztenghui
6d0eaf45a9 am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit 'f903304896809039430c5e52bd0c24052f51b14f':
  + correcting shadow visual appearance (b/17610926)
 2014-10-01 23:33:51 +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
Svetoslav
c2197ade81 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:29:15 +00:00
Dianne Hackborn
fa44e586b3 am 144508d5: Merge "Revert white space changes." into lmp-dev 
* commit '144508d5da4dec37183617ec259ab83d2db4f012':
  Revert white space changes.
 2014-10-01 23:29:10 +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
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