Michael Wright
9bd5bcc958
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.
2014-09-26 15:28:58 +00:00
Jesse Hall
a5e4b70352
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.
2014-09-26 15:28:57 +00:00
Michael Wright
2344006b6e
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.
2014-09-26 05:10:08 +00:00
Jesse Hall
53e6b95d05
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.
2014-09-26 05:10:07 +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
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
Aravind Akella
c4c63f21dd
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.
2014-09-24 17:18:20 +00:00
Aravind Akella
8f12365b76
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.
2014-09-24 04:24:07 +00: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
Michael Lentine
c3cd862fcb
am 14fa402f
: am 12c4bdad
: Add rate-limited logging for unimplemented es functions.
...
* commit '14fa402fea7b3aa420271923e9e051ba122912b6':
Add rate-limited logging for unimplemented es functions.
2014-09-23 20:57:03 +00:00
Dan Albert
5193aea69a
am 56b3f887
: am 6ee97e74
: Merge "Fix a null dereference."
...
* commit '56b3f887a2a859eaac9f3c3eb2fa18eb5bf396da':
Fix a null dereference.
2014-09-23 20:55:50 +00:00
Michael Lentine
14fa402fea
am 12c4bdad
: Add rate-limited logging for unimplemented es functions.
...
* commit '12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90':
Add rate-limited logging for unimplemented es functions.
2014-09-23 19:41:45 +00:00
Lorenzo Colitti
2d62faa1e3
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.
2014-09-23 19:06:31 +00:00
Dan Albert
56b3f887a2
am 6ee97e74
: Merge "Fix a null dereference."
...
* commit '6ee97e74d2c972dec2aa6a2f231b718eae54898f':
Fix a null dereference.
2014-09-23 17:54:39 +00:00
Dan Albert
6ee97e74d2
Merge "Fix a null dereference."
2014-09-23 17:41:11 +00:00
Tom Hudson
9fe0ef5680
Merge "Return EGL_FALSE early when eglInitialize() fails"
2014-09-23 17:16:36 +00:00
Dan Albert
c78a0c1733
Fix a null dereference.
...
Change-Id: I7224c3368ff414620062bc08b80a6a94d55d7931
2014-09-23 09:51:51 -07:00
Tom Hudson
e11b1a733c
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
2014-09-23 12:00:41 -04:00
Lorenzo Colitti
63a8e04d2d
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.
2014-09-23 15:50:59 +00: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
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
Sean Wan
4c5bb14971
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.
2014-09-19 23:31:03 +00:00
Sean Wan
9b8af6e778
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.
2014-09-19 22:51:15 +00: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
Lajos Molnar
6c442e264d
am 147372fd
: resolved conflicts for merge of 67d8bd66
to lmp-mr1-dev-plus-aosp
...
* commit '147372fdf9fae688114121228247497d43514ab7':
2014-09-19 13:33:22 +00:00
Lajos Molnar
147372fdf9
resolved conflicts for merge of 67d8bd66
to lmp-mr1-dev-plus-aosp
...
Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc
2014-09-19 06:23:46 -07:00
Unsuk Jung
452f5a16de
am 8990766e
: am 5bbf73ce
: Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
...
* commit '8990766e446384d739236f776ef6043f62c75785':
2014-09-19 07:10:36 +00:00
Aravind Akella
74b05f5fbe
am 11b4fd56
: am e225f6fd
: Merge "SensorService fixes." into lmp-dev
...
* commit '11b4fd5602ad4a88d50df15e903e806004da085f':
2014-09-19 07:10:35 +00:00
Ihab Awad
a0713ea9be
am da404011
: am 5430cead
: Add system feature for ConnectionService API support (2/3)
...
* commit 'da404011b55f3218e97ba0e40cac2529a843fef8':
2014-09-19 07:10:34 +00:00
Lorenzo Colitti
a9e8374c72
Include the VPN server IP address in the VPN state file.
...
This will be used by LegacyVpnRunner to create a throw route
pointing at it.
Bug: 17462989
Change-Id: I3ebf0cec726dd12b2c57ba5d66775f8c02b25b70
2014-09-19 13:27:56 +09:00
Lajos Molnar
e7bda06398
resolved conflicts for merge of 67d8bd66
to lmp-dev-plus-aosp
...
Change-Id: Idbe39c6de8fe31ac57a9238c18b4c20d66dc73ad
2014-09-18 20:05:27 -07:00
Lajos Molnar
67d8bd66aa
surfaceflinger: add getDisplayStats() method
...
This is used by media service to schedule video frames at the
proper time, based on precise vsync timings.
Bug: 14659809
Change-Id: I1a90603f3dc09dca9aa4f90a3aa845fab56e0a5e
2014-09-18 17:03:20 -07:00
Unsuk Jung
8990766e44
am 5bbf73ce
: Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
...
* commit '5bbf73ced30c168176fbcf87b15021ecca2fb90e':
Fix typo for android.hardware.audio.output feature in handheld device config
2014-09-16 21:05:02 +00:00
Aravind Akella
11b4fd5602
am e225f6fd
: Merge "SensorService fixes." into lmp-dev
...
* commit 'e225f6fd4a3f17c2705f1d69b176db475a3cc821':
SensorService fixes.
2014-09-16 21:05:01 +00:00
Ihab Awad
da404011b5
am 5430cead
: Add system feature for ConnectionService API support (2/3)
...
* commit '5430cead9f7bc2a5a9947a2b9ffd5029a1f55408':
Add system feature for ConnectionService API support (2/3)
2014-09-16 21:05:00 +00:00
Unsuk Jung
1a0059efa0
am 556888b8
: am 5bbf73ce
: Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
...
* commit '556888b8ba32d923351bfb2317232dd78fff9c26':
Fix typo for android.hardware.audio.output feature in handheld device config
2014-09-16 09:11:14 +00:00
Aravind Akella
7f2737807f
am c8a1b367
: am e225f6fd
: Merge "SensorService fixes." into lmp-dev
...
* commit 'c8a1b36745e2094e5fdc7915739caca396c2d9de':
SensorService fixes.
2014-09-16 09:11:14 +00:00
Unsuk Jung
556888b8ba
am 5bbf73ce
: Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
...
* commit '5bbf73ced30c168176fbcf87b15021ecca2fb90e':
Fix typo for android.hardware.audio.output feature in handheld device config
2014-09-16 08:57:57 +00:00
Aravind Akella
c8a1b36745
am e225f6fd
: Merge "SensorService fixes." into lmp-dev
...
* commit 'e225f6fd4a3f17c2705f1d69b176db475a3cc821':
SensorService fixes.
2014-09-16 08:57:56 +00:00
Ihab Awad
85cb7bb158
am 9b1543ad
: am 5430cead
: Add system feature for ConnectionService API support (2/3)
...
* commit '9b1543ad2f6f58aa116cf520378df12d46fbc037':
Add system feature for ConnectionService API support (2/3)
2014-09-16 08:48:31 +00:00
Ihab Awad
9b1543ad2f
am 5430cead
: Add system feature for ConnectionService API support (2/3)
...
* commit '5430cead9f7bc2a5a9947a2b9ffd5029a1f55408':
Add system feature for ConnectionService API support (2/3)
2014-09-16 08:38:38 +00:00
Unsuk Jung
5bbf73ced3
Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
2014-09-15 23:42:54 +00:00
Aravind Akella
e225f6fd4a
Merge "SensorService fixes." into lmp-dev
2014-09-15 22:09:53 +00:00
Aravind Akella
0ec2066e47
SensorService fixes.
...
i) Initialize sensor_event.flags to zero or wake_up flag before sending dropped flush_complete_events. This will avoid unnecessary acks.
Currently it is not set to anything which may result in garbage values for flags field.
ii) Change the dump format of SensorEventConnection.
iii) Add const to method signatures wherever applicable.
Bug id: https://b2.corp.google.com/issues/17498626
Change-Id: Ia736ffb01c366540aab73cdcf596ce852c052593
2014-09-15 20:32:21 +00:00
Ihab Awad
5430cead9f
Add system feature for ConnectionService API support (2/3)
...
Bug: 17445268
Change-Id: Ib96e50e2558d2744f74419fd022f3f20d578a2de
2014-09-15 09:13:10 -07:00
Amith Yamasani
e19112134b
am 85c0a093
: am 2ab32d69
: Rename managed_profiles feature to managed_users
...
* commit '85c0a0938ca60acb071d016e76014f869478f2cc':
Rename managed_profiles feature to managed_users
2014-09-13 03:07:24 +00:00