Commit Graph

50906 Commits

Author SHA1 Message Date
Andres Morales
2e671bbdb7 Fix deadlock when killing adb bugreport
Leave default signal handler (terminate) for parent process,
add SIG_IGN as signal handler for children and let them
go down when the parent gets SIGPIPE.

Bug: 17109154
Change-Id: Id33db3e97a32f289eb2a9a1a0ca8acbe3dcd285d
2014-08-22 12:10:44 -07:00
Michael Wright
dea63477e4 am b1bbfc2d: Merge "Add Voice Assist key." into lmp-dev
* commit 'b1bbfc2d029b709f6b4bb26f4d840e4002eb3781':
  Add Voice Assist key.
2014-08-22 18:20:54 +00:00
Michael Wright
b1bbfc2d02 Merge "Add Voice Assist key." into lmp-dev 2014-08-22 18:02:01 +00:00
Calin Juravle
116f905da9 am 72deed8c: Merge "Fix validation of system paths in installd."
* commit '72deed8cd25349ed12390a7a5088d07d63f3d8cd':
  Fix validation of system paths in installd.
2014-08-22 17:27:58 +00:00
Calin Juravle
72deed8cd2 Merge "Fix validation of system paths in installd." 2014-08-22 17:11:52 +00:00
Michael Lentine
e246124516 am eb21986d: Merge "Update currentConfig variable when active display is changed." into lmp-dev
* commit 'eb21986df0429d63f5e9678741730f07f17dcbad':
  Update currentConfig variable when active display is changed.
2014-08-22 16:52:12 +00:00
Michael Lentine
eb21986df0 Merge "Update currentConfig variable when active display is changed." into lmp-dev 2014-08-22 16:34:14 +00:00
Calin Juravle
01f481649d am c597b6dd: Fix validation of system paths in installd.
* commit 'c597b6dd895dbb2b28c757ce7a2651b3cdc9b00c':
  Fix validation of system paths in installd.
2014-08-22 14:54:28 +00:00
Calin Juravle
f53c08befc Fix validation of system paths in installd.
System apps are now installed under their own directory
(system_app_dir/app_dir/app.apk). The new path doesn't pass installd
validation because of obsolete checks which verify that the path does
not contain subdirectories past the system_app_dir.

The CL fixes the validation to accept at most on subdirectory.

Bug: 17109858

(cherry picked from commit c597b6dd89)

Change-Id: Ic5f15d1864c6af9f4c4b07dc27244ebbb521ad5e
2014-08-22 15:33:30 +01:00
Calin Juravle
f3495c36cb am 57282562: Merge "Allow apk path to contain one subdirectory."
* commit '5728256201a3f67365f24763813f72354668667a':
  Allow apk path to contain one subdirectory.
2014-08-22 13:59:23 +00:00
Calin Juravle
c597b6dd89 Fix validation of system paths in installd.
System apps are now installed under their own directory
(system_app_dir/app_dir/app.apk). The new path doesn't pass installd
validation because of obsolete checks which verify that the path does
not contain subdirectories past the system_app_dir.

The CL fixes the validation to accept at most on subdirectory.

Bug: 17109858
Change-Id: I13abb52c0016610ff436f6a26bb6b3b85dc4dfb0
2014-08-22 14:52:53 +01:00
Calin Juravle
5728256201 Merge "Allow apk path to contain one subdirectory." 2014-08-22 13:40:50 +00:00
Calin Juravle
c542d1141d am 67cfe0c0: Merge "Allow apk path to contain one subdirectory." into lmp-dev
* commit '67cfe0c0660c36ca385ad0eeb1352a2df721b49c':
  Allow apk path to contain one subdirectory.
2014-08-22 13:15:53 +00:00
Calin Juravle
9d76156266 Allow apk path to contain one subdirectory.
In the current directory layout this prevented rm_dex and move_dex
commands to validate the apk path and thus cleaning up resources.

Bug: 16888084

(cherry picked from commit fd88ff2edd)

Change-Id: I1002529b0c35852c67540d3165d1444523460592
2014-08-22 14:04:45 +01:00
Calin Juravle
67cfe0c066 Merge "Allow apk path to contain one subdirectory." into lmp-dev 2014-08-22 12:58:11 +00:00
Michael Wright
51409573be Add Voice Assist key.
Bug: 16292420
Change-Id: I607fadc2edf673079bfd9f7406e6e45603474957
2014-08-21 19:09:49 -07:00
Aravind Akella
5bee4fc913 am e74baf6c: SensorService fixes.
* commit 'e74baf6ca7d57375f38540b6b7ac5e4af019951b':
  SensorService fixes.
2014-08-22 00:05:39 +00:00
Michael Lentine
d3e6914cea Update currentConfig variable when active display is changed.
Bug: 17182607
Change-Id: I8631c105a9e0fa402a7d9670717becc9857af935
2014-08-21 14:43:13 -07:00
Aravind Akella
e74baf6ca7 SensorService fixes.
i) Add more debug stats (acks needed, acks received)
  ii) Comment out write failure message.

Change-Id: Iac892a66530849a2dd023d6f5628cd070a79537d
2014-08-21 12:28:35 -07:00
Colin Cross
368e2eceb7 am 61a4eecb: Merge "atrace: avoid unnecessary writes to trace_clock" into lmp-dev
* commit '61a4eecbe615bc94944161c4cf4aa590dfca1b2e':
  atrace: avoid unnecessary writes to trace_clock
2014-08-21 03:06:23 +00:00
Naseer Ahmed
3e70928f6e am 949ea086: sf: Clear display configs when hot pluggable display is disconnected
* commit '949ea0868de1df7e2f28a32d777cc41f901d6770':
  sf: Clear display configs when hot pluggable display is disconnected
2014-08-21 02:57:12 +00:00
Jesse Hall
11cec5a0ef am d4548dd0: am 514e30a9: am c3d1889e: Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev
* commit 'd4548dd0272f5a4edee1d7ff070458728848b35c':
  surfaceflinger: skip composition for empty frames
2014-08-21 00:44:35 +00:00
Michael Lentine
d435b56ab8 am 4d7c4100: Merge "Destroy eglSurface before recreating." into lmp-dev
* commit '4d7c41008d0945b58d802e04d0bea28e9b739a5f':
  Destroy eglSurface before recreating.
2014-08-21 00:43:55 +00:00
Naseer Ahmed
949ea0868d sf: Clear display configs when hot pluggable display is disconnected
Display configs for external displays are stored in the framework
everytime we receive a hot plug to connect. However, since the
configs are not cleared on disconnect, framework will just assume
that the configs are valid. This does not work for use cases when
you connect/disconnect external displays with different resolutions.

e.g. 1080p to 4K and vice-versa

With this change we clear the display configs and repopulate when
we receive a hot plug to connect.

Change-Id: I2eeab186a8d8668a53390a2413b2ce5e044a1845
Acked-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
2014-08-20 15:10:14 -07:00
Jesse Hall
d4548dd027 am 514e30a9: am c3d1889e: Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev
* commit '514e30a96cefad109509ce01622fa7f82f3f318c':
  surfaceflinger: skip composition for empty frames
2014-08-20 20:02:02 +00:00
Jesse Hall
514e30a96c am c3d1889e: Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev
* commit 'c3d1889e508038efe240ed1974ed377a2e12835c':
  surfaceflinger: skip composition for empty frames
2014-08-20 19:52:40 +00:00
Vinod Krishnan
3d5e4e9542 am 1b6d7c12: am 2eaec5a8: am 1f1ca890: Adding an ECG hardware feature
* commit '1b6d7c1269ba6fca3f4edd2f6f515b708c8b3fa2':
  Adding an ECG hardware feature
2014-08-20 18:49:04 +00:00
Vinod Krishnan
1b6d7c1269 am 2eaec5a8: am 1f1ca890: Adding an ECG hardware feature
* commit '2eaec5a833f69b3c460386e38aa6affe5e4b1772':
  Adding an ECG hardware feature
2014-08-20 18:29:27 +00:00
Vinod Krishnan
2eaec5a833 am 1f1ca890: Adding an ECG hardware feature
* commit '1f1ca890d4d82cd8d54d428c3120945a0a308975':
  Adding an ECG hardware feature
2014-08-20 18:18:32 +00:00
Ben Clayton
6c011731d0 am 4c5b9acf: Merge "Don\'t try to capture the pointer when using PBOs for texture APIs" into lmp-dev
* commit '4c5b9acf655531f1be45bf7fffc5ee145a80cca7':
  Don't try to capture the pointer when using PBOs for texture APIs
2014-08-20 16:32:37 +00:00
Michael Lentine
d0c20394d2 am 2cfbef25: Merge "Fix inverse orientation when original is not applied first." into lmp-dev
* commit '2cfbef255b0e1b1b8fad3cba0e447d79a7b8203b':
  Fix inverse orientation when original is not applied first.
2014-08-20 15:46:34 +00:00
Calin Juravle
fd88ff2edd Allow apk path to contain one subdirectory.
In the current directory layout this prevented rm_dex and move_dex
commands to validate the apk path and thus cleaning up resources.

Bug: 16888084
Change-Id: Iba579d075a9c6d7de047e7ffef95441498257086
2014-08-20 15:37:54 +01:00
Colin Cross
61a4eecbe6 Merge "atrace: avoid unnecessary writes to trace_clock" into lmp-dev 2014-08-20 12:26:29 +00:00
Colin Cross
b1ce49b2ed atrace: avoid unnecessary writes to trace_clock
Writing to trace_clock erases the trace buffer, even if the value
hasn't changed.  This prevents use of --async_start and --async_dump
to leave background tracing running and dump after an even that
needs debugging, because --async_dump writes to trace_clock and
resets the buffer before it can read it.

Read and parse the current value from trace_clock before writing,
and skip the write if the value isn't changing.

Change-Id: Ia2ec5bb654fb0bd179771b511ff261731ba47dca
2014-08-20 14:28:47 -07:00
Michael Lentine
1438f6da7e am 62205596: Merge "Fix camera orientation by swapping horizontal and vertical flips when needed." into lmp-dev
* commit '62205596b9848d9d7d9de90aa0f5682d6ce17ea3':
  Fix camera orientation by swapping horizontal and vertical flips when needed.
2014-08-19 23:50:18 +00:00
Vinod Krishnan
1f1ca890d4 Adding an ECG hardware feature
Change-Id: I368772d4cd6b2713fb5180bedc91bf2b5bc015b4
2014-08-19 16:02:13 -07:00
Michael Lentine
4d7c41008d Merge "Destroy eglSurface before recreating." into lmp-dev 2014-08-19 22:53:25 +00:00
Michael Lentine
f2568dea41 Destroy eglSurface before recreating.
Bug: 16856208

Change-Id: Ifb5c8997afab4bc922356a3542d1f899a2546855
2014-08-20 10:56:34 -07:00
Michael Lentine
7b90258c7b Fix inverse orientation when original is not applied first.
Change-Id: I6f1a11950c77c99800acbf08a672bc1b2310b0b5
2014-08-19 18:16:01 -07:00
Michael Lentine
1440963470 Fix camera orientation by swapping horizontal and vertical flips when needed.
Bug: 16637957

Change-Id: I66de597546fdc19e0af9e6150ca20460ab36bf8b
2014-08-19 16:16:35 -07:00
Michael Lentine
2cfbef255b Merge "Fix inverse orientation when original is not applied first." into lmp-dev 2014-08-19 22:53:25 +00:00
Hans Boehm
02a1c2cb37 am efc0b35f: Merge "Fix CAS argument type."
* commit 'efc0b35fbd256bb3e225f4a1b953d0895ee3e99a':
  Fix CAS argument type.
2014-08-19 22:28:41 +00:00
Michael Lentine
1b20b8e694 am b3abe7c0: Merge "Incorporate TransformToDisplayInverse into the crop calculation." into lmp-dev
* commit 'b3abe7c06a834d92439d034b29e3b5af632de130':
  Incorporate TransformToDisplayInverse into the crop calculation.
2014-08-19 21:13:00 +00:00
Riley Andrews
38e451f057 am 51d3d176: Merge "Within CpuConsumer, use gralloc lockAsync/unlockAsync" into lmp-dev
* commit '51d3d176e35abc8b72e55035b0f7b81388ee044d':
  Within CpuConsumer, use gralloc lockAsync/unlockAsync
2014-08-19 21:07:51 +00:00
Aravind Akella
d553ce4092 am a54f3b2f: Merge "SensorService fixes." into lmp-dev
* commit 'a54f3b2f4a1d531bca952b5a10fa8181502ce820':
  SensorService fixes.
2014-08-19 20:34:18 +00:00
Riley Andrews
66a9921997 am 86639909: Take advantage of sync points during screen cap.
* commit '866399093f9f60e7305f291e688abb456bace710':
  Take advantage of sync points during screen cap.
2014-08-19 20:02:07 +00:00
Riley Andrews
866399093f Take advantage of sync points during screen cap.
Do not wait for the screen capture to complete within surface flinger,
instead pass a sync point back with the captured gralloc buffer.

Change-Id: I7137c0e0fc710688d1d61f189159418fb27ea263
2014-08-19 19:27:14 +00:00
Michael Lentine
b3abe7c06a Merge "Incorporate TransformToDisplayInverse into the crop calculation." into lmp-dev 2014-08-19 15:47:37 +00:00
Jesse Hall
c3d1889e50 Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev 2014-08-19 02:43:23 +00:00
Jesse Hall
b7a0549c98 surfaceflinger: skip composition for empty frames
By not committing the results of composition for empty frames, we
avoid spitting out series of black frames for virtual displays that
don't have visible layers. We still draw one black frame when going
from having layers to not having any. In particular, this avoids
having a series of empty frames due to re-compositing the primary
display in the period between creating the virtual display and adding
layers to it.

Bug: 16786752
Change-Id: I7e9b2ed2e407d8d49c7af736b447d4c6181b0ad8
2014-08-19 22:15:43 -07:00