119977 Commits

Author SHA1 Message Date
Xiaofei Wan
21e0af987d Fix RenderScriptGL setSurfaceTexture problem
rsnContextSetSurfaceTexture() has no implementation in rs-jni, use nContextSetSurface() in setSurfaceTexture().

Change-Id: I066432575c9e74f21ea3a3776628b572b6e31377
Signed-off-by: Xiaofei Wan <xiaofei.wan@intel.com>
2014-03-31 14:40:08 +08:00
Wink Saville
44b43a51c7 am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
* commit '1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
  GlobalActions: Fix Airplane Mode on/off issue
2014-03-30 15:11:27 +00:00
Wink Saville
1e4cad8198 Merge "GlobalActions: Fix Airplane Mode on/off issue" 2014-03-30 00:15:22 +00:00
nagarw
c3b7e6fd44 GlobalActions: Fix Airplane Mode on/off issue
Issue: Unable to turn off Airplane mode from power button
       after phone reboot

Fix: Initialize mHasTelephony before the PhoneStateListener is
     registered to the TelephonyManager so that correct value
     of mHasTelephony is reflected when onServiceStateChanged
     callback is called.

Bug: 13697360
Change-Id: Ide8afd9c16ea90b98b5912dbff440c5fd67b178d
2014-03-28 16:54:58 -07:00
Jeff Hao
d648e5f7ba am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
* commit 'e9b4fd0718c00a504602453185de676618beed4b':
  Mark constructor as accessible in LayoutInflater.
2014-03-28 22:16:41 +00:00
Craig Mautner
155e313340 am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
* commit 'd511bc17d614b1291f1b85f84180c1db157d2790':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
2014-03-28 22:16:38 +00:00
Michael Wright
6a14146b37 am e328056d: Merge "Add support for additional international keyboard mappings"
* commit 'e328056ddcba0edd0e49b4697dfcc84f3658cb39':
  Add support for additional international keyboard mappings
2014-03-28 22:16:35 +00:00
Craig Mautner
9395dab7c3 am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
* commit 'ff3362f0d8378d616f39cbcf8b86b6f03e7d30b9':
  DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
2014-03-28 22:16:33 +00:00
Jeff Hao
e9b4fd0718 Merge "Mark constructor as accessible in LayoutInflater." 2014-03-28 21:41:21 +00:00
Craig Mautner
d511bc17d6 Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off." 2014-03-28 20:27:33 +00:00
Michael Wright
e328056ddc Merge "Add support for additional international keyboard mappings" 2014-03-28 20:26:08 +00:00
Craig Mautner
ff3362f0d8 Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front." 2014-03-28 20:23:34 +00:00
Jeff Hao
e3abd2ccbe Mark constructor as accessible in LayoutInflater.
Needed to bypass new access checks for fields, methods, and
constructors.

Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
2014-03-28 11:33:53 -07:00
Anders Kristensen
aee03bb1a1 am 49c06150: Merge "Remove duplicate call disconnect codes."
* commit '49c061501dbcff0dd6f6621afa76136d0857622a':
  Remove duplicate call disconnect codes.
2014-03-28 17:27:18 +00:00
Anders Kristensen
49c061501d Merge "Remove duplicate call disconnect codes." 2014-03-28 17:19:57 +00:00
Robert Craig
172d38bcda Change when the SELinux relabel of /data/data occurs.
Perform the relabel of the /data/data/<pkg> directories
when the app is being scanned by the PMS. The impetus
for this change was that the data directories of forward
locked apps were receiving the wrong label during an
OTA. Because the PMS doesn't actually scan forward locked
apps til later in the boot process, the prior restorecon
call was actually applying the default label of
system_data_file for all such apps. By performing a
restorecon on each individual app as they are entered into
the PMS we can handle them correctly. This mechanism also
allows us to pass down the seinfo tag as part of the
restorecon call which drops our need to rely on the contents
of packages.list.

Change-Id: Ie440cba2c96f0907458086348197e1506d31c1b6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-03-28 12:24:29 -04:00
Adam Lesinski
004ceaaa4d am 55a65509: Merge "Reduce warning verbosity in aapt"
* commit '55a655091a30667ba7c091dc22d350c0bb8d8641':
  Reduce warning verbosity in aapt
2014-03-27 21:00:08 +00:00
Adam Lesinski
55a655091a Merge "Reduce warning verbosity in aapt" 2014-03-27 20:55:14 +00:00
Craig Mautner
7f7ce0f71b am a2824410: Merge "Do not show Home behind full screen activity"
* commit 'a282441038b8a82be1b9b6afc41145e5570ce377':
  Do not show Home behind full screen activity
2014-03-27 20:07:57 +00:00
Craig Mautner
a282441038 Merge "Do not show Home behind full screen activity" 2014-03-27 20:01:11 +00:00
Colin Cross
232d422405 am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit 'f0ffa8a38e90f64912686833dba9823b251fae57':
  app_process: use LOCAL_MULTILIB := both
2014-03-27 17:30:01 +00:00
Colin Cross
f0ffa8a38e Merge "app_process: use LOCAL_MULTILIB := both" 2014-03-27 17:26:08 +00:00
Colin Cross
f130f0aaea app_process: use LOCAL_MULTILIB := both
Use LOCAL_MULTILIB := both to build app_process64 instead of
duplicating the build rule.

Also causes PRODUCT_PACKAGES := app_process to install both
versions on 64-bit platforms, as the module names for both
app_process and app_process64 are now app_process.

Change-Id: Ia3c3265d15475771b0cae8bace53b8fbf351c186
2014-03-27 10:20:29 -07:00
Olivier Gay
d2923266ae Add support for additional international keyboard mappings
Add kcm mapping files for Arabic, Greek, Hebrew, Lithuanian
and Spanish (Latin).

Change-Id: I35cb2a4d6e016c6f565fba05710ba1626452fe68
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
2014-03-27 17:49:52 +01:00
Narayan Kamath
eaab4df0dd am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"
* commit 'cd3f60f30366a34b4499aab5a47b622069ba9cd6':
  AArch64: Make frameworks/base code more portable
2014-03-27 12:36:10 +00:00
Narayan Kamath
cd3f60f303 Merge "AArch64: Make frameworks/base code more portable" 2014-03-27 12:30:53 +00:00
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