Commit Graph

50850 Commits

Author SHA1 Message Date
The Android Automerger
6fc658bac9 merge in lmp-mr1-release history after reset to 91c395f6c3 2014-10-19 06:09:58 -07:00
The Android Automerger
86e63d6297 merge in lmp-mr1-release history after reset to 91c395f6c3 2014-10-18 06:11:01 -07:00
The Android Automerger
5b2299bb01 merge in lmp-mr1-release history after reset to 91c395f6c3 2014-10-16 06:12:17 -07:00
Robin Lee
91c395f6c3 am 60fd3fee: Migrate CA certificates to all users
* commit '60fd3feecab4336d964ca8e31c7c3220e1afb558':
  Migrate CA certificates to all users
2014-10-15 23:25:00 +00:00
Robin Lee
60fd3feeca Migrate CA certificates to all users
Copies the /data/misc/keychain/cacert-* directories to all users on
the device, whereas previously they were simply copied to user 0.

This is a shallow copy so anything that wasn't supposed to be there
will disappear.

Bug: 17811821
Change-Id: Iae5909ab8d5efdb83c9c8fdf0e10ab7060d022cc
2014-10-15 19:04:33 +00:00
The Android Automerger
988df07865 merge in lmp-mr1-release history after reset to 53aad5e7de 2014-10-15 06:11:48 -07:00
Lajos Molnar
53aad5e7de am 3454f123: media: add kMetadataBufferTypeGraphicBuffer
* commit '3454f123d0a10bd0ce0760828996aa26c80a8fd4':
  media: add kMetadataBufferTypeGraphicBuffer
2014-10-14 19:56:24 +00:00
The Android Automerger
aeb3f1d837 merge in lmp-mr1-release history after reset to 2e5f8eaa7d 2014-10-14 06:11:29 -07:00
Lajos Molnar
3454f123d0 media: add kMetadataBufferTypeGraphicBuffer
Bug: 17935149
Change-Id: I1c26d1e83d8fa0a9ccdb25f6f3b19a86b1dc6f37
2014-10-13 22:58:03 -07:00
The Android Automerger
4b482de115 merge in lmp-mr1-release history after reset to 2e5f8eaa7d 2014-10-13 06:11:18 -07:00
Jeff Brown
2e5f8eaa7d am ffb49774: Improve ANR diagnostics.
* commit 'ffb497743831ae4857b674629b58ea3c46d01431':
  Improve ANR diagnostics.
2014-10-12 16:02:22 +00:00
The Android Automerger
fa5593f60a merge in lmp-mr1-release history after reset to 16410d458f 2014-10-12 06:10:26 -07:00
The Android Automerger
92d28005f9 merge in lmp-mr1-release history after reset to 16410d458f 2014-10-11 06:10:25 -07:00
Jeff Brown
ffb4977438 Improve ANR diagnostics.
Print more details about the exact reason that an ANR has occurred.
Also start checking that the window actually has a registered
input connection that is not in a broken state.  These windows
are supposed to be cleaned up by the window manager promptly
as if the app had crashed but the pattern of ANRs we are observing
suggests that broken windows might be sticking around longer than
they should.

Bug: 17721767
Change-Id: Ie2803a3fa9642381ecadc198fec15e1b70d93c20
2014-10-10 19:09:39 -07:00
Narayan Kamath
16410d458f am 9ea09757: Fix broken error check in Parcel::readBlob
* commit '9ea09757fa63ad2a9bea9c846b51c1210d69c79f':
  Fix broken error check in Parcel::readBlob
2014-10-09 19:17:44 +00:00
The Android Automerger
488dded468 merge in lmp-mr1-release history after reset to 5acc751ffe 2014-10-09 06:10:56 -07:00
Jesse Hall
b7702c5ce7 Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-dev 2014-10-08 16:50:13 +00:00
Narayan Kamath
9ea09757fa Fix broken error check in Parcel::readBlob
mmap returns MAP_FAILED (which is -1) and not NULL on
failure.

Diagnosed by cferris.

bug: 17909809

Change-Id: I609788ebf94742ef88af002d2d3f3bc9b9e520ac
2014-10-08 17:37:38 +01:00
The Android Automerger
059c6ea2ce merge in lmp-mr1-release history after reset to 5acc751ffe 2014-10-08 06:13:14 -07:00
Aravind Akella
5acc751ffe am 7830ef3d: Change ordering of memory allocation and calling Thread::run().
* commit '7830ef3dd0ff3749d974c2dd85a8fa59dc47aeca':
  Change ordering of memory allocation and calling Thread::run().
2014-10-08 05:24:50 +00:00
Aravind Akella
7830ef3dd0 Change ordering of memory allocation and calling Thread::run().
In some cases this is causing a crash as device.poll is called with
NULL.

Bug: 17896339
Change-Id: Id431599f2c661338c355c7081b6602f8449a9198
2014-10-07 21:20:12 +00:00
The Android Automerger
5e0f02413e merge in lmp-mr1-release history after reset to 366998d871 2014-10-07 06:11:36 -07:00
Jesse Hall
366998d871 am 78639c22: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev
* commit '78639c22acfa5e56d87fd6fe8340d083536b29fc':
  Parcel: extra validation/debug code for writeDupFileDescriptor
2014-10-07 00:19:38 +00:00
Jesse Hall
78639c22ac Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev 2014-10-06 22:36:54 +00:00
Jesse Hall
ccf851f108 Parcel: extra validation/debug code for writeDupFileDescriptor
Temporary extra debug validation for b/17477219: a Parcel recipient is
getting a positive but invalid fd unexpectedly. Trying to track down
where it's coming from.

Debug code for bug: 17477219
Change-Id: Idb1e71621025a3928c7adc88fd44790e1abd2a01
2014-10-06 15:23:56 -07:00
The Android Automerger
7fe8c35f30 merge in lmp-mr1-release history after reset to 93176114cf 2014-10-06 06:11:59 -07:00
The Android Automerger
acbdeb410f merge in lmp-mr1-release history after reset to 93176114cf 2014-10-05 06:10:52 -07:00
The Android Automerger
1d1e87a791 merge in lmp-mr1-release history after reset to 93176114cf 2014-10-04 06:11:10 -07:00
Eric Penner
99a0afbaee BufferQueueProducer: Throttle EGL frame production.
Throttling was previously controlled by a combination of the
driver and the number of buffers in the queue. This patch makes
a more consistent trade-off, which allows two GPU frames pending
but not three. More buffering could improve throughput in the
case of varying frame times, but this also increases latency.

Bug: 17502897
Change-Id: I4ee68019ca94c635294c5959931a555a6c4ef2df
2014-10-03 14:57:09 -07:00
Aravind Akella
93176114cf am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev
* commit 'a7eb4b74f74423dafd88adf94a7984ae927c3a23':
  Fix sockfd leakage in SensorService.
2014-10-03 21:54:29 +00:00
Aravind Akella
a7eb4b74f7 Merge "Fix sockfd leakage in SensorService." into lmp-dev 2014-10-03 21:45:37 +00:00
Michael Lentine
6c925ede62 Fixed discrepancy between crop and frame transparencies.
Bug: 17662777
Change-Id: I0d65d9b912a37a60e4c1d2e2e198f7709460917c
2014-10-03 19:02:30 +00:00
Riley Andrews
3d1b86db88 am 6747be9f: Generate the SurfaceFlinger shader cache on initialization
* commit '6747be9fab9981ec24729cede5e0fe779e8b8914':
  Generate the SurfaceFlinger shader cache on initialization
2014-10-03 17:31:18 +00:00
Riley Andrews
6747be9fab 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-03 17:21:15 +00:00
Aravind Akella
8a96955c8e Fix sockfd leakage in SensorService.
i) Call removeFd() only if the fd in the BitTube has been
previously added to the Looper. Use a flag to determine whether the fd
has been previously added or not.
ii) Increment mPendingFlushEventsToSend after holding a connectionLock.
iii) Store the number of acks that are pending in SensorEventQueue
 and send them all at once.

Bug: 17472228
Change-Id: I1ec834fea1112a9cfbd9cddd2198438793698502
2014-10-02 18:59:56 -07:00
Jesse Hall
74efd6e6be am f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit 'f05ef4e542c3041379025e16497ff23710de5dbf':
  Surface: cancel the dequeued buffer when requestBuffer fails
2014-10-02 23:26:58 +00:00
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