OSDN Git Service
Chih-Wei Huang [Mon, 20 May 2019 09:43:15 +0000 (17:43 +0800)]
Merge tag 'android-8.1.0_r64' into oreo-x86
Android 8.1.0 Release 64 (OPM8.190505.001)
Chih-Wei Huang [Tue, 12 Mar 2019 08:21:42 +0000 (16:21 +0800)]
libsuspend: add sleep.state=force
Some devices have bad wakeup_count that prevents them from sleeping.
To workaround that, add sleep.state=force to ignore the wakeup_count
interface to put the devices into deep sleep forcibly.
android-build-team Robot [Wed, 16 Jan 2019 18:57:20 +0000 (18:57 +0000)]
Merge cherrypicks of [
6072696,
6072074,
6072757,
6072120,
6072121,
6072122,
6072123,
6072575,
6072576,
6072577,
6072578,
6072579,
6072193,
6072131,
6072194,
6072076,
6072210,
6072759,
6072760,
6072698,
6072699,
6072700,
6072701,
6072702,
6072703,
6072704,
6072905,
6072906,
6072907,
6072761] into oc-m8-release
Change-Id: Ifd5ee3a1219b7a794619b82ad4bd3c6828689634
Martijn Coenen [Wed, 5 Dec 2018 08:42:25 +0000 (09:42 +0100)]
Export maximum number of fds/ints in a native_handle.
So we can deserialize it consisently and safely.
Bug:
120084106
Test: builds
Change-Id: I0eafff70d3a7e4d732fe600a0052efb90108208d
(cherry picked from commit
02debfa2df1589c2f8e35cc2db93dd131f43f2db)
Chih-Wei Huang [Tue, 9 Oct 2018 10:02:20 +0000 (18:02 +0800)]
Merge tag 'android-8.1.0_r48' into oreo-x86
Android 8.1.0 release 48
Chih-Wei Huang [Thu, 14 Jun 2018 09:16:42 +0000 (17:16 +0800)]
Merge tag 'android-8.1.0_r33' into oreo-x86
Android 8.1.0 release 33
Chih-Wei Huang [Sun, 10 Jun 2018 09:34:04 +0000 (17:34 +0800)]
libcutils: ignore a trivial error
Sometimes it complains: "add_tid_to_cgroup failed to write '1900'
(No space left on device); fd=11". I don't understand why.
The device should have enough space.
Just ignore this error.
Chih-Wei Huang [Fri, 25 May 2018 10:29:03 +0000 (18:29 +0800)]
Merge tag 'android-8.1.0_r29' into oreo-x86
Android 8.1.0 Release 29 (OPM4.171019.016.C1)
Chih-Wei Huang [Fri, 25 May 2018 10:27:22 +0000 (18:27 +0800)]
logd: show the concrete error if cap_set_proc fails
android-build-team Robot [Tue, 17 Apr 2018 18:03:23 +0000 (18:03 +0000)]
Merge cherrypicks of [
3912569,
3913632,
3913633,
3913557,
3913471,
3913509,
3913558,
3913541,
3913542,
3913472,
3913473,
3913735,
3913736,
3913737,
3913738,
3913739,
3913510,
3913511,
3913512,
3913513,
3913514,
3913559,
3913560,
3913755,
3913795,
3912643,
3913543,
3912570,
3913057] into sparse-
4669640-L32000000164199687
Change-Id: I635bc21c270675100599bc9a7b9b9ec90d4e9782
Steven Moreland [Thu, 1 Mar 2018 19:03:04 +0000 (11:03 -0800)]
String16: remove integer overflows
Bug:
73826242
Test: manual
Change-Id: I32e13d61b944c1a527cf2d95473552d246e322be
(cherry picked from commit
0e5fbea01c228050739abe8d6cd13d7fdfacf6ef)
android-build-team Robot [Fri, 13 Apr 2018 22:47:59 +0000 (22:47 +0000)]
Merge cherrypicks of [
3898937,
3898958,
3899077,
3897885,
3898496,
3898245,
3898959,
3898960,
3897790,
3898312,
3898313,
3898314,
3899155,
3899156,
3899157,
3898289,
3898290,
3899061,
3898291,
3898292,
3896951,
3899158,
3898961,
3898938,
3898246] into sparse-
4657601-L30800000163316240
Change-Id: Ie16e11a09ca90e182f5ca14fdde1f8b2c56b77f0
Steven Moreland [Thu, 1 Mar 2018 19:03:04 +0000 (11:03 -0800)]
String16: remove integer overflows
Bug:
73826242
Test: manual
Change-Id: I32e13d61b944c1a527cf2d95473552d246e322be
(cherry picked from commit
0e5fbea01c228050739abe8d6cd13d7fdfacf6ef)
android-build-team Robot [Thu, 22 Mar 2018 20:42:49 +0000 (20:42 +0000)]
Merge cherrypicks of [
3782287,
3782954,
3783025,
3783026,
3783027,
3783028,
3783029,
3783030,
3783164,
3783165,
3783167,
3783168,
3783170,
3783171,
3783172,
3782288,
3783031,
3782196,
3782955] into oc-m4-release
Change-Id: Ie9d46f0dda338422c5e1328aba53f5b7bb618625
Steven Moreland [Thu, 1 Mar 2018 19:03:04 +0000 (11:03 -0800)]
String16: remove integer overflows
Bug:
73826242
Test: manual
Change-Id: I32e13d61b944c1a527cf2d95473552d246e322be
(cherry picked from commit
0e5fbea01c228050739abe8d6cd13d7fdfacf6ef)
android-build-team Robot [Wed, 21 Mar 2018 21:28:43 +0000 (21:28 +0000)]
Snap for
4657601 from
cb1a2b98f2dfef30e2e987698321d84cf49d7b17 to oc-m4-release
Change-Id: I9434fc9025d264d1bee3d0cf1a3b80ff7e9b3d90
Chih-Wei Huang [Wed, 7 Mar 2018 08:53:45 +0000 (16:53 +0800)]
Merge tag 'android-8.1.0_r18' into oreo-x86
Android 8.1.0 Release 18 (OPM5.171019.017)
Chih-Wei Huang [Mon, 5 Mar 2018 10:24:24 +0000 (18:24 +0800)]
modprobe: fix return value
It seems bionic ignores the return value of the main function.
As a result, kernel won't know modprobe failed. That may cause
kernel panic.
Using exit() function to fix that.
android-build-team Robot [Mon, 26 Feb 2018 18:06:38 +0000 (18:06 +0000)]
Snap for
4565141 from
9f30f3bbf30b7de0ad3850171db968ae12a6caf0 to oc-m4-release
Change-Id: Ic7a8f8ce92e39048b4e84f44cc8036c2f5a9c875
Chih-Wei Huang [Fri, 23 Feb 2018 08:46:31 +0000 (16:46 +0800)]
modprobe: handle module options correctly
I forgot to pass module options to insmod_by_dep(). Therefore
modules are loaded without options.
android-build-team Robot [Wed, 3 Jan 2018 22:36:11 +0000 (22:36 +0000)]
Snap for
4485699 from
9f30f3bbf30b7de0ad3850171db968ae12a6caf0 to oc-m2-release
Change-Id: Ia84c5d6f459736d07f4ec01dbb5c0b721b5f10e0
Chih-Wei Huang [Wed, 27 Dec 2017 04:10:38 +0000 (12:10 +0800)]
ueventd: load modules in the main process only
Loading modules in multiple processes is dangerous. It may cause
the system to hang.
Only handle uevents with modalias in the main process so that
all modules are loaded sequentially.
Chih-Wei Huang [Wed, 13 Dec 2017 07:05:54 +0000 (15:05 +0800)]
init: add modprobe
We added the modprobe function to init before but it was dropped in
oreo-x86. Originally I planned to replace it by toybox's modprobe.
However, it doesn't work as expected. For example, the audio driver
is not loaded correctly in some Skylake devices.
To fix that, add back the modprobe function to init.
Chih-Wei Huang [Wed, 13 Dec 2017 07:04:30 +0000 (15:04 +0800)]
ueventd: auto load modules on uevents
This is an almost rewritten patch which implements the auto modules
loading function for oreo-x86.
The commits from nougat-x86 are squashed:
* ueventd: defer modules loading if explicitly listed
* ueventd: auto load modules on uevents
Chih-Wei Huang [Wed, 13 Dec 2017 06:57:06 +0000 (14:57 +0800)]
ueventd: fix the buggy logging
LOG(xxx) is totally broken. Use KLOG_xxx to actually show the log.
Chih-Wei Huang [Mon, 20 Nov 2017 08:50:20 +0000 (16:50 +0800)]
init: handle ctrl-alt-del event
By setting /proc/sys/kernel/ctrl-alt-del to 1, kernel will trap
ctrl-alt-del event and send a SIGINT signal to init.
Start the ctrl-alt-del service on receiving the signal.
Chih-Wei Huang [Tue, 12 Sep 2017 16:31:57 +0000 (00:31 +0800)]
fs_mgr: check ro.* property first
fs_mgr reads default fstab via ro.hardware property before Android 8.0.
However, Android 8.0 changed it to use ro.boot.hardware. This is an
incompatible change which is bad.
Android-x86 doesn't set ro.boot.hardware anymore. Let's check ro.*
properties as before.
Chih-Wei Huang [Tue, 12 Sep 2017 08:22:04 +0000 (16:22 +0800)]
init: don't bail out even no SELinux domain defined
Chih-Wei Huang [Sat, 20 May 2017 08:29:06 +0000 (16:29 +0800)]
libsuspend: add powerbtnd thread
Also send wakeup key on resume to ensure the system wakes up normally.
Chih-Wei Huang [Fri, 23 Sep 2016 09:59:47 +0000 (17:59 +0800)]
init: set default value of ro.hardware to the target name
People usually forget to set the value of androidboot.hardware to
the target name in kernel cmdline which results in boot failure.
The change tries to reduce such an error in the future. The target
name is hardcoded to the image. This eliminates the necessity of
androidboot.hardware.
Chih-Wei Huang [Fri, 29 Jul 2016 11:49:58 +0000 (19:49 +0800)]
init.rc: symlink /lib to /system/lib
Currently more linux drivers use request_firmware_nowait() to load
firmwares. It requires the firmwares exist in the standard path.
Create the symlink before ueventd started to ensure firmwares
could be loaded correctly.
Ma Jian [Wed, 6 Jul 2016 10:31:55 +0000 (18:31 +0800)]
Fix build break on x86_64
When TARGET_ARCH=x86_64, the LOCAL_SRC_FILES will be wrongly set to
codegen.cpp.arm, but the android make will 'smartly' remove the suffix
".arm" and try to compile the codegen.cpp without the libenc dependency.
NO_REF_TASK
Tested: local build
Change-Id: I25df0692886fd8b7c56d467d3b6f674919b09b56
Ma Jian [Sun, 12 Jun 2016 09:34:25 +0000 (17:34 +0800)]
Support use local time for RTC
When default timezone isn't UTC, there will no persist.sys.timezone
under /data/property/, so init won't get the default timezone for
setting time from rtc.
This change adds a fallback to read the property when the persist file
does not exists.
Notice, the default property of persist.sys.timezone should be set in
/default.prop instead of /system/build.prop
NO_REF_TASK
Tested: set default timezone with Asia/Shanghai, make sure bios time
is correct in local time, reboot to android, the local time should
be correct.
Change-Id: Ifbd20cb3710f833ab65852b4e5d51e38cc7c2d79
Roman Petrovski [Fri, 10 Jun 2016 19:50:00 +0000 (03:50 +0800)]
init: support usbmisc devices
The patch allows to create usbmisc device nodes like /dev/cdc-wdm0.
Jaap Jan Meijer [Thu, 2 Jun 2016 15:43:24 +0000 (17:43 +0200)]
libsuspend: make sleep state configurable and add a fallback
This patch allows the user to set the sleep state target from
Android properties for wakeup_count method.
It also includes a fallback state if the default state is not
available and the user didn't set the sleep.state property.
Signed-off-by: Jaap Jan Meijer <jjmeijer88@gmail.com>
Ching Tzung Lin [Mon, 11 Jan 2016 21:00:22 +0000 (13:00 -0800)]
Mount debugfs earlier regardless build variant
ag/835596 can be reverted after this CL is merged.
BUG:
26455292
Change-Id: I453b0f1d08d822f8cd2d4d33f1c1b21f0d7f543a
Chih-Wei Huang [Mon, 23 Nov 2015 09:57:37 +0000 (17:57 +0800)]
init: expand variables on mount_all command
This allows mount_all to handle fstab.${ro.hardware} instead
of hardcoding the file name.
Change-Id: Ia7fb4e5a84dd50a46afdd4239b9b06204f449cfe
Chih-Wei Huang [Mon, 10 Aug 2015 08:31:28 +0000 (16:31 +0800)]
Software-accelerated Pixel Flinger
The typical graphic workloads on VirtualBox are improved 3X.
Supports both x86 and x86_64.
Similar change by HazouPH <jgrharbers@gmail.com>:
http://review.cyanogenmod.org/#/c/70896/
And by Quanganh pham <quanganh2627@gmail.com>:
http://review.cyanogenmod.org/#/c/97125/
Susmitha Gummalla [Thu, 25 Jun 2015 05:38:25 +0000 (22:38 -0700)]
Camera: Add feature extensions
This change includes below commits:
Camera bringup changes system-core
Change-Id: I1cf98641eca9096bd27645e07ea802646ea1fb96
system/core: Fix for HAL compilation issues while integrating HAL 1.0
Change-Id: Iead9c1ade279b64c5cbdf4d2de1a8b695939c52a
Camera: Add enum to specify the frame type
Added enum to specify the frame type of either fd/data buffer
CRs-fixed: 654901
Change-Id: I1c0b1a2c6a1425cdb6650cdfc20ca65835a1b81f
Change-Id: I654a40661e6e101da2a06986abeceb20639cccd9
Chih-Wei Huang [Mon, 11 Dec 2017 06:43:57 +0000 (14:43 +0800)]
Merge branch 'android-ia' into oreo-x86
Irina Patru [Fri, 22 Aug 2014 12:18:49 +0000 (15:18 +0300)]
UPSTREAM_PENDING newfs_msdos: Handle alignment failure
When trying to create a new FAT32 file system using alignment, the resulted
MBR structure is corrupted, because the total sectors reported does not
correspond to the actual available sectors. This is due to the reserved
sectors field which is updated during the alignment.
When fsck_msdos will try to check this file system, it will fail because it
cannot match the reported sectors with the actual available sectors.
Due to the failed check, the file system cannot be mounted by vold.
I/fsck_msdos( 2180): FAT size too small, 242822 entries won't fit into 1897 sectors
I/fsck_msdos( 2180): fsck_msdos terminated by exit(8)
E/Vold ( 2180): Filesystem check failed (unknown exit code 8)
E/Vold ( 2180): /dev/block/vold/179:49 failed FS checks (I/O error)
D/Vold ( 2180): Volume sdcard1 state changing 3 (Checking) -> 1 (Idle-Unmounted)
In order to fix this issue, we will save the initial bpb structure and restore
it if the alignment fails.
Change-Id: I58d5078551c689b28c9070585bb330c45bab9c62
Signed-off-by: Irina Patru <irina.patru@intel.com>
Reviewed-on: https://android.intel.com/256992
Reviewed-by: Dolca, Robert <robert.dolca@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Popa, Valentin <valentin.popa@intel.com>
Samuel Ortiz [Thu, 17 Jul 2014 23:35:29 +0000 (01:35 +0200)]
devices: Increase the uevent socket buffer size
Depending on the timing, hald may start while ueventd is not done yet
with its initial coldboot. As hald also independently starts its own
coldboot, ueventd netlink socket buffer could get filled quickly and
thus ueventd could lose some uevents.
This is fixed by increasing the ueventd netlink socket buffer size.
Change-Id: Ie92f77c14099421740b3984f1cc23f813287b78f
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Reviewed-on: https://android.intel.com/219843
Reviewed-by: Escande, Thierry <thierry.escande@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Ortiz, Samuel <samuel.ortiz@intel.com>
Tested-by: Ortiz, Samuel <samuel.ortiz@intel.com>
Tested-by: cactus <cactus@intel.com>
Reviewed-by: Porlan, Patrick <patrick.porlan@intel.com>
Reviewed-by: Bianti, Sebastien <sebastien.bianti@intel.com>
Reviewed-by: Mahalingam, Ganesh <ganesh.mahalingam@intel.com>
Tested-by: Mahalingam, Ganesh <ganesh.mahalingam@intel.com>
Chih-Wei Huang [Mon, 3 Nov 2014 15:06:02 +0000 (23:06 +0800)]
Allow all to execute su
Let the Superuser app control how su is used.
Chih-Wei Huang [Wed, 29 Oct 2014 15:25:57 +0000 (23:25 +0800)]
init.rc: run the console shell as root
To make debugging easier.
Chih-Wei Huang [Fri, 8 Aug 2014 10:17:04 +0000 (18:17 +0800)]
libutils: fix incorrect calculation in utf8_length() method
The first character of utf-8 could be larger than 128. If use signed char
variable to hold it, it would be treated as negative. That may result in
some unexpected errors.
For example, without this patch, suppose the code is 0xE88888, then
first_char is 0xE8 and converted to int32_t type (0xFFFFFFE8) and
masked with (~to_ignore_mask). The result utf32 is
FFF08208
which is incorrect.
Change-Id: I72b355f380865bc375251eb287fc225fd585a115
Chih-Wei Huang [Tue, 1 Feb 2011 07:47:03 +0000 (15:47 +0800)]
init: change firmware_dirs for Android-x86
Chih-Wei Huang [Sat, 15 Jan 2011 22:44:37 +0000 (06:44 +0800)]
ueventd.rc: remove redundant definitions
Change-Id: Icb4f051abf941052aca9752ca2949386738d94e5
Andrew Boie [Thu, 12 Jul 2012 22:39:25 +0000 (15:39 -0700)]
adb: reserve a wakelock when clients are connected over socket
USB OTG connections already have a wakelock reserved, but if a network
socket connection is made, the device can unexpectedly suspend
in the middle of a session. The lock is released when the client
disconnects.
Change-Id: Id5ac01699fab9350955c9814042259542fc6a694
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Andrew Boie [Fri, 11 Nov 2011 01:58:05 +0000 (17:58 -0800)]
diskconfig: Fix disk_layout.conf size parsing
If the user was appending 'K' to their lengths (which is valid
but redundant) it was being treated as megabytes instead of
kilobytes.
Change-Id: I979ec4d01f1342de1f3209b946201ca87bad32a7
Paul Drews [Mon, 20 Jun 2011 17:01:24 +0000 (10:01 -0700)]
Use progressive offset in buffer for successive writes
The code for copying from one raw file to another looped
back and tried again with a suitably smaller number of bytes
if the entire buffer was not written on the first try.
However, it failed to advance an offset in the buffer past
the bytes that were written. This could conceivably happen
under rare circumstances, leading to a corrupted disk image.
This fix defines an offset into the buffer, advancing it by
the number of bytes written on each successive retry.
Signed-off-by: Paul Drews <paul.drews@intel.com>
Change-Id: I76b8e0b3c0d3b0c32bd2114d0867ac7489808279
Andrew Boie [Wed, 11 Jul 2012 03:43:29 +0000 (20:43 -0700)]
libdiskconfig: HACK Don't do space checks on zero-size images
If an image file is of zero size, assume we just want to expand it
to fit the available images.
Change-Id: If8f22eb12d3a5179960d4359307bb177e3323e8a
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
android-build-team Robot [Wed, 29 Nov 2017 18:11:44 +0000 (18:11 +0000)]
Merge cherrypicks of [
3287457,
3287458,
3286978,
3286979,
3287477,
3287478,
3287479,
3287480,
3287517,
3287518,
3287537,
3287538,
3287539,
3287540,
3287481,
3287482,
3287483,
3287484,
3287485,
3287486,
3287487,
3287488,
3287359,
3287459,
3287360,
3287361,
3287362,
3287363,
3287364,
3287365,
3287366,
3287367,
3287489,
3287490,
3287491,
3287557,
3287577,
3287558,
3287492,
3287493,
3287597,
3287617,
3286980,
3287460,
3287494] into oc-m3-release
Change-Id: I493e5863f5ffc6e3e8496969a7421d2af6dc23a2
tintin [Fri, 13 Oct 2017 18:11:48 +0000 (11:11 -0700)]
libnetutil: Check dhcp respose packet length
Bug:
67474440
Test: Manual
Change-Id: I84b533f0101a56ec01e64c7591f3c7e82f513b2e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
(cherry picked from commit
61f25d4a3657e79659963d12005afa8c30883015)
android-build-team Robot [Tue, 28 Nov 2017 23:28:25 +0000 (23:28 +0000)]
Snap for
4448085 from
f469ebae8604bc756259c7305f8cb7617ca18ddc to oc-m3-release
Change-Id: I30438009ec9b51489f34e59daba6bca0dcb4632f
android-build-team Robot [Tue, 28 Nov 2017 03:34:23 +0000 (03:34 +0000)]
Merge cherrypicks of [
3276508,
3277765,
3277766,
3277904,
3276473,
3278009,
3278010,
3277767,
3277768,
3277769,
3277770,
3276509,
3276510,
3278011,
3278012,
3278013,
3278014,
3278099,
3278100,
3278101,
3278102,
3278103,
3278104,
3278105,
3278106,
3277800,
3276474,
3278015,
3278016,
3278017,
3278118,
3278119,
3278120,
3278121,
3278122,
3277946,
3277905,
3277947,
3277906,
3277751,
3278123,
3277752,
3278110,
3277771,
3277907,
3278095,
3277908,
3278111,
3277772,
3276475,
3276476] into oc-mr1-release
Change-Id: Ifa8110f04f5c0940ec625f48d536bfccb3613183
tintin [Fri, 13 Oct 2017 18:11:48 +0000 (11:11 -0700)]
libnetutil: Check dhcp respose packet length
Bug:
67474440
Test: Manual
Change-Id: I84b533f0101a56ec01e64c7591f3c7e82f513b2e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
(cherry picked from commit
61f25d4a3657e79659963d12005afa8c30883015)
android-build-team Robot [Thu, 26 Oct 2017 20:02:59 +0000 (20:02 +0000)]
Snap for
4417144 from
f469ebae8604bc756259c7305f8cb7617ca18ddc to oc-m2-release
Change-Id: I994056f3b78b14c04e7b08d81b0ada71876a020a
android-build-team Robot [Fri, 20 Oct 2017 07:17:28 +0000 (07:17 +0000)]
Snap for
4407597 from
fdd67a54ec43b47616893f8138d6d7029d14513b to oc-mr1-release
Change-Id: I3ccb24d6758cdfba1e68ee97b4142e832df804fe
Narayan Kamath [Thu, 19 Oct 2017 19:55:04 +0000 (19:55 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours am:
89b22dff0a am:
4bcb04290d am:
3a46bcc3e0 am:
9800d5d074 -s ours am:
c995780ded am:
10d3ff2004 am:
5bccb55338 am:
7fe7bce52f am:
d07ba77e60 -s ours am:
fb1a14ad59
am:
c184678b7a
Change-Id: I6d55e4c9dc4fcaf069596437006210c47bc512f7
Narayan Kamath [Thu, 19 Oct 2017 19:53:50 +0000 (19:53 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours am:
951b0dccf0 am:
6e598b9e9d am:
4b187be82f am:
b46123a98d -s ours am:
97d2cfab6a am:
ea2010e196 am:
a4de1f4749 am:
5995e741e5 am:
bc5fc101ad -s ours am:
b1f99e94d8
am:
b29e9fecfe
Change-Id: I542f159a18d1d555260ca17ef00da7024c705e7f
Narayan Kamath [Thu, 19 Oct 2017 19:46:41 +0000 (19:46 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours am:
89b22dff0a am:
4bcb04290d am:
3a46bcc3e0 am:
9800d5d074 -s ours am:
c995780ded am:
10d3ff2004 am:
5bccb55338 am:
7fe7bce52f am:
d07ba77e60 -s ours
am:
fb1a14ad59
Change-Id: I64a827480c5b0be20d1e7972853f7fcbac6171b8
Narayan Kamath [Thu, 19 Oct 2017 19:45:36 +0000 (19:45 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours am:
951b0dccf0 am:
6e598b9e9d am:
4b187be82f am:
b46123a98d -s ours am:
97d2cfab6a am:
ea2010e196 am:
a4de1f4749 am:
5995e741e5 am:
bc5fc101ad -s ours
am:
b1f99e94d8
Change-Id: I0a00404d10c78c1cd6e119d6337dee0a1c579a55
Narayan Kamath [Thu, 19 Oct 2017 19:42:24 +0000 (19:42 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
547c7d9a0b -s ours am:
4732ec6440 -s ours am:
59c7fe7a39 am:
28a7d07705 am:
a413ac3c8a am:
685a175cb0 -s ours am:
886eb4351e am:
4f22203279 am:
ea729dcae5 am:
369bf9065d am:
79f474a679 -s ours am:
c26850c970
am:
8085ab4ec5
Change-Id: I7f0d7d7b84fc26d8c2bae371337a63bcaacf003c
Narayan Kamath [Thu, 19 Oct 2017 19:41:03 +0000 (19:41 +0000)]
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am:
64406ab149 am:
fcf9c96fff -s ours am:
95584d203f am:
5d8784c53d am:
d86a41ea39 am:
36424c8f5f am:
b70bb65f24 am:
626bb148e6 am:
45ce8549c4 am:
d27178e362 am:
1bab31a4df am:
3fb0e4ae70
am:
3cee49d066
Change-Id: I374edb225ac3ab6fee65a9b3f7fe0ac86e6f5656
Narayan Kamath [Thu, 19 Oct 2017 19:40:28 +0000 (19:40 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours am:
89b22dff0a am:
4bcb04290d am:
3a46bcc3e0 am:
9800d5d074 -s ours am:
c995780ded am:
10d3ff2004 am:
5bccb55338 am:
7fe7bce52f
am:
d07ba77e60 -s ours
Change-Id: I1f7f0cfa5b5f550dc2850a1845734e3ef5ee6929
Narayan Kamath [Thu, 19 Oct 2017 19:38:44 +0000 (19:38 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
547c7d9a0b -s ours am:
4732ec6440 -s ours am:
59c7fe7a39 am:
28a7d07705 am:
a413ac3c8a am:
685a175cb0 -s ours am:
886eb4351e am:
4f22203279 am:
ea729dcae5 am:
369bf9065d am:
79f474a679 -s ours
am:
c26850c970
Change-Id: I4445bafd1e1a2ef81300823dfa9023bb68ada5f4
Narayan Kamath [Thu, 19 Oct 2017 19:38:28 +0000 (19:38 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours am:
951b0dccf0 am:
6e598b9e9d am:
4b187be82f am:
b46123a98d -s ours am:
97d2cfab6a am:
ea2010e196 am:
a4de1f4749 am:
5995e741e5
am:
bc5fc101ad -s ours
Change-Id: I416210e446828495b6b0db054b77e15a8b1dd731
Narayan Kamath [Thu, 19 Oct 2017 19:38:23 +0000 (19:38 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours am:
89b22dff0a am:
4bcb04290d am:
3a46bcc3e0 am:
9800d5d074 -s ours am:
c995780ded am:
10d3ff2004 am:
5bccb55338
am:
7fe7bce52f
Change-Id: I500587ac26d3b5420598520ee196cf696b39f4f9
Narayan Kamath [Thu, 19 Oct 2017 19:37:26 +0000 (19:37 +0000)]
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am:
64406ab149 am:
fcf9c96fff -s ours am:
95584d203f am:
5d8784c53d am:
d86a41ea39 am:
36424c8f5f am:
b70bb65f24 am:
626bb148e6 am:
45ce8549c4 am:
d27178e362 am:
1bab31a4df
am:
3fb0e4ae70
Change-Id: Id60bdf2f11342bde648f79bad64ef434f3c9460f
Narayan Kamath [Thu, 19 Oct 2017 19:37:17 +0000 (19:37 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours am:
951b0dccf0 am:
6e598b9e9d am:
4b187be82f am:
b46123a98d -s ours am:
97d2cfab6a am:
ea2010e196 am:
a4de1f4749
am:
5995e741e5
Change-Id: I8ad269b877b307eb104f7b749ad728b931dd0aa2
Narayan Kamath [Thu, 19 Oct 2017 19:36:20 +0000 (19:36 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours am:
89b22dff0a am:
4bcb04290d am:
3a46bcc3e0 am:
9800d5d074 -s ours am:
c995780ded am:
10d3ff2004
am:
5bccb55338
Change-Id: I42e59e67fec69f487fdffed07f84625714a58eaa
Narayan Kamath [Thu, 19 Oct 2017 19:36:01 +0000 (19:36 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
547c7d9a0b -s ours am:
4732ec6440 -s ours am:
59c7fe7a39 am:
28a7d07705 am:
a413ac3c8a am:
685a175cb0 -s ours am:
886eb4351e am:
4f22203279 am:
ea729dcae5 am:
369bf9065d
am:
79f474a679 -s ours
Change-Id: I31ef016a5e85f365e0aa297fe37c65d2a391071b
Narayan Kamath [Thu, 19 Oct 2017 19:35:22 +0000 (19:35 +0000)]
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am:
64406ab149 am:
fcf9c96fff -s ours am:
95584d203f am:
5d8784c53d am:
d86a41ea39 am:
36424c8f5f am:
b70bb65f24 am:
626bb148e6 am:
45ce8549c4 am:
d27178e362
am:
1bab31a4df
Change-Id: Iebb2829c8c285953a056ac2ecef682ae9485b643
Narayan Kamath [Thu, 19 Oct 2017 19:35:14 +0000 (19:35 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours am:
951b0dccf0 am:
6e598b9e9d am:
4b187be82f am:
b46123a98d -s ours am:
97d2cfab6a am:
ea2010e196
am:
a4de1f4749
Change-Id: I781301b38e5dd172c10cca10fbae831530440ca1
Narayan Kamath [Thu, 19 Oct 2017 19:33:02 +0000 (19:33 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
547c7d9a0b -s ours am:
4732ec6440 -s ours am:
59c7fe7a39 am:
28a7d07705 am:
a413ac3c8a am:
685a175cb0 -s ours am:
886eb4351e am:
4f22203279 am:
ea729dcae5
am:
369bf9065d
Change-Id: I3d8210eaa9dffa9f94abd9be4ff43b9f6d57d4b8
Narayan Kamath [Thu, 19 Oct 2017 19:33:02 +0000 (19:33 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours am:
89b22dff0a am:
4bcb04290d am:
3a46bcc3e0 am:
9800d5d074 -s ours am:
c995780ded
am:
10d3ff2004
Change-Id: I6b01dd2fa72261126be178f521c74576e6221f0e
Narayan Kamath [Thu, 19 Oct 2017 19:32:16 +0000 (19:32 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours am:
951b0dccf0 am:
6e598b9e9d am:
4b187be82f am:
b46123a98d -s ours am:
97d2cfab6a
am:
ea2010e196
Change-Id: Id94ff7eba5c127d1c6ac4dcadf09c9e7e4ad6bc1
Narayan Kamath [Thu, 19 Oct 2017 19:32:04 +0000 (19:32 +0000)]
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am:
64406ab149 am:
fcf9c96fff -s ours am:
95584d203f am:
5d8784c53d am:
d86a41ea39 am:
36424c8f5f am:
b70bb65f24 am:
626bb148e6 am:
45ce8549c4
am:
d27178e362
Change-Id: I44f0e220da67fc29369ba1a01a89dd10627d5f85
Narayan Kamath [Thu, 19 Oct 2017 19:30:45 +0000 (19:30 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
547c7d9a0b -s ours am:
4732ec6440 -s ours am:
59c7fe7a39 am:
28a7d07705 am:
a413ac3c8a am:
685a175cb0 -s ours am:
886eb4351e am:
4f22203279
am:
ea729dcae5
Change-Id: I0724657c65dcd16956e52429d0cc646007b07273
Narayan Kamath [Thu, 19 Oct 2017 19:30:44 +0000 (19:30 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours am:
89b22dff0a am:
4bcb04290d am:
3a46bcc3e0 am:
9800d5d074 -s ours
am:
c995780ded
Change-Id: I9a51f837432346064b4faf84a634e85e492debcf
Narayan Kamath [Thu, 19 Oct 2017 19:28:45 +0000 (19:28 +0000)]
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am:
64406ab149 am:
fcf9c96fff -s ours am:
95584d203f am:
5d8784c53d am:
d86a41ea39 am:
36424c8f5f am:
b70bb65f24 am:
626bb148e6
am:
45ce8549c4
Change-Id: I5b6f9a34fe64bbeab02fca9f37d5ddca138ce89a
Narayan Kamath [Thu, 19 Oct 2017 19:28:41 +0000 (19:28 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
547c7d9a0b -s ours am:
4732ec6440 -s ours am:
59c7fe7a39 am:
28a7d07705 am:
a413ac3c8a am:
685a175cb0 -s ours am:
886eb4351e
am:
4f22203279
Change-Id: I08886c30fdabfd59f5a75279e70ec74fc26b2d0b
Narayan Kamath [Thu, 19 Oct 2017 19:28:37 +0000 (19:28 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours am:
951b0dccf0 am:
6e598b9e9d am:
4b187be82f am:
b46123a98d -s ours
am:
97d2cfab6a
Change-Id: Ie4c3f2fb73b4b64c9fa70e7cd7c09a5449600691
Narayan Kamath [Thu, 19 Oct 2017 19:26:33 +0000 (19:26 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours am:
89b22dff0a am:
4bcb04290d am:
3a46bcc3e0
am:
9800d5d074 -s ours
Change-Id: Iaa25cd6dda9e9fbc47467688f3b4d7c00b632703
Narayan Kamath [Thu, 19 Oct 2017 19:26:16 +0000 (19:26 +0000)]
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am:
64406ab149 am:
fcf9c96fff -s ours am:
95584d203f am:
5d8784c53d am:
d86a41ea39 am:
36424c8f5f am:
b70bb65f24
am:
626bb148e6
Change-Id: Idb4181f57f78ab4afbf8df3735897347d7effe5d
Narayan Kamath [Thu, 19 Oct 2017 19:25:57 +0000 (19:25 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours am:
951b0dccf0 am:
6e598b9e9d am:
4b187be82f
am:
b46123a98d -s ours
Change-Id: I8884dd090583f0e089830410e6a00c4c49e6b43c
Narayan Kamath [Thu, 19 Oct 2017 19:25:46 +0000 (19:25 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
547c7d9a0b -s ours am:
4732ec6440 -s ours am:
59c7fe7a39 am:
28a7d07705 am:
a413ac3c8a am:
685a175cb0 -s ours
am:
886eb4351e
Change-Id: I96387e1276c9f383c1ed463398226129d58364f7
Narayan Kamath [Thu, 19 Oct 2017 19:25:19 +0000 (19:25 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours am:
89b22dff0a am:
4bcb04290d
am:
3a46bcc3e0
Change-Id: I20c27db686870c2ac0d383e1646040f9ddf089ed
Narayan Kamath [Thu, 19 Oct 2017 19:24:40 +0000 (19:24 +0000)]
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am:
64406ab149 am:
fcf9c96fff -s ours am:
95584d203f am:
5d8784c53d am:
d86a41ea39 am:
36424c8f5f
am:
b70bb65f24
Change-Id: Ia5d7c234efa48102c42a6f4da03e49d8cf84c54e
Narayan Kamath [Thu, 19 Oct 2017 19:24:32 +0000 (19:24 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours am:
951b0dccf0 am:
6e598b9e9d
am:
4b187be82f
Change-Id: Ic60afdb3082fe5d24057407dc2810e552bb8c7dd
Narayan Kamath [Thu, 19 Oct 2017 19:22:39 +0000 (19:22 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
547c7d9a0b -s ours am:
4732ec6440 -s ours am:
59c7fe7a39 am:
28a7d07705 am:
a413ac3c8a
am:
685a175cb0 -s ours
Change-Id: I6047b1af5b0ac1ee29d512392bbfe7fd3d161e06
Narayan Kamath [Thu, 19 Oct 2017 19:22:38 +0000 (19:22 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours am:
89b22dff0a
am:
4bcb04290d
Change-Id: I94da1d7773bdac11b517a604296e2e7862cc9041
Narayan Kamath [Thu, 19 Oct 2017 19:22:09 +0000 (19:22 +0000)]
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am:
64406ab149 am:
fcf9c96fff -s ours am:
95584d203f am:
5d8784c53d am:
d86a41ea39
am:
36424c8f5f
Change-Id: I61e54971c10af968bdd2abe2dceeb337289ab110
Narayan Kamath [Thu, 19 Oct 2017 19:22:03 +0000 (19:22 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours am:
951b0dccf0
am:
6e598b9e9d
Change-Id: I0ad76feb073074ec935ac49de8a2af55d48932bc
Narayan Kamath [Thu, 19 Oct 2017 19:20:43 +0000 (19:20 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
547c7d9a0b -s ours am:
4732ec6440 -s ours am:
59c7fe7a39 am:
28a7d07705
am:
a413ac3c8a
Change-Id: Iaa35c4240a11ccba54f88e47e44696210403d3e6
Narayan Kamath [Thu, 19 Oct 2017 19:20:04 +0000 (19:20 +0000)]
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am:
64406ab149 am:
fcf9c96fff -s ours am:
95584d203f am:
5d8784c53d
am:
d86a41ea39
Change-Id: I4bb1b5a5baa9d39f904dd56c0a36cf32cf7b8018
Narayan Kamath [Thu, 19 Oct 2017 19:18:51 +0000 (19:18 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
547c7d9a0b -s ours am:
4732ec6440 -s ours am:
59c7fe7a39
am:
28a7d07705
Change-Id: I808da09dc5496d2cc3471fa3de6c083c80d038b4
Narayan Kamath [Thu, 19 Oct 2017 19:18:35 +0000 (19:18 +0000)]
DO NOT MERGE : Partially revert change
141d1d836465e8a5a56a5cc1e. am:
bfe4b5edb3 -s ours am:
e1257bad6e -s ours
am:
89b22dff0a
Change-Id: I5c7c636e60cde0b865e0392b2c6e024a97887449
Narayan Kamath [Thu, 19 Oct 2017 19:18:03 +0000 (19:18 +0000)]
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am:
64406ab149 am:
fcf9c96fff -s ours am:
95584d203f
am:
5d8784c53d
Change-Id: Iaa1e3501b3acf207d4cf5afe01dc4f530df0cd42
Narayan Kamath [Thu, 19 Oct 2017 19:18:01 +0000 (19:18 +0000)]
DO NOT MERGE : Fix build breakage due to
2d516d2d46b1b1. am:
eeb93c9a64 -s ours
am:
951b0dccf0
Change-Id: Ib8125c31898b27cfa6607c3cb3ec820c290dfe99