118550 Commits

Author SHA1 Message Date
Scott Main
31db1bbaa1 am cf010ab9: add google cast feature page
* commit 'cf010ab9c5df8896c57a722137ac3b4306ef1ca5':
  add google cast feature page
2014-01-29 04:02:03 +00:00
Scott Main
cf010ab9c5 add google cast feature page
Change-Id: Ie46b8ecdccea5ab3069176d15562d69aacc2d831
2014-01-28 19:54:46 -08:00
Adam Koch
a816db990c Doc fix: Update code snippet in displaying bitmaps training class
Bug: 12715659

Change-Id: I33ad0ae04ff8855a3fc09a312830e0277dcfe70d
2014-01-29 14:52:28 +11:00
Scott Main
c510adb7e6 am 2d27da36: am 3781318f: add Cast to the sidenav
* commit '2d27da36489668d2fedce0bbdcfe50e96206bdd1':
  add Cast to the sidenav
2014-01-29 00:06:11 +00:00
Scott Main
2d27da3648 am 3781318f: add Cast to the sidenav
* commit '3781318fefba28699e7713b231c9591bf29eadac':
  add Cast to the sidenav
2014-01-29 00:02:52 +00:00
Scott Main
3781318fef add Cast to the sidenav
Change-Id: I7bb04e523363ad4964eb5bef405d9e2e4456e2d0
2014-01-28 15:58:48 -08:00
Mark Salyzyn
d732f561b2 am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db
* commit '2c6b048bed296949878318a7c60faf247f538e67':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
2014-01-28 21:38:43 +00:00
Mark Salyzyn
2c6b048bed am 967c5d00: Merge changes I3659193f,I8b78e4db
* commit '967c5d00dfcd890820c3ca82bc608814ebfe1cc1':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
2014-01-28 13:36:14 -08:00
Mark Salyzyn
967c5d00df Merge changes I3659193f,I8b78e4db
* changes:
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
2014-01-28 21:30:40 +00:00
Narayan Kamath
8773d51eae resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp
Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b
2014-01-28 19:47:58 +00:00
Narayan Kamath
be674bf688 am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '23abbfbb814501b825edc056027270f03f39506b':
  AArch64: Use long for pointers in graphics/Camera
2014-01-28 19:18:45 +00:00
Narayan Kamath
7ae1726d0b am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit 'aa9ba887371e875ffbde49f43fa12bb5f123425b':
  AArch64: Make graphics classes 64-bit compatible
2014-01-28 19:18:40 +00:00
Narayan Kamath
b82b2f9851 am 9b0f4be0: Merge "Track 64bit changes to android/graphics."
* commit '9b0f4be0a20ee48a3ddf56438e846231955bd557':
  Track 64bit changes to android/graphics.
2014-01-28 11:16:00 -08:00
Narayan Kamath
23abbfbb81 am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '154614abbcc819c265bfb79b2626fcee66333ac2':
  AArch64: Use long for pointers in graphics/Camera
2014-01-28 11:15:57 -08:00
Narayan Kamath
aa9ba88737 am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '6e09eb4c6753f8e5cbd04f9b0c7b65046d27afdb':
  AArch64: Make graphics classes 64-bit compatible
2014-01-28 11:15:47 -08:00
Narayan Kamath
9b0f4be0a2 Merge "Track 64bit changes to android/graphics." 2014-01-28 19:12:33 +00:00
Narayan Kamath
154614abbc Merge "AArch64: Use long for pointers in graphics/Camera" 2014-01-28 19:12:30 +00:00
Narayan Kamath
6e09eb4c67 Merge "AArch64: Make graphics classes 64-bit compatible" 2014-01-28 19:12:17 +00:00
Craig Mautner
093256279c 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
2014-01-28 18:11:13 +00:00
Craig Mautner
245b58d6f4 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
2014-01-28 10:08:18 -08:00
Craig Mautner
baf2c7a400 Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager" 2014-01-28 18:05:31 +00:00
Narayan Kamath
84151432e7 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
2014-01-28 17:56:12 +00:00
Ashok Bhat
5753b45516 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>
2014-01-28 17:53:30 +00:00
Ashok Bhat
a0398430fc 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>
2014-01-28 17:40:38 +00:00
louis_chang
d5c91ece7b [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
2014-01-28 18:38:06 +08:00
Mark Salyzyn
3ed8e2e679 jni: Resolve build warnings
(cherry picked from commit 087f58dd80e3296a53c6e3c74c089e9a0265f3bd)

Change-Id: I3659193f1ba1ba94561e4684cdb6627880ffc2fa
2014-01-27 15:25:51 -08:00
Mark Salyzyn
7933c2943f jni: Incorporate liblog reading API
(cherry picked from commit e11cbd441df4a1689c89b2ab91b84523c9f2fd10)

Change-Id: I8b78e4db67b6daabb975ce740fb40478df4ffcef
2014-01-27 15:25:09 -08:00
Christopher Tate
0e8f02d68f 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.
2014-01-27 11:43:23 -08:00
Christopher Tate
76dcacada7 am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '1ff4293e33f98e6dc19e4f154cb497af9bd88c9d':
  Fixed race condition in Spinner.DialogPopup on null reference.
2014-01-27 11:40:51 -08:00
Christopher Tate
1ff4293e33 Merge "Fixed race condition in Spinner.DialogPopup on null reference." 2014-01-27 19:29:56 +00:00
Mathieu Chartier
15594557f1 am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit '137d74d89cc57d146af8ca91ad7830a950c7e8b8':
  Fix dest == src bugs in Matrix.cpp.
2014-01-27 11:20:21 -08:00
Mathieu Chartier
137d74d89c am db525724: Merge "Fix dest == src bugs in Matrix.cpp."
* commit 'db5257248637df729ec4f8db58bdfbf0660051b2':
  Fix dest == src bugs in Matrix.cpp.
2014-01-27 11:17:13 -08:00
Mathieu Chartier
db52572486 Merge "Fix dest == src bugs in Matrix.cpp." 2014-01-27 17:26:48 +00:00
Narayan Kamath
ebd43d46eb 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*.
2014-01-27 04:01:15 -08:00
Narayan Kamath
dff83e2b12 am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit 'd5970e9ca34038051f694c7349fa5f3548ee9499':
  AssetManager cookies should be int32_t and not void*.
2014-01-27 03:58:32 -08:00
Narayan Kamath
d5970e9ca3 Merge "AssetManager cookies should be int32_t and not void*." 2014-01-27 11:56:03 +00:00
Narayan Kamath
745d4efc83 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
2014-01-27 11:20:24 +00:00
Wink Saville
d165f365b3 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.
2014-01-26 08:49:09 -08:00
Wink Saville
5d2d911ad1 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.
2014-01-26 08:43:28 -08:00
Mathieu Chartier
768480c245 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
2014-01-25 17:54:22 -08:00
Wink Saville
d1eeb67478 Merge "Telephony: Modify code to check that PUK code length is always 8." 2014-01-25 21:51:34 +00:00
Narayan Kamath
7866f2fcfa am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '8005b9af11ea366672d739769510240f931f3050':
  Remove unused field from AssetManager.
2014-01-24 01:42:08 -08:00
Narayan Kamath
8005b9af11 am 3c30eff6: Merge "Remove unused field from AssetManager."
* commit '3c30eff63fb33901df4e040ecce78f7755be588f':
  Remove unused field from AssetManager.
2014-01-24 01:39:47 -08:00
Narayan Kamath
3c30eff63f Merge "Remove unused field from AssetManager." 2014-01-24 09:27:48 +00:00
Selim Gurun
6735020adb am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit 'd261243c146515184cb4caf2284c6764a045443a':
  Revert "Adding freeMemoryForTests static method to WebView."
2014-01-23 14:39:53 -08:00
Selim Gurun
d261243c14 am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit 'a3106d1dbe5141a6df742262f4bbe8cf2c8ea915':
  Revert "Adding freeMemoryForTests static method to WebView."
2014-01-23 14:37:15 -08:00
Selim Gurun
a3106d1dbe Merge "Revert "Adding freeMemoryForTests static method to WebView."" 2014-01-23 22:26:33 +00:00
Selim Gurun
355ed4ac43 Revert "Adding freeMemoryForTests static method to WebView."
This reverts commit c6a2a6e20f7ddd5a903e9395f6c574c316960694.

Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
2014-01-23 22:13:40 +00:00
Selim Gurun
d9c2e3d30f am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit '016075239fc28704bb0e2b78a3c5540fde711eea':
  Adding freeMemoryForTests static method to WebView.
2014-01-23 11:51:22 -08:00
Selim Gurun
016075239f am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit 'f6d69ae0f9215e08137b010acb4076a30e3d28c6':
  Adding freeMemoryForTests static method to WebView.
2014-01-23 11:49:00 -08:00