OSDN Git Service
Craig Mautner [Sat, 22 Feb 2014 07:33:24 +0000 (07:33 +0000)]
am
ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit '
ffda464851008f750246f343c939d8003071cd23':
Fixes for ActivityView on home activity
Craig Mautner [Sat, 22 Feb 2014 05:11:22 +0000 (05:11 +0000)]
Merge "Fixes for ActivityView on home activity" into klp-modular-dev
Craig Mautner [Sat, 22 Feb 2014 05:08:00 +0000 (21:08 -0800)]
Fixes for ActivityView on home activity
When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.
Fixes bug
13119389.
Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
Scott Main [Sat, 22 Feb 2014 00:57:36 +0000 (00:57 +0000)]
am
f8a68404: am
271f8539: am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
f8a68404c767cf4e5f3e63ab53737472066a90c1':
add android studio to launch procedures
Craig Mautner [Sat, 22 Feb 2014 00:53:43 +0000 (00:53 +0000)]
am
f0f45452: Merge "Reset deferred task removal when app token added." into klp-modular-dev
* commit '
f0f454522ae5024645a292596e644c6f7a06853c':
Reset deferred task removal when app token added.
Scott Main [Sat, 22 Feb 2014 00:53:21 +0000 (00:53 +0000)]
am
271f8539: am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
271f85399bbbe0b6a6719286a4b0857ff845cfc2':
add android studio to launch procedures
Craig Mautner [Sat, 22 Feb 2014 00:50:55 +0000 (00:50 +0000)]
Merge "Reset deferred task removal when app token added." into klp-modular-dev
Scott Main [Sat, 22 Feb 2014 00:50:08 +0000 (00:50 +0000)]
am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
b26117aca0daadeb51369c8da617d5b7ba9b05b6':
add android studio to launch procedures
Scott Main [Sat, 22 Feb 2014 00:47:08 +0000 (00:47 +0000)]
am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
25b44ae684295b53ac7ba15d827fc03c51aee37b':
add android studio to launch procedures
Craig Mautner [Sat, 22 Feb 2014 00:46:22 +0000 (16:46 -0800)]
Reset deferred task removal when app token added.
A task is scheduled for deletion after the final activity has
been removed and has animated away. But if another activity is then
added to the task the deletion flag must be reset.
Also added improved debugging.
Fixes bug
12987986.
Change-Id: I207ea6e9592a9e036d67aa5d1465b4acc5bdd120
Scott Main [Sat, 22 Feb 2014 00:43:26 +0000 (00:43 +0000)]
Merge "add android studio to launch procedures" into klp-docs
Greg Hackmann [Sat, 22 Feb 2014 00:35:52 +0000 (16:35 -0800)]
resolved conflicts for merge of
9e413bf4 to klp-modular-dev-plus-aosp
Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
Adam Lesinski [Fri, 21 Feb 2014 22:17:26 +0000 (22:17 +0000)]
am
83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '
83930aa09aecef7429d8a1c07b80f10b7e2e13f6':
Fix broken IME when decrypting storage
Adam Lesinski [Fri, 21 Feb 2014 22:13:44 +0000 (22:13 +0000)]
Merge "Fix broken IME when decrypting storage" into klp-modular-dev
Adam Lesinski [Fri, 21 Feb 2014 22:06:47 +0000 (14:06 -0800)]
Fix broken IME when decrypting storage
Bug:
13113499
Change-Id: Icf767864c8ff694fd569b9237ae1004cc20204a2
Greg Hackmann [Fri, 21 Feb 2014 21:04:00 +0000 (13:04 -0800)]
am
bbfc08b3: Merge changes I6d4fdada,Ia34899a4
* commit '
bbfc08b3abc0934f67659f3238eb79dcac838c17':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
Greg Hackmann [Fri, 21 Feb 2014 21:01:00 +0000 (21:01 +0000)]
Merge changes I6d4fdada,Ia34899a4
* changes:
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
Greg Hackmann [Tue, 28 Jan 2014 00:30:09 +0000 (16:30 -0800)]
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Setting the time-of-day clock is still useful on systems where the RTC
device is not yet brought up or otherwise unavailable. This matches the
in-kernel behavior of the Android alarm driver.
Change-Id: I6d4fdadab12e241ada7419425efd55bd13873c55
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Thu, 20 Feb 2014 00:39:36 +0000 (16:39 -0800)]
Move time setting code from SystemClock to AlarmManagerService
On devices using /dev/rtc instead of /dev/alarm, updating the
time-of-day clock and RTC are separate syscalls. Hence the clock and
RTC could be left in inconsistent states if two threads called
SystemClock.setCurrentTimeMillis() simultaneously.
By moving this code into AlarmManagerService, we can put a global lock
around AlarmManagerService.setTime() and prevent the race condition.
Note that access to SystemClock.setCurrentTimeMillis() is now gated by
android.permission.SET_TIME, where before it was gated by filesystem
permissions (i.e., could the process write to /dev/alarm or /dev/rtc).
Change-Id: Ia34899a4cde983656305fd2ef466dfe908ed23c8
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Elliott Hughes [Fri, 21 Feb 2014 17:28:54 +0000 (17:28 +0000)]
am
b2f07b27: am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
b2f07b27725bed9716114c46df2cf636eb366f6f':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:28:51 +0000 (17:28 +0000)]
am
29d60b95: am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
29d60b95fa8019c0542f46551057c4d376bb8a7a':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:25:54 +0000 (09:25 -0800)]
am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
4a80927241b3168d9d5138c46c22385d6467a736':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:25:50 +0000 (09:25 -0800)]
am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
8d41e653bae240488281d430309e2d501e9524e5':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:21:52 +0000 (17:21 +0000)]
Merge "Fix documentation for Parcel.readException()."
Elliott Hughes [Fri, 21 Feb 2014 17:19:21 +0000 (17:19 +0000)]
Merge "Miscellaneous small documentation fixes."
Craig Mautner [Fri, 21 Feb 2014 16:55:55 +0000 (16:55 +0000)]
am
c2c0a61c: Add copyright notice to files missing them.
* commit '
c2c0a61cf5f779b4726f089f28d966c03ccbba54':
Add copyright notice to files missing them.
Narayan Kamath [Fri, 21 Feb 2014 16:47:43 +0000 (16:47 +0000)]
am
911b2ce3: am
4a642ee5: Merge "Remove unused JNITest class"
* commit '
911b2ce3da7dbd8b6335d1092fc6c9e880147104':
Remove unused JNITest class
Narayan Kamath [Fri, 21 Feb 2014 16:47:38 +0000 (16:47 +0000)]
am
19256340: am
22c66639: Merge "Fixes for 64bit in libhwui"
* commit '
192563407964926537d688d4098054c3834341c0':
Fixes for 64bit in libhwui
Narayan Kamath [Fri, 21 Feb 2014 16:34:36 +0000 (08:34 -0800)]
am
4a642ee5: Merge "Remove unused JNITest class"
* commit '
4a642ee5e65ca47ecf6cb274096162e580aac922':
Remove unused JNITest class
Narayan Kamath [Fri, 21 Feb 2014 16:34:30 +0000 (08:34 -0800)]
am
22c66639: Merge "Fixes for 64bit in libhwui"
* commit '
22c66639093a634b5688372d261d003b0478c450':
Fixes for 64bit in libhwui
Narayan Kamath [Fri, 21 Feb 2014 15:02:30 +0000 (15:02 +0000)]
Merge "Remove unused JNITest class"
Ashok Bhat [Sat, 15 Feb 2014 11:28:48 +0000 (11:28 +0000)]
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>
Narayan Kamath [Fri, 21 Feb 2014 14:23:57 +0000 (14:23 +0000)]
Merge "Fixes for 64bit in libhwui"
Kévin PETIT [Thu, 13 Feb 2014 11:03:40 +0000 (11:03 +0000)]
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>
Craig Mautner [Fri, 21 Feb 2014 04:25:41 +0000 (20:25 -0800)]
Add copyright notice to files missing them.
Fixes bug
13121968.
Change-Id: Ifd86581178e7e98bd72b832020e7c8379d40b2de
Craig Mautner [Thu, 20 Feb 2014 22:39:52 +0000 (22:39 +0000)]
am
fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
* commit '
fd8a8ccbb79b3d83bb328d64c544c59251eef151':
Set the new SurfaceControl opaque flag.
Craig Mautner [Thu, 20 Feb 2014 22:39:49 +0000 (22:39 +0000)]
am
267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
* commit '
267b37ceff64b6adaeef52e3a582f1186144f93e':
Resize DimLayer explicitly on rotation.
Craig Mautner [Thu, 20 Feb 2014 22:36:52 +0000 (22:36 +0000)]
Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
Craig Mautner [Thu, 20 Feb 2014 22:34:38 +0000 (22:34 +0000)]
Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
Craig Mautner [Thu, 20 Feb 2014 22:31:32 +0000 (14:31 -0800)]
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
Jeff Brown [Thu, 20 Feb 2014 21:47:08 +0000 (21:47 +0000)]
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.
Jeff Brown [Thu, 20 Feb 2014 21:43:42 +0000 (21:43 +0000)]
Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev
Jeff Brown [Fri, 31 Jan 2014 05:47:47 +0000 (21:47 -0800)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:43:00 +0000 (18:43 +0000)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:42:58 +0000 (18:42 +0000)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:39:46 +0000 (18:39 +0000)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:39:43 +0000 (18:39 +0000)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:36:38 +0000 (18:36 +0000)]
am
810267c3: (-s ours) am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
810267c309f018c5b58b0a2e787b8a6434faa0e0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:36:35 +0000 (18:36 +0000)]
am
8ca432c7: (-s ours) am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8ca432c7828d5d3d00c721b195a4ecb59564bbb7':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:33:18 +0000 (18:33 +0000)]
am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
28009e8102aa91294362cc2d7770cab73d02e640':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:33:13 +0000 (18:33 +0000)]
am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c2803d473ad180fa70e5000f0607795c92c4035d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:31:02 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 18:30:49 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 18:13:52 +0000 (18:13 +0000)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:10:15 +0000 (18:10 +0000)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:09:59 +0000 (18:09 +0000)]
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 '
749e6b9cf21799aefe9accc50c60f6bfddf1545a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:09:56 +0000 (18:09 +0000)]
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 '
bf2226ec7f9fcb0a2fc169df170c770363d9a3f5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:09:54 +0000 (18:09 +0000)]
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 '
699991c8a296834e8fe843bce85529b018d12af8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:07:02 +0000 (18:07 +0000)]
am
1af20cc5: (-s ours) am
554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1af20cc5764a38d0713a292fd63bf6a628f2f5eb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:06:24 +0000 (18:06 +0000)]
am
5da96060: (-s ours) am
f887a67d: (-s ours) am
aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5da96060e61c3076d0a5cbd87a3f17254414afeb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:06:21 +0000 (18:06 +0000)]
am
8b297fb6: (-s ours) am
8027100f: (-s ours) am
e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8b297fb6ef42650a1126287aa0b610aa9a503167':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:06:17 +0000 (18:06 +0000)]
am
08394af2: (-s ours) am
e69b7b34: (-s ours) am
46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
08394af265b02db7a76c4f4f4ae16b9d238e7580':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:03:38 +0000 (18:03 +0000)]
am
554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
554b43a066b6a084dbb9b7dba014de4b12ba1175':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:03:07 +0000 (18:03 +0000)]
am
f887a67d: (-s ours) am
aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:03:05 +0000 (18:03 +0000)]
am
8027100f: (-s ours) am
e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8027100fdb13c046838f9af12ef7bf2bc3ad511f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:03:02 +0000 (18:03 +0000)]
am
e69b7b34: (-s ours) am
46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e69b7b3474c356438fbd65e43438e72ebda0bacb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:50 +0000 (17:59 +0000)]
am
aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
aa20b27472552ebc812dfbb3cbe260115ee43db1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:47 +0000 (17:59 +0000)]
am
e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e9adafd1b95a7934bb813cb168e33a85a762a504':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:45 +0000 (17:59 +0000)]
am
46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
46a02249d7bde3fb88cc5312f88dab6d1690e20e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:40 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:32 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:23 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:13 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Xavier Ducrohet [Thu, 20 Feb 2014 17:53:20 +0000 (17:53 +0000)]
am
9edf7a11: am
2cb9147f: am
55542ee6: am
3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '
9edf7a1159b528afa056e0d61ee4487ed310fe4c':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 17:53:17 +0000 (17:53 +0000)]
am
65521c3c: am
ca4b9a77: am
e92c8542: am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
65521c3cf169808cd02ce09a7344bc633d51c1fc':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Xavier Ducrohet [Thu, 20 Feb 2014 17:49:32 +0000 (17:49 +0000)]
am
2cb9147f: am
55542ee6: am
3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '
2cb9147fc49e6474eaf30fd833e43df10e42b899':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 17:49:27 +0000 (17:49 +0000)]
am
ca4b9a77: am
e92c8542: am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
ca4b9a77e7d20703287b33b203b2582bd43f7792':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Xavier Ducrohet [Thu, 20 Feb 2014 17:46:05 +0000 (17:46 +0000)]
am
55542ee6: am
3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '
55542ee6449bd580f61bc005726b5c87773fbe25':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 17:46:02 +0000 (17:46 +0000)]
am
e92c8542: am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
e92c8542a5cf1160a1b701b9f176af64ba46d68d':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Xavier Ducrohet [Thu, 20 Feb 2014 17:42:58 +0000 (17:42 +0000)]
am
3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '
3e6370425ea3ac4e5d89ce042512913062212ccc':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 17:42:54 +0000 (17:42 +0000)]
am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
01825b7aa3c864426c78c08c2f6004a8362c2b47':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Justin Koh [Thu, 20 Feb 2014 17:41:31 +0000 (17:41 +0000)]
am
744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev
* commit '
744d3473f8a0f9f95e3fdf83670faf6d1551839e':
Add hardware feature describing a watch.
Xavier Ducrohet [Thu, 20 Feb 2014 17:41:07 +0000 (17:41 +0000)]
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
Justin Koh [Thu, 20 Feb 2014 17:38:03 +0000 (17:38 +0000)]
Merge "Add hardware feature describing a watch." into klp-modular-dev
Narayan Kamath [Thu, 20 Feb 2014 13:02:25 +0000 (13:02 +0000)]
am
fca204a4: am
05cebdc2: Merge "Fix several bad function definitions."
* commit '
fca204a4b8771b800383c91465a48eb2cd8b3ba2':
Fix several bad function definitions.
Narayan Kamath [Thu, 20 Feb 2014 13:02:21 +0000 (13:02 +0000)]
am
b152473f: am
9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"
* commit '
b152473f46d8176e7eb2c55b54342a7a29c525cf':
AArch64: Make AssetAtlasService 64-bit compatible
Narayan Kamath [Thu, 20 Feb 2014 12:58:52 +0000 (04:58 -0800)]
am
05cebdc2: Merge "Fix several bad function definitions."
* commit '
05cebdc2abd05b0dca351306cb039245d50c67ae':
Fix several bad function definitions.
Narayan Kamath [Thu, 20 Feb 2014 12:58:45 +0000 (04:58 -0800)]
am
9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"
* commit '
9fce8535851fc696997bd3c251d00e34179d6482':
AArch64: Make AssetAtlasService 64-bit compatible
Narayan Kamath [Thu, 20 Feb 2014 12:55:27 +0000 (12:55 +0000)]
Merge "Fix several bad function definitions."
Narayan Kamath [Thu, 20 Feb 2014 12:55:20 +0000 (12:55 +0000)]
Merge "AArch64: Make AssetAtlasService 64-bit compatible"
Narayan Kamath [Thu, 6 Feb 2014 11:50:31 +0000 (11:50 +0000)]
Fix several bad function definitions.
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).
bug:
12890271
(cherry picked from
017546e65280a3389b6167f5fc3b5d1c3001154a)
Change-Id: Iede02be90e6a3c9a2db1fe04dcd0db99abe37097
Ashok Bhat [Mon, 27 Jan 2014 16:00:23 +0000 (16:00 +0000)]
AArch64: Make AssetAtlasService 64-bit compatible
Changes in this patch include
[x] Long(64-bit) is used to store native pointers in
AssetAtlasService and related classes as they can be 64-bit.
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
Change-Id: Ib4c77c134e3ad5b21732e20cde9a54a0b16bdab1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Narayan Kamath [Thu, 20 Feb 2014 11:57:19 +0000 (11:57 +0000)]
am
128599e4: am
2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"
* commit '
128599e4496bd7ceb9d70f4addde0eba65103709':
libandroidfw: fix build error for 64-bit
Narayan Kamath [Thu, 20 Feb 2014 11:53:36 +0000 (03:53 -0800)]
am
2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"
* commit '
2b3c14bf75c71524a0fcbc3e9d1fdab9aa6c3473':
libandroidfw: fix build error for 64-bit
Narayan Kamath [Thu, 20 Feb 2014 11:50:59 +0000 (11:50 +0000)]
Merge "libandroidfw: fix build error for 64-bit"
Patrik Bannura [Wed, 12 Feb 2014 12:38:54 +0000 (13:38 +0100)]
libandroidfw: fix build error for 64-bit
Fixed casting int to pointer in logging code.
Previously ints where printed as pointers and
the %p format specifier was used for convenience
to get hex output. This change uses %x and also
gets rid of the casts.
Change-Id: Ia2539769d245f50c0f3884119f80682defe69d61
Baligh Uddin [Thu, 20 Feb 2014 06:16:02 +0000 (22:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9accaa37043e730ad6ec4aa98901a48e0858b132
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 06:08:21 +0000 (22:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0c823200179a75e0444f6e86ecc6813a6e662fa0
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 03:42:43 +0000 (19:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: If9205c555286daf7dea68702d2da39752b59def4
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 02:54:52 +0000 (18:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7
Auto-generated-cl: translation import
OSDN Git Service
