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

158021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
95fc18f38b am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev 
* commit '70de9c0d585dcfe71e2cfd921438071e69ff5c45':
  include direct.h for _mkdir
 2014-10-01 23:01:40 +00:00
Winson Chung
010447561a 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 23:01:36 +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
00207f564d am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:39:00 +00:00
wsmlby
f8694251f4 am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev 
* commit '7e1ae00c5e34d50500cf00c83e41d589b61b88b9':
  Throw error when no intent can be found
 2014-10-01 22:38:41 +00:00
Patrick Tjin
df670e7347 am dea847c2: Skip over directories when iterating tombstones 
* commit 'dea847c2ace8894a595cf9bd87764ce2ca9698ab':
  Skip over directories when iterating tombstones
 2014-10-01 22:38:31 +00:00
John Spurlock
b208f618cf 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.
 2014-10-01 22:38:16 +00:00
Winson Chung
3515d34b0d 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
 2014-10-01 22:38:02 +00:00
Andreas Gampe
d0435267a3 am bf417b4d: Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev 
* commit 'bf417b4d384d2c55609a87a6f0529d57918b2c55':
  Frameworks/base: Update to preloaded-classes
 2014-10-01 22:37:55 +00:00
John Reck
5451afcae7 am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '8786a962f0aa9991e0bc668eb7d9eae45645409e':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 22:37:41 +00:00
Adam Powell
e4275843fe 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"
 2014-10-01 22:37:27 +00:00
Hui Shu
4979a6ade1 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:37:23 +00:00
kmccormick
ec1aa9f38e 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.
 2014-10-01 22:36:57 +00:00
Ihab Awad
c7d8e8bd5f am 24199873: Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev 
* commit '24199873ca3297555909914f92e3cab97169b057':
  Refine implementation of GSM conferences (1/3)
 2014-10-01 22:36:52 +00:00
Craig Mautner
6f357112f8 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
 2014-10-01 22:36:47 +00:00
Selim Cinek
9262cd1498 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
 2014-10-01 22:36:07 +00:00
Baligh Uddin
b159658657 am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ff99ff98cc1ab526c585992b8d1b48128677b192':
  Import translations. DO NOT MERGE
 2014-10-01 22:36:04 +00:00
John Spurlock
8994f2eb44 am c909e1b2: Zen: Fix new event category check. 
* commit 'c909e1b2dfa2e47b786d96818f70f6308c5a78be':
  Zen: Fix new event category check.
 2014-10-01 22:35:59 +00:00
Narayan Kamath
1ff5abdbb1 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
 2014-10-01 22:35:50 +00:00
Baligh Uddin
115225a694 am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '42d0c353ffbd4aa506025a60806348dd07d4082f':
  Import translations. DO NOT MERGE
 2014-10-01 22:35:15 +00:00
Brian Carlstrom
753f08f740 am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit '7123bd690fa14d0b9e33f5a70c58ea5b5f1b7d32':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 22:35:11 +00:00