Commit Graph

50864 Commits

Author SHA1 Message Date
Jesse Hall
f05ef4e542 Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev 2014-10-02 23:11:09 +00:00
Lajos Molnar
167013b2be am 0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
* commit '0ba908e7a55ce2641f8886db2a059ccaa3f7a22a':
  add OMX_VIDEO_AVCLevel52 constant
2014-10-02 22:54:54 +00:00
Lajos Molnar
0ba908e7a5 Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev 2014-10-02 22:44:31 +00:00
Riley Andrews
6c83398674 Merge "Generate the SurfaceFlinger shader cache on initialization" into lmp-mr1-dev 2014-10-02 20:16:56 +00:00
Michael Lentine
36462d9de0 Merge "Add more logging for dup(fd) failure" into lmp-dev 2014-10-02 19:01:10 +00:00
Jesse Hall
9f5a1b6abd Surface: cancel the dequeued buffer when requestBuffer fails
Partial fix for bug: 17477219
Change-Id: Ibf5a9e26e02c4be8854925a77a70f5c9c7dcf6f2
2014-10-02 18:16:19 +00:00
Michael Lentine
36273c991b Add more logging for dup(fd) failure
Bug: 17477219
Change-Id: Ide0ae16d777c9af783023c705c18a93c00999147
2014-10-02 18:13:02 +00:00
The Android Automerger
bcf2820b24 merge in lmp-mr1-release history after reset to 5ee2c9d20c 2014-10-02 06:14:43 -07:00
Lajos Molnar
cd57b41db4 add OMX_VIDEO_AVCLevel52 constant
Bug: 17676461
Change-Id: I120041e9b2ffe2a232a2419bcb5fe88cb49961cb
2014-10-01 21:49:53 -07:00
Riley Andrews
a51fafc4d8 Generate the SurfaceFlinger shader cache on initialization
Blobcache is not yet enabled for surfaceflinger (as it should be).
As a temporary workaround, generate all needed shaders during
surfaceflinger initialization instead of doing the compilation
on-demand during ui transitions.

Change-Id: I14455b20a3f85f177d85c9c8b76d8ccc35379b39
2014-10-02 01:30:28 +00:00
Christopher Ferris
a91968fd09 Merge "Accept socket connection before tracing." into lmp-dev 2014-10-02 01:11:57 +00:00
Christopher Ferris
ed9354fc84 Accept socket connection before tracing.
Sometimes dumping threads takes a long time and bugreport times
out. This change will cause us to accept the bugreport socket connection
before dumping threads and should avoid the failed to connect to dumpstate
service problems we've seen.

Bug: 17758374
Change-Id: I80afa0353cf1c340873f481a8d1d7faffff54120
2014-10-01 17:35:01 -07:00
Michael Lentine
db57cfbd6f Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev 2014-10-01 22:44:46 +00:00
Michael Lentine
3f121fc650 When eglMakeCurrent fails we need to fix the egl state.
Bug: 16676660

Change-Id: Ie7bee9c78378b9e9206060444319e6ee35e1ab74
2014-10-01 14:50:58 -07:00
Chong Zhang
dd230cb8d2 Merge "add a parameter for PCM limiter enable" into lmp-dev 2014-10-01 21:37:00 +00:00
Chong Zhang
db8cad1585 add a parameter for PCM limiter enable
Bug: 17470065
Change-Id: I327115fc16e7afe2bf5870e123d63f9887161206
2014-10-01 10:39:10 -07:00
Jesse Hall
5bf786d8f0 surfaceflinger: recompute visibility after sideband stream change
We normally recompute layer visibility when a layer gets its first
buffer; before then it's treated as invisible. Sideband layers never
get a buffer (as far as SurfaceFlinger knows), so never became
visible. Now we also recompute visibility when a layer gets a new
sideband stream.

Bug: 17752511
Change-Id: I84e150f196eb2eb7bcd2616248e5e3fa73624809
2014-10-01 09:00:34 -07:00
The Android Automerger
6560c5f0df merge in lmp-mr1-release history after reset to deb71b2812 2014-10-01 06:13:06 -07:00
Dianne Hackborn
5ee2c9d20c Work on issue #17656716: Unhandled exception in Window Manager
Try to clean up the code paths coming in and out of binder IPCs to
plug any places where we could disrupt the gather flag of a thread,
causing it to keep gathering stack crawls (which is the thing that
is causing our strict mode data to become so large).

We now take care of saving and restoring this state in the core
IPC code path, not at the Java layer.

Change-Id: I73d564778da127bdce00f304225930e7f2318293
2014-09-30 11:30:03 -07:00
The Android Automerger
28e900c775 merge in lmp-mr1-release history after reset to deb71b2812 2014-09-30 06:13:55 -07:00
The Android Automerger
2facb0115e merge in lmp-mr1-release history after reset to deb71b2812 2014-09-29 06:15:46 -07:00
Aravind Akella
deb71b2812 Merge "Fix a possible SensorService deadlock." into lmp-dev 2014-09-29 00:49:26 +00:00
Jesse Hall
bacc28ef1d surfaceflinger: Use landscape resolution for default dpi
When HWC doesn't provide DPI values for a display, we pick a default
DPI based on resolution. The intent was that 1080p and higher displays
would get XHIGH density, and lower resolutions would get TV density.
In KK (and possibly forever) we had a bug that we'd always use TV
density. That was fixed in L, but that fix exposed a pre-existing bug
that we always used the display's height in its native orientation,
rather than in landscape orientation. So an 800x1280 tablet like N7v1
started getting XHIGH density instead of the intended TV density.

Bug: 17461633
Change-Id: Ia57fa49e61f36bdda63ce283ef62c9953297222c
2014-09-28 22:26:28 +00:00
Aravind Akella
e148bc29c2 Fix a possible SensorService deadlock.
If the destructor of SensorEventConnection gets called when the main
 sendEvents loop of SensorService is executing it may result in a deadlock.
 The loop promotes each connection to a strong_pointer, calls sendEvents
 and cleans up the connection if necessary. It is possible that the sp's
 destructor may delete SensorEventConnection which will call the dtor
 ~SensorEventConnection(). This dtor again needs SensorService mLock to
 execute which may result in a deadlock.

Bug: 17617897
Change-Id: I76c244dbe85fadb591c0bd1a9a5eb01d93f56505
2014-09-28 21:26:49 +00:00
The Android Automerger
7fe8b2b7d6 merge in lmp-mr1-release history after reset to 71e351d96b 2014-09-28 06:10:26 -07:00
The Android Automerger
6a0a0fe0f7 merge in lmp-mr1-release history after reset to 71e351d96b 2014-09-27 06:11:32 -07:00
Aravind Akella
71e351d96b Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev 2014-09-27 02:09:30 +00:00
Aravind Akella
678f4fce90 Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
This reverts commit 5105960d49.

Change-Id: I4d39ded2e50ef8a8e0aac27e438876203385a1f0
2014-09-27 02:06:32 +00:00
Michael Wright
4b20d40218 Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev 2014-09-26 01:38:57 +00:00
Michael Wright
2e732956ad Only mark repeated keys as PASS_TO_USER if the original key was.
Bug: 17629695
Change-Id: Ic569aba4149c6cc321c2cf8aede7c5e8a1196234
2014-09-25 13:20:20 -07:00
The Android Automerger
1635df88c4 merge in lmp-mr1-release history after reset to 5105960d49 2014-09-25 06:13:48 -07:00
Jesse Hall
728a8da146 Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev 2014-09-24 22:07:01 +00:00
The Android Automerger
e02b69cfad merge in lmp-mr1-release history after reset to 5105960d49 2014-09-24 06:13:22 -07:00
chenhg
0ea1cb9195 surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
BUG: 17382907
Change-Id: I65fd037bd25238ae68a3976468ae7fd7ce49c562
2014-09-23 17:26:00 -07:00
Aravind Akella
5105960d49 Fix sockfd leakage in SensorService. Remove sockfd from Looper
when the connection is removed from mActiveConnections.

Bug: 17472228
Change-Id: Iaabe0968bd2104ef961ff5e8659bf91712e2e1db
2014-09-23 23:46:22 +00:00
The Android Automerger
8c9f7cce8b merge in lmp-mr1-release history after reset to 12c4bdad7b 2014-09-23 15:15:26 -07:00
Michael Lentine
12c4bdad7b Add rate-limited logging for unimplemented es functions.
Bug: 17322013

Change-Id: I7aa5ab2f76cf344cfb75802edbfd44e8e7526ff1
2014-09-23 08:30:12 -07:00
The Android Automerger
2969368f4b merge in lmp-release history after reset to d94854030c 2014-09-23 06:16:24 -07:00
The Android Automerger
15e2cff615 merge in lmp-mr1-release history after reset to d94854030c 2014-09-23 04:46:25 -07:00
Lorenzo Colitti
d94854030c Merge "Include the VPN server IP address in the VPN state file." into lmp-dev 2014-09-23 00:29:59 +00:00
The Android Automerger
68ff95aad4 merge in lmp-mr1-release history after reset to b1982b75c4 2014-09-22 11:44:59 -07:00
The Android Automerger
d57a5b0cb8 merge in lmp-mr1-release history after reset to b1982b75c4 2014-09-22 11:14:20 -07:00
The Android Automerger
0c263b041c merge in lmp-mr1-release history after reset to b1982b75c4 2014-09-22 10:18:17 -07:00
The Android Automerger
da10dcc5dd merge in lmp-release history after reset to b1982b75c4 2014-09-22 06:13:42 -07:00
The Android Automerger
5640d5abe3 merge in lmp-release history after reset to b1982b75c4 2014-09-21 06:11:28 -07:00
The Android Automerger
7de711504d merge in lmp-release history after reset to dcb16082dd 2014-09-20 21:01:53 -07:00
The Android Automerger
888824cc0d merge in lmp-release history after reset to b1982b75c4 2014-09-20 06:12:10 -07:00
Sean Wan
b1982b75c4 am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable.
* commit '60d31a0fc0724d4538d105a800a1565e5f843130':
  Update comment to use correct GPS file for wearable.
2014-09-19 22:02:37 +00:00
Sean Wan
60d31a0fc0 am 3c648e37: Update comment to use correct GPS file for wearable.
* commit '3c648e373a44237c1924fc886daf8418a6e9f4cf':
  Update comment to use correct GPS file for wearable.
2014-09-19 21:49:11 +00:00
Sean Wan
3c648e373a Update comment to use correct GPS file for wearable.
Change-Id: I91c4363dbcc6cada8d6e9599d1b15e77febee0e5
2014-09-19 14:33:51 -07:00