OSDN Git Service
Adam Koch [Wed, 29 Jan 2014 23:09:58 +0000 (23:09 +0000)]
am
b430d93b: am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
b430d93b058a706be731e45f8c1836d97219a666':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Wed, 29 Jan 2014 23:06:46 +0000 (23:06 +0000)]
am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
cb3ea3d47449a669e0d28131cf9254d5476bae73':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Wed, 29 Jan 2014 23:04:02 +0000 (23:04 +0000)]
Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
John Spurlock [Wed, 29 Jan 2014 15:42:34 +0000 (15:42 +0000)]
am
2d35ba4d: am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
2d35ba4d4a43036706638ca0e96e5e1a9904d2af':
[Navigation bar] Allow "right to left" gesture to launch search panel
John Spurlock [Wed, 29 Jan 2014 15:40:00 +0000 (07:40 -0800)]
am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
d12f4eb8cb986d710aaf98a9d6b8f66803d182d6':
[Navigation bar] Allow "right to left" gesture to launch search panel
John Spurlock [Wed, 29 Jan 2014 15:36:40 +0000 (15:36 +0000)]
Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
Narayan Kamath [Wed, 29 Jan 2014 15:29:23 +0000 (15:29 +0000)]
am
dfd4f523: am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
dfd4f5232c87c51fe639b594fd210b4073eca42b':
mNativeCanvas is long, not int.
Narayan Kamath [Wed, 29 Jan 2014 15:26:19 +0000 (07:26 -0800)]
am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
d228a03891f60520d517b2a3bc900b008b2da702':
mNativeCanvas is long, not int.
Narayan Kamath [Wed, 29 Jan 2014 15:02:05 +0000 (15:02 +0000)]
Merge "mNativeCanvas is long, not int."
Narayan Kamath [Wed, 29 Jan 2014 12:21:32 +0000 (12:21 +0000)]
mNativeCanvas is long, not int.
swapNativeCanvas was asking for an int field.
Change-Id: I660fb13ecfb5d3b24201676dc03c16d61c92af07
Narayan Kamath [Wed, 29 Jan 2014 12:18:31 +0000 (12:18 +0000)]
am
7be33110: am
d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '
7be33110ea3e1a032ee3aa7c50f1dedf52fcab25':
AArch64: Use long for pointers in graphics/Interpolator
Narayan Kamath [Wed, 29 Jan 2014 12:18:27 +0000 (12:18 +0000)]
am
74db9ddb: am
887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '
74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160':
AArch64: Use long for pointers in SurfaceTexture
Narayan Kamath [Wed, 29 Jan 2014 12:14:48 +0000 (04:14 -0800)]
am
d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '
d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3':
AArch64: Use long for pointers in graphics/Interpolator
Narayan Kamath [Wed, 29 Jan 2014 12:14:44 +0000 (04:14 -0800)]
am
887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '
887b1ca87941095797a246b2d68ec2626a7cfc43':
AArch64: Use long for pointers in SurfaceTexture
Narayan Kamath [Wed, 29 Jan 2014 12:12:27 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/Interpolator"
Narayan Kamath [Wed, 29 Jan 2014 12:12:17 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in SurfaceTexture"
Narayan Kamath [Wed, 29 Jan 2014 12:06:26 +0000 (12:06 +0000)]
am
95ba1eb6: am
dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit '
95ba1eb6243a9b356ec4ac02177076e2427360a3':
AArch64: Use long for pointers in DRM classes
Narayan Kamath [Wed, 29 Jan 2014 12:03:16 +0000 (04:03 -0800)]
am
dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit '
dd6de16aee254497040b32cc330b4637b96685c0':
AArch64: Use long for pointers in DRM classes
Narayan Kamath [Wed, 29 Jan 2014 12:00:27 +0000 (12:00 +0000)]
Merge "AArch64: Use long for pointers in DRM classes"
Narayan Kamath [Wed, 29 Jan 2014 10:48:52 +0000 (10:48 +0000)]
am
9846fb69: am
50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '
9846fb695a3c41aabde4ca0061d583b35f9621d1':
AArch64: Make Binder and Parcel 64-bit compatible
Narayan Kamath [Wed, 29 Jan 2014 10:45:12 +0000 (02:45 -0800)]
am
50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
* commit '
50afaefdc09060c7435291bc91aac47295ce2dfd':
AArch64: Make Binder and Parcel 64-bit compatible
Narayan Kamath [Wed, 29 Jan 2014 10:43:22 +0000 (10:43 +0000)]
Merge "AArch64: Make Binder and Parcel 64-bit compatible"
Scott Main [Wed, 29 Jan 2014 08:24:34 +0000 (08:24 +0000)]
am
80cbc73f: am
e535499e: Merge "add api notice to cast package index" into klp-docs
* commit '
80cbc73f657cc6ac5db8bb5529918e9e05edc749':
add api notice to cast package index
Scott Main [Wed, 29 Jan 2014 08:24:28 +0000 (08:24 +0000)]
am
28c42122: am
c62223a0: add api notice to a bunch more files in iberico release
* commit '
28c4212223a033cc65e5b2d8029527d5cb4b40a9':
add api notice to a bunch more files in iberico release
Scott Main [Wed, 29 Jan 2014 08:18:54 +0000 (08:18 +0000)]
am
e535499e: Merge "add api notice to cast package index" into klp-docs
* commit '
e535499ec3ca9a05dd4b3e6e0fbfdadf01b22415':
add api notice to cast package index
Scott Main [Wed, 29 Jan 2014 08:18:47 +0000 (08:18 +0000)]
am
c62223a0: add api notice to a bunch more files in iberico release
* commit '
c62223a04d15da4240129a9b05ad0be965f08ee4':
add api notice to a bunch more files in iberico release
Scott Main [Wed, 29 Jan 2014 08:15:11 +0000 (08:15 +0000)]
Merge "add api notice to cast package index" into klp-docs
Scott Main [Wed, 29 Jan 2014 07:52:23 +0000 (07:52 +0000)]
am
da59b9c1: am
e7249902: add warning to all the new iberico API pages about SDK not available yet
* commit '
da59b9c1a8b1e5866ab884fe498838b7d91b55a6':
add warning to all the new iberico API pages about SDK not available yet
quddusc [Wed, 29 Jan 2014 07:52:12 +0000 (07:52 +0000)]
am
c4cba0e9: am
32993c68: docs: Added API reference docs for GCore Iberico release.
* commit '
c4cba0e991596d524a5a85e66ea3a8dd65f5cef5':
docs: Added API reference docs for GCore Iberico release.
Scott Main [Wed, 29 Jan 2014 07:34:55 +0000 (07:34 +0000)]
am
e7249902: add warning to all the new iberico API pages about SDK not available yet
* commit '
e724990230d267c13f8f820b5fdbe7c58b25d344':
add warning to all the new iberico API pages about SDK not available yet
quddusc [Wed, 29 Jan 2014 07:34:48 +0000 (07:34 +0000)]
am
32993c68: docs: Added API reference docs for GCore Iberico release.
* commit '
32993c68fff5cb229c8503ffe0fad06b53189377':
docs: Added API reference docs for GCore Iberico release.
Scott Main [Wed, 29 Jan 2014 07:02:13 +0000 (23:02 -0800)]
add api notice to a bunch more files in iberico release
Change-Id: Ia260aa4bcb2f46cfeff1478f951c04951ad542a6
Scott Main [Wed, 29 Jan 2014 05:58:39 +0000 (21:58 -0800)]
add api notice to cast package index
Change-Id: Ie5859576540b8ff12eb97c333e053eb637f21f0d
Scott Main [Wed, 29 Jan 2014 05:20:36 +0000 (21:20 -0800)]
add warning to all the new iberico API pages about SDK not available yet
Change-Id: Idcfc470e0ae8fdd4bbaec8bedf6cfd50dbcc74b7
fisherson_lin [Mon, 20 Jan 2014 06:47:27 +0000 (14:47 +0800)]
[Navigation bar] Allow "right to left" gesture to launch search panel
Symptom: "Bottom to up" gesture can launch search panel in portrait, but "right to left" gesture CANNOT in landscape.
Root Cause: Not handled.
Solution: Set swapXY to handle this in landscape case.
Change-Id: I1793280b3656af6912e6b4583b08e80a0a38e44a
quddusc [Sat, 18 Jan 2014 23:43:37 +0000 (15:43 -0800)]
docs: Added API reference docs for GCore Iberico release.
Change-Id: Ic8816e44aa578c258fef91bf93873b698ac4090e
Scott Main [Wed, 29 Jan 2014 04:05:24 +0000 (04:05 +0000)]
am
31db1bba: am
cf010ab9: add google cast feature page
* commit '
31db1bbaa1f69600fe82b4691717772d08785364':
add google cast feature page
Scott Main [Wed, 29 Jan 2014 04:02:03 +0000 (04:02 +0000)]
am
cf010ab9: add google cast feature page
* commit '
cf010ab9c5df8896c57a722137ac3b4306ef1ca5':
add google cast feature page
Scott Main [Mon, 27 Jan 2014 21:17:45 +0000 (13:17 -0800)]
add google cast feature page
Change-Id: Ie46b8ecdccea5ab3069176d15562d69aacc2d831
Adam Koch [Wed, 29 Jan 2014 02:56:42 +0000 (13:56 +1100)]
Doc fix: Update code snippet in displaying bitmaps training class
Bug:
12715659
Change-Id: I33ad0ae04ff8855a3fc09a312830e0277dcfe70d
Scott Main [Wed, 29 Jan 2014 00:06:11 +0000 (00:06 +0000)]
am
2d27da36: am
3781318f: add Cast to the sidenav
* commit '
2d27da36489668d2fedce0bbdcfe50e96206bdd1':
add Cast to the sidenav
Scott Main [Wed, 29 Jan 2014 00:02:52 +0000 (00:02 +0000)]
am
3781318f: add Cast to the sidenav
* commit '
3781318fefba28699e7713b231c9591bf29eadac':
add Cast to the sidenav
Scott Main [Tue, 28 Jan 2014 23:54:56 +0000 (15:54 -0800)]
add Cast to the sidenav
Change-Id: I7bb04e523363ad4964eb5bef405d9e2e4456e2d0
Mark Salyzyn [Tue, 28 Jan 2014 21:38:43 +0000 (21:38 +0000)]
am
2c6b048b: am
967c5d00: Merge changes I3659193f,I8b78e4db
* commit '
2c6b048bed296949878318a7c60faf247f538e67':
jni: Resolve build warnings
jni: Incorporate liblog reading API
Mark Salyzyn [Tue, 28 Jan 2014 21:36:14 +0000 (13:36 -0800)]
am
967c5d00: Merge changes I3659193f,I8b78e4db
* commit '
967c5d00dfcd890820c3ca82bc608814ebfe1cc1':
jni: Resolve build warnings
jni: Incorporate liblog reading API
Mark Salyzyn [Tue, 28 Jan 2014 21:30:39 +0000 (21:30 +0000)]
Merge changes I3659193f,I8b78e4db
* changes:
jni: Resolve build warnings
jni: Incorporate liblog reading API
Narayan Kamath [Tue, 28 Jan 2014 19:47:58 +0000 (19:47 +0000)]
resolved conflicts for merge of
b82b2f98 to klp-dev-plus-aosp
Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b
Narayan Kamath [Tue, 28 Jan 2014 19:18:45 +0000 (19:18 +0000)]
am
23abbfbb: am
154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '
23abbfbb814501b825edc056027270f03f39506b':
AArch64: Use long for pointers in graphics/Camera
Narayan Kamath [Tue, 28 Jan 2014 19:18:40 +0000 (19:18 +0000)]
am
aa9ba887: am
6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '
aa9ba887371e875ffbde49f43fa12bb5f123425b':
AArch64: Make graphics classes 64-bit compatible
Narayan Kamath [Tue, 28 Jan 2014 19:16:00 +0000 (11:16 -0800)]
am
9b0f4be0: Merge "Track 64bit changes to android/graphics."
* commit '
9b0f4be0a20ee48a3ddf56438e846231955bd557':
Track 64bit changes to android/graphics.
Narayan Kamath [Tue, 28 Jan 2014 19:15:57 +0000 (11:15 -0800)]
am
154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '
154614abbcc819c265bfb79b2626fcee66333ac2':
AArch64: Use long for pointers in graphics/Camera
Narayan Kamath [Tue, 28 Jan 2014 19:15:47 +0000 (11:15 -0800)]
am
6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '
6e09eb4c6753f8e5cbd04f9b0c7b65046d27afdb':
AArch64: Make graphics classes 64-bit compatible
Narayan Kamath [Tue, 28 Jan 2014 19:12:33 +0000 (19:12 +0000)]
Merge "Track 64bit changes to android/graphics."
Narayan Kamath [Tue, 28 Jan 2014 19:12:29 +0000 (19:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/Camera"
Narayan Kamath [Tue, 28 Jan 2014 19:12:16 +0000 (19:12 +0000)]
Merge "AArch64: Make graphics classes 64-bit compatible"
Craig Mautner [Tue, 28 Jan 2014 18:11:13 +0000 (18:11 +0000)]
am
245b58d6: am
baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
* commit '
245b58d6f47740c09ebd47b75e6021c7cfb691af':
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Craig Mautner [Tue, 28 Jan 2014 18:08:18 +0000 (10:08 -0800)]
am
baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
* commit '
baf2c7a400ef27b1f33999498a80e2fb3e05a22f':
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Craig Mautner [Tue, 28 Jan 2014 18:05:30 +0000 (18:05 +0000)]
Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
Narayan Kamath [Mon, 27 Jan 2014 14:24:16 +0000 (14:24 +0000)]
Track 64bit changes to android/graphics.
All pointers are now 64bits wide, so should be
represented as java longs and not ints.
Also changed DelegateManager and SparseWeakArray to
reflect the new world order.
(cherry picked from commit
88a8364c386c694f7ad56662ef89713dbf7c9d63)
Change-Id: Ic2f55dd6235751169c5014f9d2ccf3f544259a87
Ashok Bhat [Mon, 13 Jan 2014 20:44:05 +0000 (20:44 +0000)]
AArch64: Use long for pointers in graphics/Camera
For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.
In addition, 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: Ic05ebf2051a225a1638a43f476bab6176c0b5c38
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Ashok Bhat [Mon, 20 Jan 2014 20:08:01 +0000 (20:08 +0000)]
AArch64: Make graphics classes 64-bit compatible
Changes in this patch include
[x] Long is used to store native pointers 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)
[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.
Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
louis_chang [Tue, 28 Jan 2014 10:38:06 +0000 (18:38 +0800)]
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Symptom:
When press Home key to home screen, user is able to see the activity's window shown on top of wallpaper and below launcher(widgets).
Root Cause:
The ensureActivitiesVisibleLocked() is called pretty often (for example when a new process bound).
If the top activity "B" was finishing, then the previous activity "A" should be visible.
Therefore, the activity "A" window will be set to visible and then launched activity "A", but it does not updates the visible state in ActivityRecord for "A".
There has a timing issue that if a new activity "C" is started, "C" becomes the new top activity and be resumed.
In that case, Activity "A" window will remain visible even if it is behind a full screen activity "C" because the ActivityRecord.visble of "A" is still false, so the window visibility won't be update.
So when user press home key and back to launcher, the surface of activity "A" will be composed on top of wallpaper.
Solution:
Updates ActivityRecord.visible to true for "A". After "C" is started, the "A" will be called WindowManagerService.setAppVisibility() to set invisible, then called onStop() when execute ensureActivitiesVisibleLocked() again.
Change-Id: I536ba04b95d8d274fea6d679a6493e620bc981e2
Mark Salyzyn [Thu, 7 Nov 2013 19:16:22 +0000 (11:16 -0800)]
jni: Resolve build warnings
(cherry picked from commit
087f58dd80e3296a53c6e3c74c089e9a0265f3bd)
Change-Id: I3659193f1ba1ba94561e4684cdb6627880ffc2fa
Mark Salyzyn [Thu, 5 Dec 2013 18:06:18 +0000 (10:06 -0800)]
jni: Incorporate liblog reading API
(cherry picked from commit
e11cbd441df4a1689c89b2ab91b84523c9f2fd10)
Change-Id: I8b78e4db67b6daabb975ce740fb40478df4ffcef
Christopher Tate [Mon, 27 Jan 2014 19:43:23 +0000 (11:43 -0800)]
am
76dcacad: am
1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '
76dcacada75f192d74ea83cf6b5ce1747c9437ad':
Fixed race condition in Spinner.DialogPopup on null reference.
Christopher Tate [Mon, 27 Jan 2014 19:40:51 +0000 (11:40 -0800)]
am
1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '
1ff4293e33f98e6dc19e4f154cb497af9bd88c9d':
Fixed race condition in Spinner.DialogPopup on null reference.
Christopher Tate [Mon, 27 Jan 2014 19:29:56 +0000 (19:29 +0000)]
Merge "Fixed race condition in Spinner.DialogPopup on null reference."
Mathieu Chartier [Mon, 27 Jan 2014 19:20:21 +0000 (11:20 -0800)]
am
137d74d8: am
db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit '
137d74d89cc57d146af8ca91ad7830a950c7e8b8':
Fix dest == src bugs in Matrix.cpp.
Mathieu Chartier [Mon, 27 Jan 2014 19:17:13 +0000 (11:17 -0800)]
am
db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit '
db5257248637df729ec4f8db58bdfbf0660051b2':
Fix dest == src bugs in Matrix.cpp.
Mathieu Chartier [Mon, 27 Jan 2014 17:26:47 +0000 (17:26 +0000)]
Merge "Fix dest == src bugs in Matrix.cpp."
Narayan Kamath [Mon, 27 Jan 2014 12:01:15 +0000 (04:01 -0800)]
am
dff83e2b: am
d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit '
dff83e2b121b356a264e908f8a7d64584eab9b73':
AssetManager cookies should be int32_t and not void*.
Narayan Kamath [Mon, 27 Jan 2014 11:58:32 +0000 (03:58 -0800)]
am
d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit '
d5970e9ca34038051f694c7349fa5f3548ee9499':
AssetManager cookies should be int32_t and not void*.
Narayan Kamath [Mon, 27 Jan 2014 11:56:03 +0000 (11:56 +0000)]
Merge "AssetManager cookies should be int32_t and not void*."
Narayan Kamath [Mon, 27 Jan 2014 11:17:22 +0000 (11:17 +0000)]
AssetManager cookies should be int32_t and not void*.
Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.
(cherry picked from commit
ebfdd0f467e39c3af8d92cade78263935340acb7)
(cherry picked from commit
a7fa2e592e2e579e5acdb903dba83fc074ebc215)
(cherry picked from commit
a9d5701b034ed2d9771b3f0943e1add00741d7cd)
Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
Wink Saville [Sun, 26 Jan 2014 16:49:09 +0000 (08:49 -0800)]
am
5d2d911a: am
d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '
5d2d911ad1f69392cf2a56237ce7ad3bb9e78ffa':
Telephony: Modify code to check that PUK code length is always 8.
Wink Saville [Sun, 26 Jan 2014 16:43:28 +0000 (08:43 -0800)]
am
d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '
d1eeb6747820f549ec724546a84e3860b4580587':
Telephony: Modify code to check that PUK code length is always 8.
Mathieu Chartier [Sun, 26 Jan 2014 01:54:22 +0000 (17:54 -0800)]
Fix dest == src bugs in Matrix.cpp.
The main bug was that the AutoJavaFloatArray autoSrc was not passing in
read only. This meant that the destructor overwrote the data which
the autoDst AutoJavaFloatArray had written in it's destructor.
This case only happened if src == dest and the arrays were copies.
Also improved performance by passing in read only a few other places.
Bug:
12570144
Change-Id: Idc8764087dc165433c584b87a0f9d4ed0ec795e8
Wink Saville [Sat, 25 Jan 2014 21:51:34 +0000 (21:51 +0000)]
Merge "Telephony: Modify code to check that PUK code length is always 8."
Narayan Kamath [Fri, 24 Jan 2014 09:42:08 +0000 (01:42 -0800)]
am
8005b9af: am
3c30eff6: Merge "Remove unused field from AssetManager."
* commit '
8005b9af11ea366672d739769510240f931f3050':
Remove unused field from AssetManager.
Narayan Kamath [Fri, 24 Jan 2014 09:39:47 +0000 (01:39 -0800)]
am
3c30eff6: Merge "Remove unused field from AssetManager."
* commit '
3c30eff63fb33901df4e040ecce78f7755be588f':
Remove unused field from AssetManager.
Narayan Kamath [Fri, 24 Jan 2014 09:27:48 +0000 (09:27 +0000)]
Merge "Remove unused field from AssetManager."
Selim Gurun [Thu, 23 Jan 2014 22:39:53 +0000 (14:39 -0800)]
am
d261243c: am
a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '
d261243c146515184cb4caf2284c6764a045443a':
Revert "Adding freeMemoryForTests static method to WebView."
Selim Gurun [Thu, 23 Jan 2014 22:37:15 +0000 (14:37 -0800)]
am
a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '
a3106d1dbe5141a6df742262f4bbe8cf2c8ea915':
Revert "Adding freeMemoryForTests static method to WebView."
Selim Gurun [Thu, 23 Jan 2014 22:26:33 +0000 (22:26 +0000)]
Merge "Revert "Adding freeMemoryForTests static method to WebView.""
Selim Gurun [Thu, 23 Jan 2014 22:13:40 +0000 (22:13 +0000)]
Revert "Adding freeMemoryForTests static method to WebView."
This reverts commit
c6a2a6e20f7ddd5a903e9395f6c574c316960694.
Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
Selim Gurun [Thu, 23 Jan 2014 19:51:22 +0000 (11:51 -0800)]
am
01607523: am
f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit '
016075239fc28704bb0e2b78a3c5540fde711eea':
Adding freeMemoryForTests static method to WebView.
Selim Gurun [Thu, 23 Jan 2014 19:49:00 +0000 (11:49 -0800)]
am
f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit '
f6d69ae0f9215e08137b010acb4076a30e3d28c6':
Adding freeMemoryForTests static method to WebView.
Selim Gurun [Thu, 23 Jan 2014 19:42:18 +0000 (19:42 +0000)]
Merge "Adding freeMemoryForTests static method to WebView."
Selim Gurun [Thu, 23 Jan 2014 19:21:00 +0000 (11:21 -0800)]
Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
Bug: b/
10629847
(cherry picked from commit
54daaf1cffddad6366fac2ccfceb1e042dd8e90e)
Change-Id: Ie16a94baa15f868d60f3837290dcc8045aea31a9
Ashok Bhat [Wed, 22 Jan 2014 16:00:20 +0000 (16:00 +0000)]
AArch64: Make Binder and Parcel 64-bit compatible
Changes include
[x] Long is used to store native pointers
[x] Added new method obtain(long obj) to Parcel. Binder
uses this method instead of obtain(int obj).
[x] obtain(int) has been changed to throw unsupported
operation exception.
Change-Id: I408e0f2a24deb28c9277d86670653a51eb314266
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Christopher Tate [Thu, 23 Jan 2014 01:47:04 +0000 (17:47 -0800)]
am
094efb3f: am
407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
* commit '
094efb3f5350b3ce95dcc790bc237c5caa901a20':
Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
Christopher Tate [Thu, 23 Jan 2014 01:43:52 +0000 (17:43 -0800)]
am
407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
* commit '
407f74f494e5374d9bdceae9d9fb453aa8270f6b':
Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
Christopher Tate [Thu, 23 Jan 2014 01:40:37 +0000 (01:40 +0000)]
Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
Dirk Dougherty [Thu, 23 Jan 2014 00:36:34 +0000 (16:36 -0800)]
am
9971cbe9: am
94ac4f68: Add samples TOC generated from browsable sources.
* commit '
9971cbe92284e589d6540cbf22f17c816692bb62':
Add samples TOC generated from browsable sources.
Dirk Dougherty [Thu, 23 Jan 2014 00:33:06 +0000 (00:33 +0000)]
am
94ac4f68: Add samples TOC generated from browsable sources.
* commit '
94ac4f6855d84c6d40006002f43ad1f1a0447954':
Add samples TOC generated from browsable sources.
Dirk Dougherty [Wed, 27 Nov 2013 18:34:47 +0000 (10:34 -0800)]
Add samples TOC generated from browsable sources.
(cherry picked from commit
1c64e2f429bfc97fcf64ebeaa0b3aa2d6b609a1d)
Change-Id: I085b68646565bbf904e70734008efe5cc9f21eda
Christopher Tate [Wed, 22 Jan 2014 23:53:58 +0000 (15:53 -0800)]
am
0e3df216: am
cc81bcec: Merge "Only send storage intents after boot complete"
* commit '
0e3df21642122ae8a43be1a35723782bdd417b7a':
Only send storage intents after boot complete
Christopher Tate [Wed, 22 Jan 2014 23:50:31 +0000 (15:50 -0800)]
am
cc81bcec: Merge "Only send storage intents after boot complete"
* commit '
cc81bcece411794b4eac6b03b7700a0214fdbb87':
Only send storage intents after boot complete
Christopher Tate [Wed, 22 Jan 2014 23:46:57 +0000 (23:46 +0000)]
Merge "Only send storage intents after boot complete"
Narayan Kamath [Wed, 22 Jan 2014 11:09:09 +0000 (11:09 +0000)]
Remove unused field from AssetManager.
This field was introduced in commit
4bdd33b81a17 but wasn't
used there (or since).
Change-Id: I0615e98b8990d42da6b85f8094ab19eb0465fd9e