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

157781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ricardo Cervera
d791d332b5 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
 2014-10-01 22:34:53 +00:00
Jeff Brown
c75d2ce970 am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '62434d6a4b4b5aa7d44aa4344b5cb0f82df2b923':
  Reduce latency from doze to screen on.
 2014-10-01 22:34:44 +00:00
Sungsoo Lim
fc6581d718 am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev 
* commit 'ee33c661ef7055213a8e3d6d02240aab77a82756':
  Update java doc for content rating systems
 2014-10-01 22:34:34 +00:00
Jerome Poichet
8be1828ae9 am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '72079f7f9b644e57169e26597ec7c727786071a1':
  Make sure cancel is called on tear down.
 2014-10-01 22:34:24 +00:00
Wink Saville
d1ac9bd2bd 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
 2014-10-01 15:29:55 -07:00
Dianne Hackborn
01945f240a Revert white space changes. 
Change-Id: I3bc9995adf5cefd91f5a9fd4d2a701056dba3ca9
 2014-10-01 15:14:28 -07:00
Hui Shu
4e0ad44fca Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 2014-10-01 22:10:23 +00:00
Svetoslav
ceac51dedd 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
 2014-10-01 15:07:27 -07:00
Winson Chung
dcf21d1545 Fixing invalid check to get component enabled state. (Bug 17679693) 
Change-Id: I225d59bf766122d667d990d7e5b1971c6e8af2aa
 2014-10-01 15:04:16 -07:00
Hui Shu
2267177279 Revert "Remove WebView DRP Setting from Developer Settings" 
This reverts commit eb487c63017ae5cb0f3f35bf8b17c5f3bbb0f456.

Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
 2014-10-01 21:41:07 +00:00
wsmlby
7e1ae00c5e Merge "Throw error when no intent can be found" into lmp-dev 2014-10-01 21:38:42 +00:00
Patrick Tjin
dea847c2ac Skip over directories when iterating tombstones 
Bug: 17380601
Change-Id: Idb6e559a89c7438751bd7a52375b9789454e0334
 2014-10-01 21:17:52 +00:00
wsmlby
6bd30ee1a2 Throw error when no intent can be found 
bug: 17396762

Change-Id: I10502d5d1e2332d9e6820ee645234c125e937b7a
 2014-10-01 20:57:55 +00:00
Dan Albert
864272f3eb resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aosp 
Change-Id: Iea93ad20b44f0183f1868f078dd7982b2798fcd3
 2014-10-01 13:47:12 -07:00
Dan Albert
fe50cfd533 am c46dbe8a: Merge "Use std::sort instead of qsort_r wrapper." 
* commit 'c46dbe8ac4748a0084b026524ad9e5ac44fb9fde':
  Use std::sort instead of qsort_r wrapper.
 2014-10-01 20:34:15 +00:00
Dan Albert
c46dbe8ac4 Merge "Use std::sort instead of qsort_r wrapper." 2014-10-01 20:30:52 +00:00
John Spurlock
c403a340cb Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 2014-10-01 20:17:36 +00:00
Winson Chung
d092fc7076 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 2014-10-01 20:03:19 +00:00