OSDN Git Service
Aravind Akella [Fri, 3 Oct 2014 23:57:35 +0000 (23:57 +0000)]
am
ae29ee0a: am
93176114: am
a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev
* commit '
ae29ee0a9eea291316248a90799ff28f35defeb6':
Fix sockfd leakage in SensorService.
Aravind Akella [Fri, 3 Oct 2014 22:39:19 +0000 (22:39 +0000)]
am
93176114: am
a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev
* commit '
93176114cf34c9874c2db70fd7665e9f95dda9d0':
Fix sockfd leakage in SensorService.
Aravind Akella [Fri, 3 Oct 2014 21:54:29 +0000 (21:54 +0000)]
am
a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev
* commit '
a7eb4b74f74423dafd88adf94a7984ae927c3a23':
Fix sockfd leakage in SensorService.
Aravind Akella [Fri, 3 Oct 2014 21:45:36 +0000 (21:45 +0000)]
Merge "Fix sockfd leakage in SensorService." into lmp-dev
Michael Lentine [Fri, 3 Oct 2014 21:10:48 +0000 (21:10 +0000)]
am
fb992b77: am
6c925ede: Fixed discrepancy between crop and frame transparencies.
* commit '
fb992b7753d73f4f18ef7aa1c8e3df5c09e6efbd':
Fixed discrepancy between crop and frame transparencies.
Michael Lentine [Fri, 3 Oct 2014 21:03:11 +0000 (21:03 +0000)]
am
6c925ede: Fixed discrepancy between crop and frame transparencies.
* commit '
6c925ede620f4080227bb1fe8a41e4b4502348f8':
Fixed discrepancy between crop and frame transparencies.
Michael Lentine [Sat, 27 Sep 2014 00:55:01 +0000 (17:55 -0700)]
Fixed discrepancy between crop and frame transparencies.
Bug:
17662777
Change-Id: I0d65d9b912a37a60e4c1d2e2e198f7709460917c
Riley Andrews [Fri, 3 Oct 2014 17:44:57 +0000 (17:44 +0000)]
am
498f8526: am
3d1b86db: am
6747be9f: Generate the SurfaceFlinger shader cache on initialization
* commit '
498f8526783fd72e8561a037faf2d30e6f9da4d5':
Generate the SurfaceFlinger shader cache on initialization
Riley Andrews [Fri, 3 Oct 2014 17:39:58 +0000 (17:39 +0000)]
am
3d1b86db: am
6747be9f: Generate the SurfaceFlinger shader cache on initialization
* commit '
3d1b86db8831820ffe9407d55c36db5e9b87b009':
Generate the SurfaceFlinger shader cache on initialization
Riley Andrews [Fri, 3 Oct 2014 17:31:18 +0000 (17:31 +0000)]
am
6747be9f: Generate the SurfaceFlinger shader cache on initialization
* commit '
6747be9fab9981ec24729cede5e0fe779e8b8914':
Generate the SurfaceFlinger shader cache on initialization
Riley Andrews [Mon, 29 Sep 2014 20:29:40 +0000 (13:29 -0700)]
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
Aravind Akella [Mon, 29 Sep 2014 00:52:41 +0000 (17:52 -0700)]
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
Jesse Hall [Thu, 2 Oct 2014 23:46:41 +0000 (23:46 +0000)]
am
8619132f: am
74efd6e6: am
f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit '
8619132f167afab3775315acdf6e7097fff41a91':
Surface: cancel the dequeued buffer when requestBuffer fails
Lajos Molnar [Thu, 2 Oct 2014 23:46:41 +0000 (23:46 +0000)]
am
754b3c9f: am
167013b2: am
0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
* commit '
754b3c9fe1c6008d42e4be15dbe574cfbc275779':
add OMX_VIDEO_AVCLevel52 constant
Riley Andrews [Thu, 2 Oct 2014 23:46:40 +0000 (23:46 +0000)]
am
36a4d171: am
6c833986: Merge "Generate the SurfaceFlinger shader cache on initialization" into lmp-mr1-dev
* commit '
36a4d17104f8a8d4523071d829ac43c8507ced64':
Generate the SurfaceFlinger shader cache on initialization
Jesse Hall [Thu, 2 Oct 2014 23:43:31 +0000 (23:43 +0000)]
am
74efd6e6: am
f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit '
74efd6e6bec8a49f66090a5c0c18b65ba8a6fcad':
Surface: cancel the dequeued buffer when requestBuffer fails
Jesse Hall [Thu, 2 Oct 2014 23:26:58 +0000 (23:26 +0000)]
am
f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit '
f05ef4e542c3041379025e16497ff23710de5dbf':
Surface: cancel the dequeued buffer when requestBuffer fails
Jesse Hall [Thu, 2 Oct 2014 23:11:08 +0000 (23:11 +0000)]
Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
Lajos Molnar [Thu, 2 Oct 2014 23:06:25 +0000 (23:06 +0000)]
am
167013b2: am
0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
* commit '
167013b2bea340ccf14bf751ef39cc5abef4533a':
add OMX_VIDEO_AVCLevel52 constant
Lajos Molnar [Thu, 2 Oct 2014 22:54:54 +0000 (22:54 +0000)]
am
0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
* commit '
0ba908e7a55ce2641f8886db2a059ccaa3f7a22a':
add OMX_VIDEO_AVCLevel52 constant
Lajos Molnar [Thu, 2 Oct 2014 22:44:30 +0000 (22:44 +0000)]
Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
Michael Lentine [Thu, 2 Oct 2014 21:34:52 +0000 (21:34 +0000)]
am
dea55870: am
36462d9d: Merge "Add more logging for dup(fd) failure" into lmp-dev
* commit '
dea558703a737d7e017a4f7991ea7b0367916654':
Add more logging for dup(fd) failure
Riley Andrews [Thu, 2 Oct 2014 20:26:21 +0000 (20:26 +0000)]
am
6c833986: Merge "Generate the SurfaceFlinger shader cache on initialization" into lmp-mr1-dev
* commit '
6c8339867438c27e468a03995b98481e9e49b274':
Generate the SurfaceFlinger shader cache on initialization
Riley Andrews [Thu, 2 Oct 2014 20:16:55 +0000 (20:16 +0000)]
Merge "Generate the SurfaceFlinger shader cache on initialization" into lmp-mr1-dev
Michael Lentine [Thu, 2 Oct 2014 19:44:43 +0000 (19:44 +0000)]
am
36462d9d: Merge "Add more logging for dup(fd) failure" into lmp-dev
* commit '
36462d9de00105ae46ee3dbb0f644fa6af599f97':
Add more logging for dup(fd) failure
Michael Lentine [Thu, 2 Oct 2014 19:01:09 +0000 (19:01 +0000)]
Merge "Add more logging for dup(fd) failure" into lmp-dev
Jesse Hall [Thu, 2 Oct 2014 18:09:03 +0000 (11:09 -0700)]
Surface: cancel the dequeued buffer when requestBuffer fails
Partial fix for bug:
17477219
Change-Id: Ibf5a9e26e02c4be8854925a77a70f5c9c7dcf6f2
Michael Lentine [Thu, 2 Oct 2014 16:11:04 +0000 (09:11 -0700)]
Add more logging for dup(fd) failure
Bug:
17477219
Change-Id: Ide0ae16d777c9af783023c705c18a93c00999147
Christopher Ferris [Thu, 2 Oct 2014 13:53:36 +0000 (13:53 +0000)]
am
5653d5de: am
a91968fd: Merge "Accept socket connection before tracing." into lmp-dev
* commit '
5653d5de0d021ba5f5ba8671085a8e0a9fcb37d2':
Accept socket connection before tracing.
Christopher Ferris [Thu, 2 Oct 2014 13:38:38 +0000 (13:38 +0000)]
am
a91968fd: Merge "Accept socket connection before tracing." into lmp-dev
* commit '
a91968fd099378d1673c7443be16adcb97ee40af':
Accept socket connection before tracing.
Michael Lentine [Thu, 2 Oct 2014 12:53:50 +0000 (12:53 +0000)]
am
6bddbeae: am
db57cfbd: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
* commit '
6bddbeaeb05aff19a8d69fda806c2b03b2c47c6c':
When eglMakeCurrent fails we need to fix the egl state.
Chong Zhang [Thu, 2 Oct 2014 12:53:49 +0000 (12:53 +0000)]
am
4f99490a: am
dd230cb8: Merge "add a parameter for PCM limiter enable" into lmp-dev
* commit '
4f99490ad21bd999ec532dae1f0754c3ad34809a':
add a parameter for PCM limiter enable
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
Revert "Modify EGL to disconnect the window when the surface gets destroyed."
crash if getNativeBuffer() called on NULL GraphicBuffer
Jesse Hall [Thu, 2 Oct 2014 12:53:49 +0000 (12:53 +0000)]
am
c868c78b: am
5bf786d8: surfaceflinger: recompute visibility after sideband stream change
* commit '
c868c78b516d5fd3f5d36dc916baab6c98800d8f':
surfaceflinger: recompute visibility after sideband stream change
Michael Lentine [Thu, 2 Oct 2014 12:41:27 +0000 (12:41 +0000)]
am
db57cfbd: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
* commit '
db57cfbd6f9d5795846ef237fd297cb81e429679':
When eglMakeCurrent fails we need to fix the egl state.
Chong Zhang [Thu, 2 Oct 2014 12:40:06 +0000 (12:40 +0000)]
am
dd230cb8: Merge "add a parameter for PCM limiter enable" into lmp-dev
* commit '
dd230cb8d2a43ea453a507b12c612a221a3780e7':
add a parameter for PCM limiter enable
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
Revert "Modify EGL to disconnect the window when the surface gets destroyed."
crash if getNativeBuffer() called on NULL GraphicBuffer
Jesse Hall [Thu, 2 Oct 2014 12:40:05 +0000 (12:40 +0000)]
am
5bf786d8: surfaceflinger: recompute visibility after sideband stream change
* commit '
5bf786d8f00ff8eee64ebf330dac55e33a0f97b1':
surfaceflinger: recompute visibility after sideband stream change
Lajos Molnar [Thu, 2 Oct 2014 04:49:18 +0000 (21:49 -0700)]
add OMX_VIDEO_AVCLevel52 constant
Bug:
17676461
Change-Id: I120041e9b2ffe2a232a2419bcb5fe88cb49961cb
Dianne Hackborn [Thu, 2 Oct 2014 02:00:11 +0000 (02:00 +0000)]
am
e5a59e37: am
5ee2c9d2: Work on issue #
17656716: Unhandled exception in Window Manager
* commit '
e5a59e37f2a160f71459b1888ed2d268f9faa10e':
Work on issue #
17656716: Unhandled exception in Window Manager
Aravind Akella [Thu, 2 Oct 2014 02:00:11 +0000 (02:00 +0000)]
am
ca5eacb5: am
deb71b28: Merge "Fix a possible SensorService deadlock." into lmp-dev
* commit '
ca5eacb530fbb5e32564589cd29545df5805e339':
Fix a possible SensorService deadlock.
Jesse Hall [Thu, 2 Oct 2014 02:00:10 +0000 (02:00 +0000)]
am
17290d48: am
bacc28ef: surfaceflinger: Use landscape resolution for default dpi
* commit '
17290d483b986a9838aeeb85386c14681d0d5c44':
surfaceflinger: Use landscape resolution for default dpi
Riley Andrews [Mon, 29 Sep 2014 20:29:40 +0000 (13:29 -0700)]
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
Christopher Ferris [Thu, 2 Oct 2014 01:11:56 +0000 (01:11 +0000)]
Merge "Accept socket connection before tracing." into lmp-dev
Dianne Hackborn [Thu, 2 Oct 2014 00:57:48 +0000 (00:57 +0000)]
am
5ee2c9d2: Work on issue #
17656716: Unhandled exception in Window Manager
* commit '
5ee2c9d20c0fbecf6b4a482eb8d8bfdf85d0d424':
Work on issue #
17656716: Unhandled exception in Window Manager
Aravind Akella [Thu, 2 Oct 2014 00:57:48 +0000 (00:57 +0000)]
am
deb71b28: Merge "Fix a possible SensorService deadlock." into lmp-dev
* commit '
deb71b2812702318900c36b7bcfa9759525ea7cc':
Fix a possible SensorService deadlock.
Jesse Hall [Thu, 2 Oct 2014 00:57:47 +0000 (00:57 +0000)]
am
bacc28ef: surfaceflinger: Use landscape resolution for default dpi
* commit '
bacc28ef1df329f4dc21bae44b09a6c5018af908':
surfaceflinger: Use landscape resolution for default dpi
Christopher Ferris [Thu, 2 Oct 2014 00:35:01 +0000 (17:35 -0700)]
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
Michael Lentine [Wed, 1 Oct 2014 22:44:45 +0000 (22:44 +0000)]
Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
Michael Lentine [Wed, 1 Oct 2014 18:17:28 +0000 (11:17 -0700)]
When eglMakeCurrent fails we need to fix the egl state.
Bug:
16676660
Change-Id: Ie7bee9c78378b9e9206060444319e6ee35e1ab74
Chong Zhang [Wed, 1 Oct 2014 21:37:00 +0000 (21:37 +0000)]
Merge "add a parameter for PCM limiter enable" into lmp-dev
Chong Zhang [Wed, 1 Oct 2014 04:50:08 +0000 (21:50 -0700)]
add a parameter for PCM limiter enable
Bug:
17470065
Change-Id: I327115fc16e7afe2bf5870e123d63f9887161206
Jesse Hall [Tue, 30 Sep 2014 17:35:11 +0000 (10:35 -0700)]
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
Narayan Kamath [Wed, 1 Oct 2014 11:22:47 +0000 (11:22 +0000)]
am
7f8ecd6d: am
cde4b13a: Merge "Allow more than one dex2oat extra option"
* commit '
7f8ecd6dba1637f035be88e426b8c617b803c98b':
Allow more than one dex2oat extra option
Narayan Kamath [Wed, 1 Oct 2014 11:18:25 +0000 (11:18 +0000)]
am
cde4b13a: Merge "Allow more than one dex2oat extra option"
* commit '
cde4b13a12a0bc8a7bd031f5d5c1b2b2bdd13335':
Allow more than one dex2oat extra option
Narayan Kamath [Wed, 1 Oct 2014 11:06:03 +0000 (11:06 +0000)]
Merge "Allow more than one dex2oat extra option"
Dianne Hackborn [Tue, 30 Sep 2014 18:30:03 +0000 (11:30 -0700)]
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
Aravind Akella [Mon, 29 Sep 2014 19:45:08 +0000 (19:45 +0000)]
am
b17044ad: am
71e351d9: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
* commit '
b17044adcf951b66ce2ecb7f7835572d7448bd64':
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
Aravind Akella [Mon, 29 Sep 2014 00:49:24 +0000 (00:49 +0000)]
Merge "Fix a possible SensorService deadlock." into lmp-dev
Jesse Hall [Sun, 28 Sep 2014 19:14:12 +0000 (12:14 -0700)]
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
Aravind Akella [Thu, 25 Sep 2014 05:12:58 +0000 (22:12 -0700)]
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
Aravind Akella [Sat, 27 Sep 2014 06:17:21 +0000 (06:17 +0000)]
am
71e351d9: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
* commit '
71e351d96b551ccdbc39b52a0c66da86cae83701':
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
Aravind Akella [Sat, 27 Sep 2014 02:09:29 +0000 (02:09 +0000)]
Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
Aravind Akella [Sat, 27 Sep 2014 02:06:32 +0000 (02:06 +0000)]
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
This reverts commit
5105960d49bfa86efeeea8f87c87aa96b5771c37.
Change-Id: I4d39ded2e50ef8a8e0aac27e438876203385a1f0
Michael Wright [Fri, 26 Sep 2014 15:28:58 +0000 (15:28 +0000)]
am
2344006b: am
4b20d402: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
* commit '
2344006b6e43ffd081f55228d150f26d932f15fe':
Only mark repeated keys as PASS_TO_USER if the original key was.
Jesse Hall [Fri, 26 Sep 2014 15:28:57 +0000 (15:28 +0000)]
am
53e6b95d: am
728a8da1: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
* commit '
53e6b95d05da4e3c4e0fcd9a0d1ed7d56a6814a1':
surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
Michael Wright [Fri, 26 Sep 2014 05:10:08 +0000 (05:10 +0000)]
am
4b20d402: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
* commit '
4b20d40218a25adcad21cc135a3103b4e04940f3':
Only mark repeated keys as PASS_TO_USER if the original key was.
Jesse Hall [Fri, 26 Sep 2014 05:10:07 +0000 (05:10 +0000)]
am
728a8da1: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
* commit '
728a8da14638e718ede11a7a894705524fc9d171':
surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
Michael Wright [Fri, 26 Sep 2014 01:38:56 +0000 (01:38 +0000)]
Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
Michael Wright [Wed, 24 Sep 2014 20:26:59 +0000 (13:26 -0700)]
Only mark repeated keys as PASS_TO_USER if the original key was.
Bug:
17629695
Change-Id: Ic569aba4149c6cc321c2cf8aede7c5e8a1196234
Jesse Hall [Wed, 24 Sep 2014 22:07:01 +0000 (22:07 +0000)]
Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
Aravind Akella [Wed, 24 Sep 2014 17:18:20 +0000 (17:18 +0000)]
am
8f12365b: am
5105960d: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
* commit '
8f12365b768a05e7e28094e3e90ff01afca284ba':
Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
Aravind Akella [Wed, 24 Sep 2014 04:24:07 +0000 (04:24 +0000)]
am
5105960d: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
* commit '
5105960d49bfa86efeeea8f87c87aa96b5771c37':
Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
chenhg [Tue, 23 Sep 2014 02:52:25 +0000 (10:52 +0800)]
surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
BUG:
17382907
Change-Id: I65fd037bd25238ae68a3976468ae7fd7ce49c562
Aravind Akella [Tue, 23 Sep 2014 23:42:49 +0000 (16:42 -0700)]
Fix sockfd leakage in SensorService. Remove sockfd from Looper
when the connection is removed from mActiveConnections.
Bug:
17472228
Change-Id: Iaabe0968bd2104ef961ff5e8659bf91712e2e1db
Michael Lentine [Tue, 23 Sep 2014 20:57:03 +0000 (20:57 +0000)]
am
14fa402f: am
12c4bdad: Add rate-limited logging for unimplemented es functions.
* commit '
14fa402fea7b3aa420271923e9e051ba122912b6':
Add rate-limited logging for unimplemented es functions.
Dan Albert [Tue, 23 Sep 2014 20:55:50 +0000 (20:55 +0000)]
am
56b3f887: am
6ee97e74: Merge "Fix a null dereference."
* commit '
56b3f887a2a859eaac9f3c3eb2fa18eb5bf396da':
Fix a null dereference.
Michael Lentine [Tue, 23 Sep 2014 19:41:45 +0000 (19:41 +0000)]
am
12c4bdad: Add rate-limited logging for unimplemented es functions.
* commit '
12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90':
Add rate-limited logging for unimplemented es functions.
Lorenzo Colitti [Tue, 23 Sep 2014 19:06:31 +0000 (19:06 +0000)]
am
63a8e04d: am
d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
* commit '
63a8e04d2da0daf6802ecea2048f9eb9a9a8b878':
Include the VPN server IP address in the VPN state file.
Dan Albert [Tue, 23 Sep 2014 17:54:39 +0000 (17:54 +0000)]
am
6ee97e74: Merge "Fix a null dereference."
* commit '
6ee97e74d2c972dec2aa6a2f231b718eae54898f':
Fix a null dereference.
Dan Albert [Tue, 23 Sep 2014 17:41:11 +0000 (17:41 +0000)]
Merge "Fix a null dereference."
Tom Hudson [Tue, 23 Sep 2014 17:16:36 +0000 (17:16 +0000)]
Merge "Return EGL_FALSE early when eglInitialize() fails"
Dan Albert [Tue, 23 Sep 2014 16:51:51 +0000 (09:51 -0700)]
Fix a null dereference.
Change-Id: I7224c3368ff414620062bc08b80a6a94d55d7931
Tom Hudson [Tue, 23 Sep 2014 16:00:41 +0000 (12:00 -0400)]
Return EGL_FALSE early when eglInitialize() fails
In the Meta-EGL shim, eglInitialize() could fail but return EGL_TRUE,
writing into the version numbers; both of these behaviors contradict
the spec.
BUG=b/
17486830
R=jessehall@google.com
Change-Id: I810bdbd701e222ac09ab8660ce9dfc0c0954c3d7
Lorenzo Colitti [Tue, 23 Sep 2014 15:50:59 +0000 (15:50 +0000)]
am
d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
* commit '
d94854030c76fc4ee4126ca1707a76fbd1f29126':
Include the VPN server IP address in the VPN state file.
Michael Lentine [Thu, 11 Sep 2014 19:24:13 +0000 (12:24 -0700)]
Add rate-limited logging for unimplemented es functions.
Bug:
17322013
Change-Id: I7aa5ab2f76cf344cfb75802edbfd44e8e7526ff1
The Android Automerger [Tue, 23 Sep 2014 13:16:24 +0000 (06:16 -0700)]
merge in lmp-release history after reset to
d94854030c76fc4ee4126ca1707a76fbd1f29126
Lorenzo Colitti [Tue, 23 Sep 2014 00:29:57 +0000 (00:29 +0000)]
Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
The Android Automerger [Mon, 22 Sep 2014 13:13:42 +0000 (06:13 -0700)]
merge in lmp-release history after reset to
b1982b75c4f3d9c812d9c49ca294132430c7cd8d
The Android Automerger [Sun, 21 Sep 2014 13:11:28 +0000 (06:11 -0700)]
merge in lmp-release history after reset to
b1982b75c4f3d9c812d9c49ca294132430c7cd8d
The Android Automerger [Sun, 21 Sep 2014 04:01:53 +0000 (21:01 -0700)]
merge in lmp-release history after reset to
dcb16082dd15e3b137678f2663fa6dd6b9614689
The Android Automerger [Sat, 20 Sep 2014 13:12:10 +0000 (06:12 -0700)]
merge in lmp-release history after reset to
b1982b75c4f3d9c812d9c49ca294132430c7cd8d
Sean Wan [Fri, 19 Sep 2014 23:31:03 +0000 (23:31 +0000)]
am
9b8af6e7: am
b1982b75: am
60d31a0f: am
3c648e37: Update comment to use correct GPS file for wearable.
* commit '
9b8af6e778c0cf9da6f5bacfdc8687a1af7e18a4':
Update comment to use correct GPS file for wearable.
Sean Wan [Fri, 19 Sep 2014 22:51:15 +0000 (22:51 +0000)]
am
b1982b75: am
60d31a0f: am
3c648e37: Update comment to use correct GPS file for wearable.
* commit '
b1982b75c4f3d9c812d9c49ca294132430c7cd8d':
Update comment to use correct GPS file for wearable.
Sean Wan [Fri, 19 Sep 2014 22:02:37 +0000 (22:02 +0000)]
am
60d31a0f: am
3c648e37: Update comment to use correct GPS file for wearable.
* commit '
60d31a0fc0724d4538d105a800a1565e5f843130':
Update comment to use correct GPS file for wearable.
Sean Wan [Fri, 19 Sep 2014 21:49:11 +0000 (21:49 +0000)]
am
3c648e37: Update comment to use correct GPS file for wearable.
* commit '
3c648e373a44237c1924fc886daf8418a6e9f4cf':
Update comment to use correct GPS file for wearable.
Sean Wan [Fri, 19 Sep 2014 21:33:51 +0000 (14:33 -0700)]
Update comment to use correct GPS file for wearable.
Change-Id: I91c4363dbcc6cada8d6e9599d1b15e77febee0e5
Lajos Molnar [Fri, 19 Sep 2014 13:33:22 +0000 (13:33 +0000)]
am
147372fd: resolved conflicts for merge of
67d8bd66 to lmp-mr1-dev-plus-aosp
* commit '
147372fdf9fae688114121228247497d43514ab7':
Lajos Molnar [Fri, 19 Sep 2014 13:23:46 +0000 (06:23 -0700)]
resolved conflicts for merge of
67d8bd66 to lmp-mr1-dev-plus-aosp
Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc
Unsuk Jung [Fri, 19 Sep 2014 07:10:36 +0000 (07:10 +0000)]
am
8990766e: am
5bbf73ce: Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
* commit '
8990766e446384d739236f776ef6043f62c75785':
Aravind Akella [Fri, 19 Sep 2014 07:10:35 +0000 (07:10 +0000)]
am
11b4fd56: am
e225f6fd: Merge "SensorService fixes." into lmp-dev
* commit '
11b4fd5602ad4a88d50df15e903e806004da085f':
Ihab Awad [Fri, 19 Sep 2014 07:10:34 +0000 (07:10 +0000)]
am
da404011: am
5430cead: Add system feature for ConnectionService API support (2/3)
* commit '
da404011b55f3218e97ba0e40cac2529a843fef8':