Narayan Kamath
28da32889b
am cde4b13a
: Merge "Allow more than one dex2oat extra option"
...
* commit 'cde4b13a12a0bc8a7bd031f5d5c1b2b2bdd13335':
Allow more than one dex2oat extra option
2014-10-01 11:15:12 +00:00
Narayan Kamath
cde4b13a12
Merge "Allow more than one dex2oat extra option"
2014-10-01 11:06:03 +00:00
Dianne Hackborn
e4499526ee
am 5ee2c9d2
: Work on issue #17656716 : Unhandled exception in Window Manager
...
* commit '5ee2c9d20c0fbecf6b4a482eb8d8bfdf85d0d424':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-09-30 20:23:02 +00: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
Aravind Akella
112a7457ae
am deb71b28
: Merge "Fix a possible SensorService deadlock." into lmp-dev
...
* commit 'deb71b2812702318900c36b7bcfa9759525ea7cc':
Fix a possible SensorService deadlock.
2014-09-29 00:56:17 +00:00
Jesse Hall
2a8ae4ef70
am bacc28ef
: surfaceflinger: Use landscape resolution for default dpi
...
* commit 'bacc28ef1df329f4dc21bae44b09a6c5018af908':
surfaceflinger: Use landscape resolution for default dpi
2014-09-29 00:56:04 +00: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
Aravind Akella
bea1db57de
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."
2014-09-27 02:46:32 +00: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
cfbc36544e
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 01:47:01 +00:00
Jesse Hall
1b5c8839f7
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 01:47:00 +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
8b4869dc83
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 03:48:09 +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
53bffaaf27
am 12c4bdad
: Add rate-limited logging for unimplemented es functions.
...
* commit '12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90':
Add rate-limited logging for unimplemented es functions.
2014-09-23 19:16:54 +00:00
Dan Albert
265f0d9dff
am 6ee97e74
: Merge "Fix a null dereference."
...
* commit '6ee97e74d2c972dec2aa6a2f231b718eae54898f':
Fix a null dereference.
2014-09-23 17:53:39 +00:00
Dan Albert
6ee97e74d2
Merge "Fix a null dereference."
2014-09-23 17:41:11 +00:00
Dan Albert
c78a0c1733
Fix a null dereference.
...
Change-Id: I7224c3368ff414620062bc08b80a6a94d55d7931
2014-09-23 09:51:51 -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
Lorenzo Colitti
7a99e281dd
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 02:53:42 +00: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
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
0c6e249cba
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:26:43 +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
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
435d9cde27
resolved conflicts for merge of 67d8bd66
to lmp-dev-plus-aosp
...
Change-Id: I2e9aab90ac53bb32630598f50cc26f6e46acf6d6
2014-09-18 20:09:39 -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
The Android Automerger
dcb16082dd
merge in lmp-release history after reset to 5bbf73ced3
2014-09-18 06:12:20 -07:00
The Android Automerger
1255b81a87
merge in lmp-release history after reset to 5bbf73ced3
2014-09-17 06:13:11 -07:00
Yevgeny Rouban
b0d8d00b29
Allow more than one dex2oat extra option
...
All extra options are provided as one argument to dex2oat.
The patch splits all options to individual ones.
Change-Id: Ied65bb9cf38b114611e88a8d5d86305021700d0b
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Signed-off-by: Yevgeny Rouban <yevgeny.y.rouban@intel.com>
2014-09-17 10:58:35 +00:00
Dan Albert
1474f8864f
Don't check if this == NULL.
...
Entering a method with this == NULL is undefined behavior. Clang whines
about this.
Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c
2014-09-16 17:52:06 -07:00
The Android Automerger
7b463a21f7
merge in lmp-release history after reset to 5bbf73ced3
2014-09-16 06:13:06 -07: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
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