Amith Yamasani
85c0a0938c
am 2ab32d69
: Rename managed_profiles feature to managed_users
...
* commit '2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d':
Rename managed_profiles feature to managed_users
2014-09-13 02:35:52 +00:00
Unsuk Jung
edaee1a927
Fix typo for android.hardware.audio.output feature in handheld device config
...
Bug: 15318046
Change-Id: I6437a2e87a909a8ef4ce6fcdc56ff06c5599a15a
2014-09-12 15:49:32 -07:00
Amith Yamasani
2ab32d6915
Rename managed_profiles feature to managed_users
...
Bug: 17392243
Change-Id: Ib60d1563ecdda9a979196ef51e849be2f9e9f841
2014-09-12 14:21:03 -07:00
Dan Albert
94ba882df2
am 4355c0c9
: am e1e3d278
: Merge "Clean cruft out of makefiles."
...
* commit '4355c0c98644c37f0511257403bbfb71b342e2df':
Clean cruft out of makefiles.
2014-09-12 19:28:17 +00:00
Dan Albert
8b2a86a7f9
am 9e8b5289
: resolved conflicts for merge of 07c9557f
to lmp-dev-plus-aosp
...
* commit '9e8b528926506b3fa9ca7df52fef5f56ec6149c7':
Fix warnings on unused variables and parameters.
2014-09-12 19:28:16 +00:00
Hans Boehm
d898618914
am e03abcd6
: am 4a7001ca
: Merge "Work around C11 const atomic restrictions."
...
* commit 'e03abcd61b127b10391b8257c35fbe66053e417a':
Work around C11 const atomic restrictions.
2014-09-12 19:28:16 +00:00
Jeff Brown
e5daa32e07
am 6f3e466b
: am 70b9e6c8
: Merge "Make dumpstate vibrate immediately." into lmp-dev
...
* commit '6f3e466b1491f654be412fe572d3f94f39e84c98':
Make dumpstate vibrate immediately.
2014-09-12 19:20:59 +00:00
Aravind Akella
f627c969e1
am 3d0daa57
: am 8493b79e
: SensorService fixes
...
* commit '3d0daa57f5f180418fdecbf06f6a5a41e566f6d9':
SensorService fixes
2014-09-12 19:20:58 +00:00
Dan Albert
4355c0c986
am e1e3d278
: Merge "Clean cruft out of makefiles."
...
* commit 'e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2':
Clean cruft out of makefiles.
2014-09-12 16:22:03 +00:00
Dan Albert
9e8b528926
resolved conflicts for merge of 07c9557f
to lmp-dev-plus-aosp
...
Change-Id: Ic212ab2ee90b1cc7db7203210b047c870bb5c476
2014-09-12 09:00:50 -07:00
Hans Boehm
e03abcd61b
am 4a7001ca
: Merge "Work around C11 const atomic restrictions."
...
* commit '4a7001cae482e3c9410001360374c8fe9d5a2846':
Work around C11 const atomic restrictions.
2014-09-12 15:54:52 +00:00
Jeff Brown
6f3e466b14
am 70b9e6c8
: Merge "Make dumpstate vibrate immediately." into lmp-dev
...
* commit '70b9e6c8f3221bbbeefc85c70746541a5b318afc':
Make dumpstate vibrate immediately.
2014-09-12 05:36:59 +00:00
Aravind Akella
3d0daa57f5
am 8493b79e
: SensorService fixes
...
* commit '8493b79e1cff92450076ca7450c4bf4e434a6816':
SensorService fixes
2014-09-12 05:36:58 +00:00
Dan Albert
e1e3d27854
Merge "Clean cruft out of makefiles."
2014-09-12 01:57:54 +00:00
Dan Albert
b79dfe6721
Clean cruft out of makefiles.
...
Cleans up manual uses of stlport and bionic (and removes uses of private
bionic headers).
Change-Id: I157309d702e59152adfa3450939082248ae4c043
2014-09-11 18:49:47 -07:00
Chih-Hung Hsieh
07c9557f60
Merge "Fix warnings on unused variables and parameters."
2014-09-12 00:13:40 +00:00
Chih-Hung Hsieh
99d9fb15b4
Fix warnings on unused variables and parameters.
...
BUG: 17474723
Change-Id: If40f5e765090cfb970e4129b78b1e74cf8bad217
2014-09-11 16:57:59 -07:00
Hans Boehm
4a7001cae4
Merge "Work around C11 const atomic restrictions."
2014-09-11 22:52:53 +00:00
Jeff Brown
70b9e6c8f3
Merge "Make dumpstate vibrate immediately." into lmp-dev
2014-09-11 22:32:05 +00:00
Hans Boehm
c0df68bb80
Work around C11 const atomic restrictions.
...
Cast away the const qualifier in BBinder::findObject. C11, unlike C++11,
does not allow loads from const atomics. This is widely regarded as
a bug (see WG14 DR 459). This is a hack to work around it until it's
officially fixed in the spec.
load_const_atomic was adapted from commit
1e8587a479fd8b1ce9b594298a93f517816e8f15
I don't think we want to dignify this by putting it into a header file.
Bug:17067219
Change-Id: Icbfcbda2722e6f80d2bb065a0bb3ec7634bcacb2
2014-09-11 14:49:09 -07:00
Jeff Brown
1dc94e3156
Make dumpstate vibrate immediately.
...
Previously, the vibration was not performed until after stacks
were gathered which takes a long time. Moved the vibration
to happen earlier so we provide better user feedback for the
three-button salute when collecting a bug report.
Deleted some dead code for playing begin/end sounds.
Improved the timing measurement code to help track down why
bug reports are so slow. (They take over a minute now which
can cause us to lose valuable diagnostic information.)
Bug: 17474152
Change-Id: Iac73f7993d7dc85196aad96f459b22fd4a710f94
2014-09-11 14:19:04 -07:00
Dan Albert
7a81e8c6aa
am c16acacd
: am 7d587c31
: (-s ours) Merge "Silence warnings about unused parameters."
...
* commit 'c16acacd6dd6540766e733da6aa86eda58d41f97':
Silence warnings about unused parameters.
2014-09-11 17:29:16 +00:00
Adam Connors
391684b993
am f521c53c
: am 9e691c10
: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
...
* commit 'f521c53cf75df458d1afaa51287364e6d9250448':
Add feature flags for verified boot and securely remove users.
2014-09-11 14:12:30 +00:00
Dan Albert
c16acacd6d
am 7d587c31
: (-s ours) Merge "Silence warnings about unused parameters."
...
* commit '7d587c31d5c9a2f76f69073036f521dc75045656':
Silence warnings about unused parameters.
2014-09-11 03:44:14 +00:00
Dan Albert
7d587c31d5
Merge "Silence warnings about unused parameters."
2014-09-11 02:32:24 +00:00
Aravind Akella
8493b79e1c
SensorService fixes
...
i) Significant Motion multiple clients fix. Make a copy of
mActiveConnections vector before cleaning up SensorEventConnections
when one-shot sensors trigger.
ii) Maintain a mapping between flush_complete_events and
SensorEventConnections to accurately map flush() API calls and
corresponding flush_complete_events
iii) Remove all references to 1_1 and 1_2 HALs.
iv) Dynamically allocate sensor_event buffers in SensorService main
threadLoop.
Bug: 17412359
Change-Id: If3c3986197660cafef2d2e0b4dc7582e229cf1c4
2014-09-10 18:24:18 -07:00
Adam Connors
f521c53cf7
am 9e691c10
: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
...
* commit '9e691c1093fa9c00d82f5a33f5382c2610734ca6':
Add feature flags for verified boot and securely remove users.
2014-09-10 10:26:21 +00:00
Adam Connors
9e691c1093
Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
2014-09-10 10:07:49 +00:00
Dan Albert
12e369997d
am 5746f149
: am fb017a4c
: Merge "Fix clang warnings about struct vs. class."
...
* commit '5746f1497814e105352214f1bba242317856605a':
Fix clang warnings about struct vs. class.
2014-09-10 07:05:39 +00:00
Dan Albert
5746f14978
am fb017a4c
: Merge "Fix clang warnings about struct vs. class."
...
* commit 'fb017a4c3b23741f737093c3fcb78087bbe5e73c':
Fix clang warnings about struct vs. class.
2014-09-10 01:43:11 +00:00
Jeff Tinker
7cdf79b825
am f7a8f90a
: am 1173137a
: Merge "Add support for max res decode" into lmp-dev
...
* commit 'f7a8f90ad4845752f5eb57ecc62a2bfd86313667':
Add support for max res decode
2014-09-10 01:17:45 +00:00
Jeff Tinker
f7a8f90ad4
am 1173137a
: Merge "Add support for max res decode" into lmp-dev
...
* commit '1173137af3fb93c7708fb7b1109c5b37db72d783':
Add support for max res decode
2014-09-10 00:51:52 +00:00
Dan Albert
fb017a4c3b
Merge "Fix clang warnings about struct vs. class."
2014-09-10 00:40:04 +00:00
Jeff Tinker
1173137af3
Merge "Add support for max res decode" into lmp-dev
2014-09-09 23:56:00 +00:00
Dan Albert
9e0e103b65
Silence warnings about unused parameters.
...
Change-Id: I503aafbdeaec3f53241872dc52af9f8b73a1416c
2014-09-09 16:53:59 -07:00
Christopher Ferris
05579f004e
am 625ae1d0
: am 11c13abd
: Merge "Use time() instead of clock() for timeouts."
...
* commit '625ae1d0023f21a3a353c41322d47dd2e0af55c0':
Use time() instead of clock() for timeouts.
2014-09-09 22:59:50 +00:00
Christopher Ferris
625ae1d002
am 11c13abd
: Merge "Use time() instead of clock() for timeouts."
...
* commit '11c13abd56693d4a4be3ca9e14cbaa456ba586b9':
Use time() instead of clock() for timeouts.
2014-09-09 22:54:12 +00:00
Christopher Ferris
11c13abd56
Merge "Use time() instead of clock() for timeouts."
2014-09-09 22:39:44 +00:00
Dan Albert
aeb8ab8c34
Fix clang warnings about struct vs. class.
...
Change-Id: I9f26cd01ac3153efa6d77a4133686842e2d63203
2014-09-09 15:22:48 -07:00
Christopher Ferris
45d98814d5
am 500c086a
: am 5ef471c5
: Merge "Use time() instead of clock() for timeouts." into lmp-dev
...
* commit '500c086a7e93dd485dc98bae5ab8430bc165c301':
Use time() instead of clock() for timeouts.
2014-09-09 22:16:47 +00:00
Riley Andrews
03c2e83e73
am 75ec33e0
: am d15ef27f
: Update ScreenshotClient to take advantage of rotation in surfaceflinger\'s screencap api
...
* commit '75ec33e0e609e3ef074f4230c2227e52bf82ad06':
Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
2014-09-09 22:16:46 +00:00
Riley Andrews
25d10ce9ec
am 129dc842
: am edb86f9f
: Merge "Add rotation to surfaceflingers screen cap." into lmp-dev
...
* commit '129dc8423da319d42af6ef71046c39ba59c0d878':
Add rotation to surfaceflingers screen cap.
2014-09-09 22:16:38 +00:00
Christopher Ferris
500c086a7e
am 5ef471c5
: Merge "Use time() instead of clock() for timeouts." into lmp-dev
...
* commit '5ef471c5f986a52c681a29856c38f72127cdf8ac':
Use time() instead of clock() for timeouts.
2014-09-09 21:56:14 +00:00
Riley Andrews
75ec33e0e6
am d15ef27f
: Update ScreenshotClient to take advantage of rotation in surfaceflinger\'s screencap api
...
* commit 'd15ef27f9b13727fa7358e3c09572f66bb1e0668':
Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
2014-09-09 21:55:45 +00:00
Riley Andrews
129dc8423d
am edb86f9f
: Merge "Add rotation to surfaceflingers screen cap." into lmp-dev
...
* commit 'edb86f9f681e082a64a670814ee4d73ccf39942a':
Add rotation to surfaceflingers screen cap.
2014-09-09 21:55:26 +00:00
Christopher Ferris
e2c86c71c2
Use time() instead of clock() for timeouts.
...
The clock() function returns the processor time used by the process. This
is not a good timeout mechanism since the code is suspended most of the
time waiting for the forked process to finish. Replace with the time()
function.
Bug: 17154069
(cherry picked from commit 89d4949f86
)
Change-Id: I42f0f24ee53ef99955fd482a1089e39d491f3bd5
2014-09-09 13:36:52 -07:00
Christopher Ferris
5ef471c5f9
Merge "Use time() instead of clock() for timeouts." into lmp-dev
2014-09-09 20:29:15 +00:00
Christopher Ferris
89d4949f86
Use time() instead of clock() for timeouts.
...
The clock() function returns the processor time used by the process. This
is not a good timeout mechanism since the code is suspended most of the
time waiting for the forked process to finish. Replace with the time()
function.
Bug: 17154069
Change-Id: Ib383329f9db269445d71a100553b08e71fddda3f
2014-09-09 13:10:49 -07:00
Riley Andrews
d15ef27f9b
Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
...
Change-Id: I836649d9d5cd5958ce34e47f26f4a36d2d05d24c
2014-09-09 19:41:32 +00:00
Riley Andrews
edb86f9f68
Merge "Add rotation to surfaceflingers screen cap." into lmp-dev
2014-09-09 19:40:53 +00:00