Elliott Hughes
48dcf9d5f5
am d7d37256: am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()."
...
* commit 'd7d37256c4bab388e99dae5e16b80a59756cc97d':
Fix documentation for Parcel.readException().
2014-02-21 17:33:41 +00:00
Elliott Hughes
0047d3e025
am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."
...
* commit 'e253b514f4ef74a23c784d2cd893eb035d1c793f':
Miscellaneous small documentation fixes.
2014-02-21 17:33:38 +00:00
Elliott Hughes
d7d37256c4
am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()."
...
* commit 'b2f07b27725bed9716114c46df2cf636eb366f6f':
Fix documentation for Parcel.readException().
2014-02-21 17:28:54 +00:00
Elliott Hughes
e253b514f4
am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."
...
* commit '29d60b95fa8019c0542f46551057c4d376bb8a7a':
Miscellaneous small documentation fixes.
2014-02-21 17:28:51 +00:00
Elliott Hughes
b2f07b2772
am 4a809272: Merge "Fix documentation for Parcel.readException()."
...
* commit '4a80927241b3168d9d5138c46c22385d6467a736':
Fix documentation for Parcel.readException().
2014-02-21 09:25:54 -08:00
Elliott Hughes
29d60b95fa
am 8d41e653: Merge "Miscellaneous small documentation fixes."
...
* commit '8d41e653bae240488281d430309e2d501e9524e5':
Miscellaneous small documentation fixes.
2014-02-21 09:25:50 -08:00
Elliott Hughes
4a80927241
Merge "Fix documentation for Parcel.readException()."
2014-02-21 17:21:52 +00:00
Elliott Hughes
8d41e653ba
Merge "Miscellaneous small documentation fixes."
2014-02-21 17:19:21 +00:00
Craig Mautner
c72f5c2de5
am ec5c3b90: am c2c0a61c: Add copyright notice to files missing them.
...
* commit 'ec5c3b9040625e53e3f5cff1fe3d963b936065f0':
Add copyright notice to files missing them.
2014-02-21 17:01:48 +00:00
Craig Mautner
ec5c3b9040
am c2c0a61c: Add copyright notice to files missing them.
...
* commit 'c2c0a61cf5f779b4726f089f28d966c03ccbba54':
Add copyright notice to files missing them.
2014-02-21 16:55:55 +00:00
Narayan Kamath
a1aeac80df
am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"
...
* commit '25c55ca902f570d3a89753c6eb9492c20dd734ba':
Remove unused JNITest class
2014-02-21 16:53:43 +00:00
Narayan Kamath
6191044729
am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"
...
* commit '7942397b3174a9642996979ae8b4aafb313dc2e2':
Fixes for 64bit in libhwui
2014-02-21 16:53:40 +00:00
Narayan Kamath
25c55ca902
am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"
...
* commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104':
Remove unused JNITest class
2014-02-21 16:47:43 +00:00
Narayan Kamath
7942397b31
am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"
...
* commit '192563407964926537d688d4098054c3834341c0':
Fixes for 64bit in libhwui
2014-02-21 16:47:38 +00:00
Narayan Kamath
911b2ce3da
am 4a642ee5: Merge "Remove unused JNITest class"
...
* commit '4a642ee5e65ca47ecf6cb274096162e580aac922':
Remove unused JNITest class
2014-02-21 08:34:36 -08:00
Narayan Kamath
1925634079
am 22c66639: Merge "Fixes for 64bit in libhwui"
...
* commit '22c66639093a634b5688372d261d003b0478c450':
Fixes for 64bit in libhwui
2014-02-21 08:34:30 -08:00
Narayan Kamath
4a642ee5e6
Merge "Remove unused JNITest class"
2014-02-21 15:02:31 +00:00
Ashok Bhat
42f06b0e22
Remove unused JNITest class
...
JNITest class is no longer actively used. This patch
removes the class (java and jni) files.
JNI interfaces and calls are extensively tested in
the art unit tests (art/tests) and in cts (see
CtsJniTestCases).
Change-Id: I62f7c72deb5d206fa3f545ae39a9cb9011110d0a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-21 14:34:35 +00:00
Narayan Kamath
22c6663909
Merge "Fixes for 64bit in libhwui"
2014-02-21 14:23:57 +00:00
Kévin PETIT
73fc558e44
Fixes for 64bit in libhwui
...
Using reinterpret_cast allows conversions between pointer types
and integers which don't have the same size. The corresponding
flags is -Wint-to-pointer-cast.
Change-Id: I8ff0c79d235fa6d07b8d9305edc185d946d5133d
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-02-21 13:07:29 +00:00
Craig Mautner
c2c0a61cf5
Add copyright notice to files missing them.
...
Fixes bug 13121968.
Change-Id: Ifd86581178e7e98bd72b832020e7c8379d40b2de
2014-02-20 20:25:41 -08:00
Craig Mautner
6222a8ef85
am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
...
* commit '1648f042f31df54c25a725c4c5ca2c852a10ef0e':
Set the new SurfaceControl opaque flag.
2014-02-20 22:42:59 +00:00
Craig Mautner
56dbf7b092
am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
...
* commit '3519530fae3584c74db294ab11814f94b966d419':
Resize DimLayer explicitly on rotation.
2014-02-20 22:42:56 +00:00
Craig Mautner
1648f042f3
am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
...
* commit 'fd8a8ccbb79b3d83bb328d64c544c59251eef151':
Set the new SurfaceControl opaque flag.
2014-02-20 22:39:52 +00:00
Craig Mautner
3519530fae
am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
...
* commit '267b37ceff64b6adaeef52e3a582f1186144f93e':
Resize DimLayer explicitly on rotation.
2014-02-20 22:39:49 +00:00
Craig Mautner
fd8a8ccbb7
Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
2014-02-20 22:36:52 +00:00
Craig Mautner
267b37ceff
Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
2014-02-20 22:34:38 +00:00
Craig Mautner
902945d151
Resize DimLayer explicitly on rotation.
...
Using the alpha value to trigger a resizing of the DimLayer was a
Bad Idea. The alpha value should reflect the true alpha value and
not be used to trick the code. Actually changing the size and
position is a Better Idea.
Fixes bug 13101776.
Change-Id: I11c16b8276919ea85960fe87bb17c0956ce8a3b1
2014-02-20 14:31:32 -08:00
Jeff Brown
baaa080b62
am 90506a41: am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev
...
* commit '90506a41c6b85cf7e65b663480e4fe003a99c8c2':
Add a new "doze mode" based on Dream components.
2014-02-20 21:49:15 +00:00
Jeff Brown
90506a41c6
am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev
...
* commit '07e6d1b9a5f81ff5a5bf91f2b260ee487d5f2b65':
Add a new "doze mode" based on Dream components.
2014-02-20 21:47:08 +00:00
Jeff Brown
07e6d1b9a5
Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev
2014-02-20 21:43:43 +00:00
Jeff Brown
2687550272
Add a new "doze mode" based on Dream components.
...
When a doze component has been specified in a config.xml resource
overlay, the power manager will try to start a preconfigured dream
whenever it would have otherwise gone to sleep and turned the
screen off. The dream should render whatever it intends to show
then call startDozing() to tell the power manager to put the display
into a low power "doze" state and allow the application processor
to be suspended. The dream may wake up periodically using the
alarm manager or other features to update the contents of the display.
Added several new config.xml resources related to dreams and dozing.
In particular for dozing there are two new resources that pertain to
decoupling auto-suspend mode and interactive mode from the display
state. This is a requirement to enable the application processor
and other components to be suspended while dozing. Most devices
do not support these features today.
Consolidated the power manager's NAPPING and DREAMING states into one
to simplify the logic. The NAPPING state was mostly superfluous
and simply indicated that the power manager should attempt to start
a new dream. This state is now tracked in the mSandmanSummoned field.
Added a new DOZING state which is analoguous to DREAMING. The normal
state transition is now: AWAKE -> DREAMING -> DOZING -> ASLEEP.
The PowerManager.goToSleep() method now enters the DOZING state instead
of immediately going to sleep.
While in the doze state, the screen remains on. However, we actually
tell the rest of the system that the screen is off. This is somewhat
unfortunate but much of the system makes inappropriate assumptions
about what it means for the screen to be on or off. In particular,
screen on is usually taken to indicate an interactive state where
the user is present but that's not at all true for dozing (and is
only sometimes true while dreaming). We will probably need to add
some more precise externally visible states at some point.
The DozeHardware interface encapsulates a generic microcontroller
interface to allow a doze dream for off-loading rendering or other
functions while dozing. If the device possesses an MCU HAL for dozing
then it is exposed to the DreamService here.
Removed a number of catch blocks in DreamService that caught Throwable
and attempted to cause the dream to finish itself. We actually just
want to let the process crash. Cleanup will happen automatically if
needed. Catching these exceptions results in mysterious undefined
behavior and broken dreams.
Bug: 12494706
Change-Id: Ie78336b37dde7250d1ce65b3d367879e3bfb2b8b
2014-02-20 13:39:13 -08:00
Baligh Uddin
17b7705afb
am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'fbb100c437d52db818e6e57c18ffe1e969ba46b0':
Import translations. DO NOT MERGE
2014-02-20 18:47:45 +00:00
Baligh Uddin
c87c6a2a46
am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'a69996e45c7c40d971b05a56866b7ac5c7f617de':
Import translations. DO NOT MERGE
2014-02-20 18:47:43 +00:00
Baligh Uddin
fbb100c437
am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'ea17c6365fd70b057a4c696d9eec2b5f70b6e476':
Import translations. DO NOT MERGE
2014-02-20 18:43:00 +00:00
Baligh Uddin
a69996e45c
am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '701449e85395d7a81d244d4b115b9ef4ae2f06d9':
Import translations. DO NOT MERGE
2014-02-20 18:42:58 +00:00
Baligh Uddin
ea17c6365f
am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '4292ce5d0023551a6fa7a02b284bf9b02823b06b':
Import translations. DO NOT MERGE
2014-02-20 18:39:46 +00:00
Baligh Uddin
701449e853
am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'c9443fc54caa789c4e3c64e7d9feaee8ac00506f':
Import translations. DO NOT MERGE
2014-02-20 18:39:43 +00:00
Baligh Uddin
4292ce5d00
am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '810267c309f018c5b58b0a2e787b8a6434faa0e0':
Import translations. DO NOT MERGE
2014-02-20 18:36:38 +00:00
Baligh Uddin
c9443fc54c
am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '8ca432c7828d5d3d00c721b195a4ecb59564bbb7':
Import translations. DO NOT MERGE
2014-02-20 18:36:35 +00:00
Baligh Uddin
810267c309
am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '28009e8102aa91294362cc2d7770cab73d02e640':
Import translations. DO NOT MERGE
2014-02-20 18:33:18 +00:00
Baligh Uddin
8ca432c782
am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'c2803d473ad180fa70e5000f0607795c92c4035d':
Import translations. DO NOT MERGE
2014-02-20 18:33:13 +00:00
Baligh Uddin
28009e8102
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-02-20 18:31:03 +00:00
Baligh Uddin
c2803d473a
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-02-20 18:30:49 +00:00
Baligh Uddin
46f1744acf
am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '2f07a7059f4471963c114b0ab944249e8746cbf9':
Import translations. DO NOT MERGE
2014-02-20 18:17:41 +00:00
Baligh Uddin
2f07a7059f
am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '50d0afa43af2b215ddddbc7a3adfb8b5d85cb549':
Import translations. DO NOT MERGE
2014-02-20 18:13:52 +00:00
Baligh Uddin
e16fe1aa7c
am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '13e850160d21008597239dc974c805df057d4e1b':
Import translations. DO NOT MERGE
2014-02-20 18:13:43 +00:00
Baligh Uddin
e9a5424cc6
am a935d31c: (-s ours) am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'a935d31ca87146990010121b576506faef803404':
Import translations. DO NOT MERGE
2014-02-20 18:13:40 +00:00
Baligh Uddin
54de3ec25b
am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '72edb1b78d0316055b40931138ee75a99766995d':
Import translations. DO NOT MERGE
2014-02-20 18:13:38 +00:00
Baligh Uddin
50d0afa43a
am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '2f5347ee46766134848586d67d2dd86bdc9d1952':
Import translations. DO NOT MERGE
2014-02-20 18:10:15 +00:00