119949 Commits

Author SHA1 Message Date
Ashok Bhat
f5df700e6c AArch64: Make frameworks/base code more portable
Changes in this patch include

[x] Use %zu for size_t, %zd for ssize_t

[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: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f
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-03-27 12:30:42 +00:00
Yevgen Pronenko
0fd4c656d0 Do not show Home behind full screen activity
When ensureActivitiesVisibleLocked goes through foreground activity
stack and reaches non-fullscreen activity, it sets showHomeBehindStack
variable to true.

If there is a fullscreen activity behind, showHomeBehindStack remains
unchanged, which causes Home application to be displayed anyway.
In this case user will see a fullscreen activity and Home activity
simultaneously.

To fix the issue we set showHomeBehindStack to false when we reach
fullscreen activity in the activity stack.

This was made visible by the following commit:
446ef1de8d373c1b017df8d19ebf9a47811fb402

Change-Id: I535c1283a4e26f5cf606375b837d4b7195324af0
2014-03-27 07:54:37 +01:00
Kenny Root
5b93685af3 am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
* commit '57f2764bf104b0fe7b5cd67ad5b2cae9bc8352ed':
  CertificateChainValidator: initialize TrustManagerFactory
2014-03-26 23:59:11 +00:00
Kenny Root
57f2764bf1 Merge "CertificateChainValidator: initialize TrustManagerFactory" 2014-03-26 22:51:52 +00:00
Mark Salyzyn
4e3abafc94 am 5daf51c0: Merge "jni: 64-bit compile issue"
* commit '5daf51c0fe6d5bea858c37291fed88bd3094d3ec':
  jni: 64-bit compile issue
2014-03-26 12:56:02 -07:00
Mark Salyzyn
5daf51c0fe Merge "jni: 64-bit compile issue" 2014-03-26 19:52:11 +00:00
Mark Salyzyn
aeb75fc5a3 jni: 64-bit compile issue
- switch to PRId64
- some unused parameter warning suppression

Change-Id: Ia36bd1a247bb6e866a6b1050ab1362ebc9d31786
2014-03-26 11:28:45 -07:00
Nick Kralevich
fdd6351067 am 491eaf22: Merge "Note libselinux dependency on packages.list format changes."
* commit '491eaf2255a95186e84092eae4ec43582eebb37b':
  Note libselinux dependency on packages.list format changes.
2014-03-26 08:47:39 -07:00
Nick Kralevich
491eaf2255 Merge "Note libselinux dependency on packages.list format changes." 2014-03-26 15:41:14 +00:00
Kenny Root
587a9455de CertificateChainValidator: initialize TrustManagerFactory
Need to call TrustManagerFactory#init before use. I suspect this class
isn't used anywhere since this hasn't caused a problem yet.

Change-Id: I17425d0bba4795d71960062361a755830abba7de
2014-03-26 08:40:45 -07:00
Stephen Smalley
e6e25554d3 Note libselinux dependency on packages.list format changes.
Change-Id: I3c34a86f5706c4fca826a8634936131e4e4fc297
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-03-26 09:19:12 -04:00
riddle_hsu
739e194121 DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
Symptom: ANR occurs on previous activity.
Root Cause:
In KK, when a background activity starts another existed background activity (bring to front),
if current focused stack is not the same as the stack of target starting activity,
it will still resume the top of target stack, even the top activity on the target stack may not the same as target activity.
And it will result incorrect focus, press back key will send to previous stack's top then popup ANR on previous activity:
"Reason: Waiting because no window has focus but there is a focused application".

By original code comment, it looks 'bring to front' should not happen in this issue case.
// If the target task is not in the front, then we need
// to bring it to the front...  except...  well, with
// SINGLE_TASK_LAUNCH it's not entirely clear.  We'd like
// to have the same behavior as if a new instance was
// being started, which means not bringing it to the front
// if the caller is not itself in the front.

If the caller and target are in the same stask, it will just deliver new intent without changing task order (the same behavior as JellyBean).
So the patch concept is just to avoid to use target stack to resume top when caller and target are in different stack.

Solution: Do not allow to resume another stack top if non-top activity try to bring existed activity to front.
It may not be a good solution, just a reminder for the issue case.

Reproduce steps:
Assume A, B, C are different app tasks.
When the application stack is like:
  Top C
      B
      A

 #Case 1: Home is foreground
  A starts B with NEW_TASK, C will resume, focus still stays at Home, and window order does not update.
  Then press back key or volumn key will result ANR on Home.

 #Case 2: App is foreground (Resumed activity is C)
  A starts Home, Home will resume, focus still stays at C, and window order does did not update.
  Then press back key or volumn key will result ANR on C.

Change-Id: If05070123b248e2335791e43a4d4ddee6db11d84
2014-03-26 20:43:17 +08:00
Ricardo Cervera
0b62467b14 am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2
* commit '2564614c2ea1927b1bc26f6ac8a39e236c93e922':
  docs: Amend SDK release notes for 22.6.2
2014-03-25 21:54:09 +00:00
Ricardo Cervera
2564614c2e am 39aed838: docs: Amend SDK release notes for 22.6.2
* commit '39aed838f505314fe6f1947e39de79de2f84ba40':
  docs: Amend SDK release notes for 22.6.2
2014-03-25 21:13:54 +00:00
Ricardo Cervera
39aed838f5 docs: Amend SDK release notes for 22.6.2
Change-Id: I76e46ec5abf7e9f2203eeaef723d06597565d4c9
2014-03-25 13:50:55 -07:00
Ricardo Cervera
c74d3de35b am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
* commit '89a41db09a0a4935a111777e12c01a40765d20be':
  docs: Added release notes for Android SDK 22.6.2
2014-03-25 20:33:50 +00:00
Chris Craik
6fe434a41b am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache"
* commit '4118480aabb4a7b332e289ebb71d2e4f9bc05d7e':
  Solve three memory leaks related to PatchCache
2014-03-25 20:27:52 +00:00
Ricardo Cervera
89a41db09a am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
* commit '825280d2ac85cef7ec1f096b02006c26dba0374a':
  docs: Added release notes for Android SDK 22.6.2
2014-03-25 20:27:51 +00:00
Ricardo Cervera
825280d2ac Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 2014-03-25 20:22:59 +00:00
Chris Craik
4118480aab am 80470cdf: Merge "Solve three memory leaks related to PatchCache"
* commit '80470cdf6c6995f4afe8d5e2c4b6e898625173fb':
  Solve three memory leaks related to PatchCache
2014-03-25 13:21:01 -07:00
Chris Craik
80470cdf6c Merge "Solve three memory leaks related to PatchCache" 2014-03-25 20:11:33 +00:00
Ricardo Cervera
60bec60b9c docs: Added release notes for Android SDK 22.6.2
Change-Id: I6c8abb75b10cf4bc983f67954c169c7ac9ab9b1c
2014-03-25 12:34:32 -07:00
Eino-Ville Talvala
bdaafaf2b5 am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
* commit '1555cec2e5452c6d4583dfd3deffbb28ebd886fe':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
2014-03-25 19:11:27 +00:00
Eino-Ville Talvala
1555cec2e5 am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
* commit 'ecad0541a6e90b98ad96456c4e6992121ee8a789':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
2014-03-25 19:01:45 +00:00
Eino-Ville Talvala
ecad0541a6 Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 2014-03-25 18:57:08 +00:00
Michael Lekman
89bc413b8f Marquee text RTL improvements
Changed marquee text to scroll according to
the reading direction. Arabic text will
show the right edge and scroll towards
the left edge and vice versa for Latin.

Corrected marquee flicker when scroll animation
finished. The ghost scroll's x position was cast
to int and it made the text flicker when
marquee stops.

Ghost part didn't display for RTL languages.
Added multiplication with
getParagraphDirection to negate the ghost
offset.

Change-Id: I689039118df01a62f73ef0079c857fea1bfcc5a0
2014-03-25 18:03:34 +00:00
Craig Mautner
a0ce927440 am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '74e19f572a598ce907661ed2f5127319f8d7c635':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
2014-03-25 18:00:50 +00:00
Scott Main
c5fa9139b8 am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
* commit '78373edb8d5838276c73a418b07f735ad20286dc':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
2014-03-25 18:00:47 +00:00
Craig Mautner
74e19f572a am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '6f955df8e632aabeef312d488b7ebbad25d8a2d8':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
2014-03-25 17:58:54 +00:00
Scott Main
78373edb8d am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
* commit '837a4885978dd29cda4b8309051284af5a45f41c':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
2014-03-25 17:54:35 +00:00
Craig Mautner
6f955df8e6 am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '550b44d1884c5f65187dbc8bf8d4e6090f302a7b':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
2014-03-25 17:48:38 +00:00
Scott Main
837a488597 fix links and add note that adb forward must be repeated
bug: 13474515
bug: 13576843

Change-Id: I808efb5fa1fae2280b4447ad0278ea1d4428b5b6
2014-03-25 10:46:37 -07:00
Craig Mautner
550b44d188 am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit 'f4644189f665f221e8033587811e58f12e2ccc86':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
2014-03-25 10:42:38 -07:00
Craig Mautner
3c8794031a am 703169a3: am 2b2395f3: Merge "Don\'t wait for finishing animation when second display is disconnected" into klp-dev
* commit '703169a3822382f4ec7831739ea5917bdd129871':
  Don't wait for finishing animation when second display is disconnected
2014-03-25 17:36:42 +00:00
Craig Mautner
f4644189f6 am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
2014-03-25 10:36:04 -07:00
Craig Mautner
4cf6286c3c am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '02c7ba73e8733def289535b6d13dc6a504a0443f':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
2014-03-25 10:29:48 -07:00
Craig Mautner
703169a382 am 2b2395f3: Merge "Don\'t wait for finishing animation when second display is disconnected" into klp-dev
* commit '2b2395f39a7a3b271f7d1072acec64db1554694e':
  Don't wait for finishing animation when second display is disconnected
2014-03-25 17:29:10 +00:00
Kenny Root
11b29e4e1b am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"
* commit 'c1d863e7a4b55f8e583067eebaffc6686723d7ab':
  Use X509ExtendedTrustManager and not Conscrypt
2014-03-25 17:26:38 +00:00
Craig Mautner
e6e9b14c99 am 9bbd2f97: am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected"
* commit '9bbd2f977ba4d6c4642f96673f937a677ff0beb2':
  Don't wait for finishing animation when second display is disconnected
2014-03-25 17:26:28 +00:00
Craig Mautner
02c7ba73e8 am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '41bb0637ca430808ab40a0300467ea58ae0a05c3':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
2014-03-25 10:22:56 -07:00
Craig Mautner
2b2395f39a Merge "Don't wait for finishing animation when second display is disconnected" into klp-dev 2014-03-25 17:22:55 +00:00
Kenny Root
c1d863e7a4 am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"
* commit '77ceb5e8f18608cdbf19831f6188db87a5e0c058':
  Use X509ExtendedTrustManager and not Conscrypt
2014-03-25 10:19:27 -07:00
Craig Mautner
9bbd2f977b am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected"
* commit '2cacc619d62f58ee8a9d0fcfac942c6d5faf7031':
  Don't wait for finishing animation when second display is disconnected
2014-03-25 10:19:24 -07:00
Kenny Root
77ceb5e8f1 Merge "Use X509ExtendedTrustManager and not Conscrypt" 2014-03-25 17:06:55 +00:00
Koji Fukui
9bc5f2f457 Don't wait for finishing animation when second display is disconnected
Basically WindowManagerService wait for finishing animation when
a window is removed. But when second display is disconnected, windows
on second display can't be shown even if animation is waited for.
On the contrary, it keeps on waiting for finishing the animation
in special case.

With this fix windows are immediately removed without waiting for
animation when second display is disconnected.

(Cherry picked from aosp 39f7068ed903f747d6885117dc1bac69f626ae91)

Change-Id: I1354c193c04db394a21a11c174e10c8e7da17a0e

Fixes bug: b/13632129
2014-03-25 17:04:27 +00:00
Craig Mautner
41bb0637ca am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '76e85eec845ff3688e6fd5b7bafbb5934530df4b':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
2014-03-25 10:04:07 -07:00
Craig Mautner
df7da51311 am ca903d38: am 81e094d7: Merge "Move task to top in window manager." into klp-dev
* commit 'ca903d3809ccd78b73b634ff7591863dbed55823':
  Move task to top in window manager.
2014-03-25 17:02:13 +00:00
Baligh Uddin
dab65ff244 am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '29526ccad0b67dd93eae034fa8cc80341cab69db':
  Import translations. DO NOT MERGE
2014-03-25 17:02:10 +00:00
Craig Mautner
2cacc619d6 Merge "Don't wait for finishing animation when second display is disconnected" 2014-03-25 17:01:28 +00:00
Craig Mautner
76e85eec84 am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '3bc9971d707839f2d26e601082d654242295002d':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
2014-03-25 09:58:17 -07:00