Christopher Ferris
efa16af53e
am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"
...
* commit 'cad5ce81adb28e131f2521fa5e553e222e0a19f4':
adbd: Support for new f_fs descriptor format
2015-01-26 21:21:55 +00:00
Christopher Ferris
cad5ce81ad
Merge "adbd: Support for new f_fs descriptor format"
2015-01-26 21:11:00 +00:00
Badhri Jagan Sridharan
9e3cce50a3
adbd: Support for new f_fs descriptor format
...
The patch "[RFC] usb: gadget: f_fs: Add flags
to descriptors block" marks the current
usb_functionfs_descs_head format deprecated
and introduces support for sending SuperSpeed
descriptors.
This CL makes adbd to send Descriptors in the
new format. Adbd would fall back to the old
format, if kernel is not able to recognize
the new format. This is done to prevent
adbd from breaking in the older versions
of the kernel.
Bug: 17394972
(cherry picked from commit b5b43043fa )
Change-Id: I5af9dc9d4f41ad47d678279054a648f69497b24e
2015-01-26 12:49:13 -08:00
Elliott Hughes
4db9c8935d
am d4069928: Merge "Add missing <string.h> include."
...
* commit 'd40699287fb659eca92b93dd325f82babcef77e6':
Add missing <string.h> include.
2015-01-25 20:42:51 +00:00
Elliott Hughes
d40699287f
Merge "Add missing <string.h> include."
2015-01-25 16:07:26 +00:00
Elliott Hughes
e01d9de981
Add missing <string.h> include.
...
Change-Id: I79a9a58904b2992c306d8de0c7b3a4aacd4b67e0
2015-01-24 22:21:24 -08:00
Kenny Root
e84e931040
am eade3a80: Merge "Remove superfluous OpenSSL include paths."
...
* commit 'eade3a800effe8f8fb89c8a2da12831bc5ba3239':
Remove superfluous OpenSSL include paths.
2015-01-23 01:20:52 +00:00
Kenny Root
eade3a800e
Merge "Remove superfluous OpenSSL include paths."
2015-01-23 01:10:00 +00:00
Adam Langley
6ed899a9b6
Remove superfluous OpenSSL include paths.
...
This include path was needed because system/vold/cryptfs.h included an
OpenSSL header just to get the length of a SHA-256 hash. This has been
fixed in https://android-review.googlesource.com/#/c/124477/1 .
Change-Id: I06a8ba0ee5b9efcc3260598f07d9819f065711de
2015-01-22 16:47:36 -08:00
Jesse Zhao
465e870291
am 5bf74b23: Bump up max_map_count value.
...
* commit '5bf74b238b402eaaf8c5bd1663fe4d592e59421f':
Bump up max_map_count value.
2015-01-15 19:21:03 +00:00
Jesse Zhao
5bf74b238b
Bump up max_map_count value.
...
Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39
Bug: 18503789
2015-01-08 16:02:46 -08:00
Yabin Cui
479e510811
am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."
...
* commit 'dd719dfe4eb1d8c15342ce05d2a0ab975c390d67':
Use getmntent when accessing /proc/mounts.
2015-01-06 04:36:24 +00:00
Yabin Cui
dd719dfe4e
Merge "Use getmntent when accessing /proc/mounts."
2015-01-06 04:24:58 +00:00
Dan Albert
6bec0e51b0
am a5d63956: Merge "Remove an uninitialized value."
...
* commit 'a5d63956c419f01a9e57414c23d3ded3a16e0f8a':
Remove an uninitialized value.
2015-01-05 21:53:26 +00:00
Dan Albert
a5d63956c4
Merge "Remove an uninitialized value."
2015-01-05 21:40:11 +00:00
Yabin Cui
a382e2bdb2
Use getmntent when accessing /proc/mounts.
...
Bug: 18887435
Change-Id: Ice44c14fc8ee79eab259caf486e123b6af21ceb0
2015-01-02 14:00:13 -08:00
Elliott Hughes
6bb8f47686
am 538d7d83: Merge "Fix missing #includes in bootable/recovery."
...
* commit '538d7d838d82e29c738145431aa64c587dc84943':
Fix missing #includes in bootable/recovery.
2014-12-30 12:29:31 +00:00
Elliott Hughes
538d7d838d
Merge "Fix missing #includes in bootable/recovery."
2014-12-29 21:17:56 +00:00
Elliott Hughes
d4d4c2456a
Fix missing #includes in bootable/recovery.
...
Change-Id: I58dfbac6ca1aa80d3659f53a8fad1bbbbdc9b941
2014-12-29 12:46:43 -08:00
Dan Albert
7279f97ab4
Remove an uninitialized value.
...
The assignment of this value was removed in 0d32f25 , but the
declaration was still there and still tested. Clang issues a warning
for this.
Change-Id: I748bfb8b4f78ceed1c1b5b1bb80cb4e873e4facc
2014-12-18 22:50:08 +00:00
Sungmin Choi
8af7c5df57
am a72512cd: Add O_CREAT option for open
...
* commit 'a72512cd058da7de4cdb667776ed47fad873f12c':
Add O_CREAT option for open
2014-12-11 19:24:52 +00:00
Sungmin Choi
a72512cd05
Add O_CREAT option for open
...
Factory reset fails if there is no file, for example, RECOVERY_COMMAND_FILE_TMP.
So create file as adding O_CREAT option if it does not exist.
error log:
--------- beginning of crash
12-10 02:35:17.190 3059 3059 F libc : Fatal signal 11 (SIGSEGV), code 1, fault addr 0x30 in tid 3059 (uncrypt)
12-10 02:35:17.296 766 1528 W NativeCrashListener: Couldn't find ProcessRecord for pid 3059
12-10 02:35:17.296 191 191 I DEBUG : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
12-10 02:35:17.296 191 191 E DEBUG : AM write failure (32 / Broken pipe)
12-10 02:35:17.296 191 191 I DEBUG : Build fingerprint: 'Android/aosp_hammerhead/hammerhead:5.1/LMP/hopemini12052127:userdebug/test-keys'
12-10 02:35:17.296 191 191 I DEBUG : Revision: '10'
12-10 02:35:17.297 191 191 I DEBUG : ABI: 'arm'
12-10 02:35:17.297 191 191 I DEBUG : pid: 3059, tid: 3059, name: uncrypt >>> /system/bin/uncrypt <<<
12-10 02:35:17.297 191 191 I DEBUG : signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x30
12-10 02:35:17.302 191 191 I DEBUG : r0 00000001 r1 be94b690 r2 fffffe90 r3 b6fdbf7c
12-10 02:35:17.302 191 191 I DEBUG : r4 00000000 r5 00000000 r6 b6fd8ca4 r7 be94b67c
12-10 02:35:17.302 191 191 I DEBUG : r8 00000000 r9 ffffffff sl b6ff582b fp be94b68d
12-10 02:35:17.302 191 191 I DEBUG : ip b6fcfd08 sp be94b648 lr b6f98fe5 pc b6f98fe4 cpsr 20070030
12-10 02:35:17.303 191 191 I DEBUG :
12-10 02:35:17.303 191 191 I DEBUG : backtrace:
12-10 02:35:17.303 191 191 I DEBUG : #00 pc 00032fe4 /system/lib/libc.so (fputs+29)
12-10 02:35:17.303 191 191 I DEBUG : #01 pc 000016a1 /system/bin/uncrypt
12-10 02:35:17.303 191 191 I DEBUG : #02 pc 0000114b /system/bin/uncrypt
12-10 02:35:17.303 191 191 I DEBUG : #03 pc 00012df5 /system/lib/libc.so (__libc_init+44)
12-10 02:35:17.303 191 191 I DEBUG : #04 pc 000013cc /system/bin/uncrypt
12-10 02:35:17.325 191 191 I DEBUG :
12-10 02:35:17.325 191 191 I DEBUG : Tombstone written to: /data/tombstones/tombstone_00
Bug: 18709330
Change-Id: Ib5dccdd366e829049938a188ea5f98d9e4e282db
2014-12-10 21:50:46 -08:00
Patrick Tjin
cb1a750214
am f59b9942: Add basic navigation controls to log viewer.
...
* commit 'f59b994264b2e8ffe179e2405cda81811f8a9db1':
Add basic navigation controls to log viewer.
2014-12-10 22:21:15 +00:00
Patrick Tjin
8e8d5de477
am cd055ee7: Save kernel logs to /cache/recovery
...
* commit 'cd055ee72a5efaf4bcbc0f81692410d3ffcda5e0':
Save kernel logs to /cache/recovery
2014-12-10 22:21:14 +00:00
Patrick Tjin
f59b994264
Add basic navigation controls to log viewer.
...
Bug: 18642766
Change-Id: I95a6c8edf83513d421a041e79c15111b5c991dde
Signed-off-by: Patrick Tjin <pattjin@google.com >
2014-12-10 05:18:05 +00:00
Patrick Tjin
cd055ee72a
Save kernel logs to /cache/recovery
...
Bug: 18642766
Change-Id: I6c8b7d8f9ffb688d3afdfe0d47c4142e711e421d
Signed-off-by: Patrick Tjin <pattjin@google.com >
2014-12-10 05:17:14 +00:00
Michael Runge
4f9fcffce7
am 37ad1f12: Merge "Force write to disk while doing uncrypt" into lmp-mr1-dev
...
* commit '37ad1f1273dd579b84317be6d1a9a27ad32af88c':
Force write to disk while doing uncrypt
2014-12-10 03:33:49 +00:00
Michael Runge
37ad1f1273
Merge "Force write to disk while doing uncrypt" into lmp-mr1-dev
2014-12-09 23:58:56 +00:00
Ying Wang
cdce7f7e55
am c43b17f0: Merge "Fix recovery image build for 32p"
...
* commit 'c43b17f0adac1092e221ce6166ca8bc464090525':
Fix recovery image build for 32p
2014-12-02 00:07:35 +00:00
Ying Wang
c43b17f0ad
Merge "Fix recovery image build for 32p"
2014-12-01 23:59:21 +00:00
Bruce Beare
4c3c7a962f
Fix recovery image build for 32p
...
When building for 32p, we need to be explicit that we wish to build
the 32bit version of the binaries that will be placed in the recovery
image. The recovery image doesn't actually care... but if we are not
explicit in this, the makefiles will ask for the 64bit binaries but the
Android.mk for the binaries will supply the 32bit images (causing the
build to fail).
Change-Id: Iea2d5f412740c082795da4358765751138a4b167
2014-11-30 19:21:19 -08:00
Michael Runge
0fe938c0fb
am 5b9c4ce5: am b278c252: Add support for tune2fs file operations
...
* commit '5b9c4ce5a15bb76919e1556ae59993e9c310c0bc':
Add support for tune2fs file operations
2014-11-24 18:06:43 +00:00
Michael Runge
5b9c4ce5a1
am b278c252: Add support for tune2fs file operations
...
* commit 'b278c252e148798346f85fc92eeea6afeb33fbf0':
Add support for tune2fs file operations
2014-11-24 02:37:03 +00:00
Michael Runge
4b54239173
Force write to disk while doing uncrypt
...
This should reduce errors if the device reboots before the blocks
are commited to disk.
Bug: 18481902
Change-Id: I13cda1c78955e4c83522fbcf87ddb16cc9f97683
2014-11-21 16:27:28 -08:00
Michael Runge
b278c252e1
Add support for tune2fs file operations
...
This allows tune2fs to be executed from within OTA scripts,
allowing for file system modifications without formatting the
partition
Bug: 18430740
Change-Id: I0c2e05b5ef4a81ecea043e9b7b99b545d18fe5e6
2014-11-21 13:02:03 -08:00
Dan Albert
39be2f64fd
am d34b6378: Merge "Global C++11 compatibility."
...
* commit 'd34b63780eaf80ba71279360dc1e2fdbdc488eec':
Global C++11 compatibility.
2014-11-20 23:00:40 +00:00
Dan Albert
d34b63780e
Merge "Global C++11 compatibility."
2014-11-20 21:21:14 +00:00
Dan Albert
32f9fe7fab
Global C++11 compatibility.
...
Our build system compiles flex/bison as C++ rather than C, but a few
projects add `-x c` to their flags, forcing the compiler to compile
them as C. This causes the compiler to reject the global C++ standard
flag, so we need to explicitly provide a C standard flag to override
it.
Bug: 18466763
Change-Id: Id68ad9317261ed4d857a949b07288bd137ff6303
2014-11-20 13:17:35 -08:00
Heather Lee Wilson
71fa539243
am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery mode
...
* commit 'de27d4cbb75a9c2f5ad0fc24edf5295d0f3d9fe0':
Byte swap to support BGRA in recovery mode
2014-11-15 16:32:22 +00:00
Heather Lee Wilson
de27d4cbb7
am e5879c36: Byte swap to support BGRA in recovery mode
...
* commit 'e5879c3639789d61803605c12371a4f291e0b3cc':
Byte swap to support BGRA in recovery mode
2014-11-14 20:26:51 +00:00
Heather Lee Wilson
e5879c3639
Byte swap to support BGRA in recovery mode
...
Fixes color palate of recovery mode when double buffer enabled.
Bug: 18169447
Change-Id: Ia50b0fb9afd8001dfd740c09ce109fa421e691f7
2014-11-14 12:00:18 -08:00
Yabin Cui
82ca0ba805
am 92242c70: Merge "kill HAVE_FORKEXEC"
...
* commit '92242c704846f28932e555dba800f4a701063896':
kill HAVE_FORKEXEC
2014-11-13 19:10:18 +00:00
Yabin Cui
92242c7048
Merge "kill HAVE_FORKEXEC"
2014-11-13 18:14:54 +00:00
Yabin Cui
678f7d4a36
kill HAVE_FORKEXEC
...
Bug: 18317407
Change-Id: Idd4e0effa96752e2c0ca959728f80df4d2d34187
2014-11-12 16:51:45 -08:00
Michael Runge
8bebe58e54
am 2020564f: am be81e51c: Use more aggressive sync writing to applypatch.
...
* commit '2020564f21bb0216965f0f5c43c5c1c995785bab':
Use more aggressive sync writing to applypatch.
2014-10-31 00:13:22 +00:00
Michael Runge
c2e7d903ad
am e908a454: am 042c3cd0: Force sync files written by minzip.
...
* commit 'e908a45420fc4194c6007193d21d5b690e04583f':
Force sync files written by minzip.
2014-10-31 00:13:21 +00:00
Michael Runge
2020564f21
am be81e51c: Use more aggressive sync writing to applypatch.
...
* commit 'be81e51c171a0cf9b9b5045ee949282b7f36d779':
Use more aggressive sync writing to applypatch.
2014-10-29 20:23:58 +00:00
Michael Runge
be81e51c17
Use more aggressive sync writing to applypatch.
...
We have seen cases where the boot partition is patched, but upon
recovery the partition appears to be corrupted. Open up all
patched files/partitions with O_SYNC, and do not ignore the
errors from fsync/close operations.
Bug: 18170529
Change-Id: I392ad0a321d937c4ad02eaeea9170be384a4744b
2014-10-29 13:00:21 -07:00
Michael Runge
e908a45420
am 042c3cd0: Force sync files written by minzip.
...
* commit '042c3cd04ec3ef416019fa382cd5b1a942bd79e1':
Force sync files written by minzip.
2014-10-29 18:51:51 +00:00
Michael Runge
042c3cd04e
Force sync files written by minzip.
...
Some files appear to be missing their sync to disk.
Bug: 18145574
Change-Id: Ic858624a4dd65bbfc54d30f3a13c607078270345
2014-10-28 19:49:57 -07:00