Piotr Jastrzebski
c77755f139
am f81da073
: am c0879ee9
: Merge "Replace char* with ZipEntryName in ziparchive API."
...
* commit 'f81da073dab8c6eba0a86975f4d94eae5dc461cf':
Replace char* with ZipEntryName in ziparchive API.
2014-08-18 09:13:07 +00:00
Piotr Jastrzebski
f81da073da
am c0879ee9
: Merge "Replace char* with ZipEntryName in ziparchive API."
...
* commit 'c0879ee9d39ad4e9a2628c5cf1aaf4f843c13760':
Replace char* with ZipEntryName in ziparchive API.
2014-08-18 09:04:10 +00:00
Robert Greenwalt
ab9fa4c4a1
am 82b76249
: Remove obsolete tcp buffer size system properties.
...
* commit '82b76249fbc339e82ab47a956f7e17160247e4c4':
Remove obsolete tcp buffer size system properties.
2014-08-17 23:22:33 +00:00
Robert Greenwalt
82b76249fb
Remove obsolete tcp buffer size system properties.
...
Change-Id: If6fb6fdcf8975e6102e84594ee3f64a5be6166f6
2014-08-17 15:17:00 -07:00
Colin Cross
94819e8f55
am f4a175b4
: am 39ab11d0
: Merge "fastboot: add the support of the second stage image"
...
* commit 'f4a175b4d19608ffe7807444628a3d15053d7e5b':
fastboot: add the support of the second stage image
2014-08-16 20:28:12 +00:00
Jeremy Compostella
310db68903
am a42adff9
: fastboot: add the support of the second stage image [DO NOT MERGE]
...
* commit 'a42adff905600219cbf5ef217d2b46670225aca3':
fastboot: add the support of the second stage image [DO NOT MERGE]
2014-08-16 05:17:12 +00:00
Piotr Jastrzebski
c0879ee9d3
Merge "Replace char* with ZipEntryName in ziparchive API."
2014-08-16 04:31:31 +00:00
Jeremy Compostella
a42adff905
fastboot: add the support of the second stage image [DO NOT MERGE]
...
The AOSP bootimage format allows the use of a second stage image
however the fastboot boot and flash:row commands do not allow the
"secondstage" optional argument. This patch adds the support of this
argument for both commands.
Change-Id: I00403a95d7460a00233841ba0fe0e8a69d78c7b4
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2014-08-15 21:21:09 -07:00
Colin Cross
f4a175b4d1
am 39ab11d0
: Merge "fastboot: add the support of the second stage image"
...
* commit '39ab11d0d46b9be1bb41241ff58e3f6f3259dd74':
fastboot: add the support of the second stage image
2014-08-16 04:14:14 +00:00
Colin Cross
39ab11d0d4
Merge "fastboot: add the support of the second stage image"
2014-08-16 04:08:14 +00:00
Jeff Brown
84a248ce27
am 69d68b69
: Merge "Add trace tag for power management." into lmp-dev
...
* commit '69d68b69e5341124c1947f3110c67aa8836e3437':
Add trace tag for power management.
2014-08-16 03:14:32 +00:00
Calin Juravle
585fc42de7
am 935708be
: Switch libnativebridge to clang
...
* commit '935708be6fe366c8e519b01d1fba9fd2414c0dba':
Switch libnativebridge to clang
2014-08-15 21:16:52 +00:00
Jeff Brown
69d68b69e5
Merge "Add trace tag for power management." into lmp-dev
2014-08-15 18:45:09 +00:00
Calin Juravle
935708be6f
Switch libnativebridge to clang
...
This fixes the mac build.
Change-Id: Icaca0e3bb959072633caf6bfad828a429ff71140
2014-08-15 18:48:53 +01:00
Calin Juravle
4c846321c0
am 338b3395
: Merge "Move native bridge library in system/core" into lmp-dev
...
* commit '338b33954b4f557e05e4264f31cd7d7af92b4801':
Move native bridge library in system/core
2014-08-15 14:39:45 +00:00
Narayan Kamath
68aca93ca3
am c3ba3245
: Merge "Export the new system_server classpath." into lmp-dev
...
* commit 'c3ba3245a0bb66179fa05aa357382a1886ce387a':
Export the new system_server classpath.
2014-08-15 13:17:18 +00:00
Calin Juravle
62de21e148
am 5ed25acd
: am 25a7d5f8
: Merge "Move native bridge library in system/core"
...
* commit '5ed25acd4ab7c606986c77892c07c2914f8df8f2':
Move native bridge library in system/core
2014-08-15 12:42:36 +00:00
Piotr Jastrzebski
ecccc5ad93
Replace char* with ZipEntryName in ziparchive API.
...
It's important because entry names can be encoded in UTF-8 and can have \0
character in the middle.
Use vector instead of char* for prefix in IterationHandle.
Bug: 16162465
Change-Id: Ie34c8d7c6231cc258530c22bdde5542895213649
2014-08-15 12:39:45 +01:00
Calin Juravle
5ed25acd4a
am 25a7d5f8
: Merge "Move native bridge library in system/core"
...
* commit '25a7d5f892f2606ed28eff761c59693398497343':
Move native bridge library in system/core
2014-08-15 11:39:22 +00:00
Calin Juravle
338b33954b
Merge "Move native bridge library in system/core" into lmp-dev
2014-08-15 04:54:19 +00:00
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