Commit graph

10622 commits

Author SHA1 Message Date
Calin Juravle
4914fcd91b Move native bridge library in system/core
Bug: 16884833

(cherry picked from commit 961ae12dea)

Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
2014-08-15 12:40:45 +01:00
Narayan Kamath
c3ba3245a0 Merge "Export the new system_server classpath." into lmp-dev 2014-08-15 04:54:19 +00:00
Calin Juravle
25a7d5f892 Merge "Move native bridge library in system/core" 2014-08-15 04:45:59 +00:00
Jeff Brown
de4d921192 Add trace tag for power management.
Bug: 17004602
Change-Id: Iecd79e6e0417c02b902cde468b0e842f9348b386
2014-08-14 19:24:30 -07:00
Ying Wang
0c3d98b02b am 87ad7cdc: am e1ba39aa: Merge "Fix 64-bit host build."
* commit '87ad7cdc590aa4033f0b7ae23d83e2fbc119d07a':
  Fix 64-bit host build.
2014-08-14 23:20:06 +00:00
Ying Wang
87ad7cdc59 am e1ba39aa: Merge "Fix 64-bit host build."
* commit 'e1ba39aa6644feb9c5f742f65db6d3363203951f':
  Fix 64-bit host build.
2014-08-14 23:16:46 +00:00
Piotr Jastrzebski
d5d04be07f am fa412127: am b242ad40: Merge "Revert "Make sure that names of all entries have the same encoding.""
* commit 'fa41212789a068827edc9fd1eac7b6a988cba0a5':
  Revert "Make sure that names of all entries have the same encoding."
2014-08-13 10:02:23 +00:00
Piotr Jastrzebski
fa41212789 am b242ad40: Merge "Revert "Make sure that names of all entries have the same encoding.""
* commit 'b242ad40b1e0d3984e469e3d35876a4859f4952b':
  Revert "Make sure that names of all entries have the same encoding."
2014-08-13 09:58:33 +00:00
Piotr Jastrzebski
8b4a58e1df am b720c8d6: am b0206765: Merge "Make sure that names of all entries have the same encoding."
* commit 'b720c8d601cebbc9f48ef8e51c23fd6d190305f7':
  Make sure that names of all entries have the same encoding.
2014-08-13 09:09:36 +00:00
Piotr Jastrzebski
b720c8d601 am b0206765: Merge "Make sure that names of all entries have the same encoding."
* commit 'b020676566f38380f4303eaa7d196d6fef019dd9':
  Make sure that names of all entries have the same encoding.
2014-08-13 09:03:11 +00:00
Calin Juravle
961ae12dea Move native bridge library in system/core
Bug: 16884833

Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
2014-08-12 22:39:25 +01:00
Badhri Jagan Sridharan
5d19ccf1c2 am 0be19a53: Merge "libusbhost: Fix IOCTL call during usb_request_cancel" into lmp-dev
* commit '0be19a53cf9532a5e071e640cb3af5946bfc3d6f':
  libusbhost: Fix IOCTL call during usb_request_cancel
2014-08-12 21:07:13 +00:00
Badhri Jagan Sridharan
754358aa80 am 0d8943c2: am e4c5b614: Merge "libusbhost: Fix IOCTL call during usb_request_cancel"
* commit '0d8943c252a21390c63a16ae0f9f1459c3212163':
  libusbhost: Fix IOCTL call during usb_request_cancel
2014-08-12 21:05:43 +00:00
Badhri Jagan Sridharan
0d8943c252 am e4c5b614: Merge "libusbhost: Fix IOCTL call during usb_request_cancel"
* commit 'e4c5b6143b12925426a1af36ae0a201d18f93cad':
  libusbhost: Fix IOCTL call during usb_request_cancel
2014-08-12 20:59:20 +00:00
Mark Salyzyn
165e4d2202 resolved conflicts for merge of e4ec1e94 to lmp-dev-plus-aosp
Change-Id: Iec97b6a1cb7c29073bf9d1ae37d8600ff2ae9a8b
2014-08-12 13:28:08 -07:00
Piotr Jastrzebski
b242ad40b1 Merge "Revert "Make sure that names of all entries have the same encoding."" 2014-08-12 20:07:20 +00:00
Piotr Jastrzebski
bd0a74854e Revert "Make sure that names of all entries have the same encoding."
This reverts commit 6a7f4bb79d.

Change-Id: Id4f5b601ff0b9d82ce2c9beeb9162eba9594b3a7
2014-08-13 09:49:25 +00:00
Piotr Jastrzebski
6a7f4bb79d Make sure that names of all entries have the same encoding.
Add new public method to allow checkisc if an archive has entry names encoded in
UTF-8. If not then they will be encoded in IBM PC character encoding.

Bug: 16162465
Change-Id: I4468d76accca8a9b0b31cae8d43399ffc22cad42
2014-08-13 09:58:16 +01:00
Badhri Jagan Sridharan
0be19a53cf Merge "libusbhost: Fix IOCTL call during usb_request_cancel" into lmp-dev 2014-08-12 20:02:46 +00:00
Piotr Jastrzebski
b020676566 Merge "Make sure that names of all entries have the same encoding." 2014-08-12 19:57:35 +00:00
Badhri Jagan Sridharan
e4c5b6143b Merge "libusbhost: Fix IOCTL call during usb_request_cancel" 2014-08-12 19:32:26 +00:00
Ying Wang
e1ba39aa66 Merge "Fix 64-bit host build." 2014-08-12 19:23:43 +00:00
Ying Wang
42a809ba06 Fix 64-bit host build.
Bug: 13751317
Change-Id: Ibf62935b7d12a55ffc57242a26a2581b52796847
2014-08-14 15:52:54 -07:00
Mark Salyzyn
e4ec1e94ed am d8ab8fc7: Merge "logd: persistent reader threads"
* commit 'd8ab8fc71c986e49a2608d77aacb3d152d175a72':
  logd: persistent reader threads
2014-08-12 19:04:54 +00:00
Mark Salyzyn
d8ab8fc71c Merge "logd: persistent reader threads" 2014-08-12 16:54:49 +00:00
Mark Salyzyn
a16f761faa logd: persistent reader threads
(cherry picked from commit c113c5813e)

Bug: 16822776
Change-Id: I5bea468a41089b51108880044f32e2b2df1278e7
2014-08-12 18:59:35 +00:00
Dmitriy Ivanov
d1d0e2bcca am a639b97d: Do not suppress maps dump when si_addr<PAGE_SIZE
* commit 'a639b97d4ac9f22b64fd4aa8d5ac24177817a0dc':
  Do not suppress maps dump when si_addr<PAGE_SIZE
2014-08-11 17:40:38 +00:00
Dmitriy Ivanov
a639b97d4a Do not suppress maps dump when si_addr<PAGE_SIZE
Also remove alignment of si_addr.

(cherry picked from commit f10aa3ae9d)

Bug: 16950250
Change-Id: I60170b9eb7dd8fe99c0eeeaec74d13cfbaa920d9
2014-08-11 10:01:58 -07:00
Piotr Jastrzebski
8e419c0056 am af83392e: am 8750fa76: Merge "Make a copy of a prefix param in StartIteration"
* commit 'af83392e5aa0fa1ffd67d606e3615f00f0485537':
  Make a copy of a prefix param in StartIteration
2014-08-11 13:38:03 +00:00
Piotr Jastrzebski
af83392e5a am 8750fa76: Merge "Make a copy of a prefix param in StartIteration"
* commit '8750fa76090ee735677022f5e2d73419dd7faa93':
  Make a copy of a prefix param in StartIteration
2014-08-11 13:34:23 +00:00
Piotr Jastrzebski
6a993053c8 am 6871f937: am 400e7372: Merge "Add EndIteration method to free memory allocated"
* commit '6871f937f93c2a37344b928203ec613559584d33':
  Add EndIteration method to free memory allocated
2014-08-11 09:57:52 +00:00
Piotr Jastrzebski
6871f937f9 am 400e7372: Merge "Add EndIteration method to free memory allocated"
* commit '400e73720c12fab85f4ff8a08a5c7e87c12d5f9a':
  Add EndIteration method to free memory allocated
2014-08-11 09:52:38 +00:00
Dmitriy Ivanov
c326115115 am 75ef453e: am 2f40ddf3: Merge "Do not suppress maps dump when si_addr<PAGE_SIZE"
* commit '75ef453e5d3352aad8c55cd8fa572945c6f4bbfa':
  Do not suppress maps dump when si_addr<PAGE_SIZE
2014-08-10 00:08:34 +00:00
Dmitriy Ivanov
75ef453e5d am 2f40ddf3: Merge "Do not suppress maps dump when si_addr<PAGE_SIZE"
* commit '2f40ddf3f3e4ce88681311fc0e2321e2c54cd413':
  Do not suppress maps dump when si_addr<PAGE_SIZE
2014-08-10 00:05:41 +00:00
Rachad
9cf963d61e am cc2566f1: Merge "Tunneled Video Playback support" into lmp-dev
* commit 'cc2566f12760d66837b52213e5ffd2cb30cce19e':
  Tunneled Video Playback support
2014-08-09 05:07:13 +00:00
Rachad
cc2566f127 Merge "Tunneled Video Playback support" into lmp-dev 2014-08-09 00:51:24 +00:00
Dmitriy Ivanov
2f40ddf3f3 Merge "Do not suppress maps dump when si_addr<PAGE_SIZE" 2014-08-09 00:45:41 +00:00
Dmitriy Ivanov
f10aa3ae9d Do not suppress maps dump when si_addr<PAGE_SIZE
Also remove alignment of si_addr.

Change-Id: Ie5445bf8a5baa49e04e37c643c25ebd0f1dc9d22
2014-08-09 12:07:51 -07:00
Piotr Jastrzebski
8750fa7609 Merge "Make a copy of a prefix param in StartIteration" 2014-08-08 20:41:34 +00:00
Piotr Jastrzebski
34e03bdfdf Make a copy of a prefix param in StartIteration
and delete it in EndIteration.

Change-Id: I4de4167700a9dba3119fde22fcd45725742f3731
2014-08-11 14:20:24 +01:00
Mark Salyzyn
10ef4844ad am c113c581: logd: persistent reader threads
* commit 'c113c5813ebd620e0bc60ece9a32ea14c08ea237':
  logd: persistent reader threads
2014-08-08 15:58:41 +00:00
Mark Salyzyn
c113c5813e logd: persistent reader threads
Bug: 16822776
Change-Id: I5bea468a41089b51108880044f32e2b2df1278e7
2014-08-08 07:40:33 -07:00
Badhri Jagan Sridharan
ef4087bf2b libusbhost: Fix IOCTL call during usb_request_cancel
USBDEVFS_DISCARDURB IOCTL call expects a pointer to the
the urb structure to be passed from userspace. LibusbHost
instead sends usbdevfs_urb**. Change this to usbdevfs_urb*.

Fixes Issue: https://code.google.com/p/android/issues/detail?id=74530

Change-Id: Ifb8a13857e1a9f62536f2a07c0965e9c419b7d4c
2014-08-07 14:58:31 -07:00
Piotr Jastrzebski
400e73720c Merge "Add EndIteration method to free memory allocated" 2014-08-07 18:51:06 +00:00
Piotr Jastrzebski
79c8b34f36 Add EndIteration method to free memory allocated
in StartIteration. This method should always be called when the
iteration is over to make sure that we don't leak memory.

Change-Id: I5205c754dfafbab9bb5f06003c3663d2ec4e8a35
2014-08-11 07:58:00 +01:00
Narayan Kamath
1fabc35cb5 Export the new system_server classpath.
bug: 16555230

Change-Id: I99d2d219b5bd6dc4807cb53e44dc5715cc0815b3
2014-08-07 15:32:07 +01:00
Badhri Jagan Sridharan
266685924a libusbhost: Fix IOCTL call during usb_request_cancel
USBDEVFS_DISCARDURB IOCTL call expects a pointer to the
the urb structure to be passed from userspace. LibusbHost
instead sends usbdevfs_urb**. Change this to usbdevfs_urb*.

Fixes Issue: https://code.google.com/p/android/issues/detail?id=74530

Change-Id: Ifb8a13857e1a9f62536f2a07c0965e9c419b7d4c
2014-08-07 01:13:31 +00:00
Elliott Hughes
aab3b34cd7 am 4c818dc8: am 56b28f6b: Merge "RefBase: make Renamer destructor virtual"
* commit '4c818dc800d97e2fdee0337a0e9736099d90cc47':
  RefBase: make Renamer destructor virtual
2014-08-06 22:48:30 +00:00
Elliott Hughes
4c818dc800 am 56b28f6b: Merge "RefBase: make Renamer destructor virtual"
* commit '56b28f6b2c4722c75dbc7f041f36552221e51133':
  RefBase: make Renamer destructor virtual
2014-08-06 22:44:38 +00:00
Elliott Hughes
0fd33562d6 am 5d228392: am d24240fb: Merge "Fixed the pacing logic in bootchart data collection."
* commit '5d2283927a9527130cad15d33c1e2b360f4bd46f':
  Fixed the pacing logic in bootchart data collection.
2014-08-06 22:40:43 +00:00