Commit graph

913 commits

Author SHA1 Message Date
Ajay Dudani
07d9627d7c recovery: Handle EV_SW events
Change-Id: I29c13a941067cd1bbdced3bd67fd93293347d7b6
2015-02-10 16:28:07 -08:00
Elliott Hughes
bf0be350dd Merge "recovery: Generate libminui dynamic library" 2015-02-11 00:26:18 +00:00
Ajay Dudani
9905f3a4ee recovery: Generate libminui dynamic library
Allow factory test images to use minui functionaltiy
by making use of libminui dynamic library.

Change-Id: I63e77420d5addbcc6eebeedc213f629085766b4c
2015-02-10 16:25:17 -08:00
Elliott Hughes
35efcd275f Merge "recovery: Properly detect userdebug or eng builds" 2015-02-10 23:55:45 +00:00
Elliott Hughes
f14af80a14 recovery: Properly detect userdebug or eng builds
The recovery system behaves a little bit differently on userdebug or
eng builds by presenting error reports to the user in the ui.
This is controlled by checking the build fingerprint for the string
:userdebug/ or :eng/. But with AOSP version numbers most AOSP
builds blows the 92 char limit of ro.build.fingerprint and therefore
the property is not set, so this condition will always be evaluated
to false, for most builds.

Instead of depending on the flaky ro.build.fingerprint this change
uses ro.debuggable.

Change-Id: I74bc00c655ac596aaf4b488ecea58f0a8de9c26b
2015-02-10 14:46:14 -08:00
Nick Kralevich
99e084ca80 Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" 2015-02-08 15:09:00 +00:00
Nanik Tolaram
4e8e93b666 Remove dead/unused code and realign some of the comments
to make it more cleaner and easier to read

Change-Id: If536d482c0ed645368084e76d8ec060f05d89137
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
2015-02-08 22:31:14 +11:00
Elliott Hughes
6a0d2fbcaa Merge "There's no GPL code in 'updater'." 2015-02-07 07:34:41 +00:00
Elliott Hughes
8a9014d572 There's no GPL code in 'updater'.
This notice was added for libsyspatch and libxdelta3, but that code
has been removed since.

Change-Id: I4008878ded56ca1d5094a8208728f8c02fe1fe03
2015-02-05 14:53:55 -08:00
Elliott Hughes
aeecac5444 Merge "Add missing includes." 2015-01-30 06:24:40 +00:00
Elliott Hughes
cd3c55ab40 Add missing includes.
Change-Id: I06ea08400efa511e627be37a4fd70fbdfadea2e6
2015-01-29 20:50:08 -08:00
Elliott Hughes
dab56cac95 Merge "Add missing includes." 2015-01-28 20:36:40 +00:00
Elliott Hughes
26dbad2b98 Add missing includes.
Change-Id: I0737456e0221ebe9cc854d65c95a7d37d0869d56
2015-01-28 12:09:05 -08:00
Dan Albert
eaeb55f745 Merge "Start losing code to libadb." 2015-01-27 00:51:09 +00:00
Christopher Ferris
cdc38d0401 Merge "Fix the v2 descriptor handling." 2015-01-26 21:28:21 +00:00
Christopher Ferris
cad5ce81ad Merge "adbd: Support for new f_fs descriptor format" 2015-01-26 21:11:00 +00:00
Christopher Ferris
3ed8ef02ed Fix the v2 descriptor handling.
There was a misinterpretation of how the v2 header works. The flags
in the header indicate what is in the rest of the structure.

Bug: 19127803
Change-Id: I83fd93df1df196300a80ddeb3b49ca7851ffcfb8
2015-01-26 12:53:20 -08: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
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
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
Yabin Cui
dd719dfe4e Merge "Use getmntent when accessing /proc/mounts." 2015-01-06 04:24:58 +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
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
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
Dan Albert
a01ce3a229 Start losing code to libadb.
Bug: 17626262
Change-Id: I8ce7cff2b7789f39f35a4211d7120d072c05a863
2014-11-25 10:59:42 -08: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
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
Dan Albert
c7249660f9 am 4f66469b: Merge "More test makefile cleanup."
* commit '4f66469b29a34811b69518a266be31fe42cc111b':
  More test makefile cleanup.
2014-10-17 07:47:57 +00:00
Dan Albert
4f66469b29 Merge "More test makefile cleanup." 2014-10-17 01:28:35 +00:00
Dan Albert
13f21c2bc7 More test makefile cleanup.
Global variables kill.
No need to manually link gtest, and that causes problems with
libc++.

Change-Id: If804cdd436cf1addfa9a777708efbc37c27770b6
2014-10-17 01:05:08 +00:00
Dan Albert
ea5828a24f am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""
* commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0':
  Revert "Copy epoll(2) changes to minadb."
2014-09-26 16:12:23 +00:00
Dan Albert
28ffde5ebd Merge "Revert "Copy epoll(2) changes to minadb."" 2014-09-26 16:04:16 +00:00
Dan Albert
f420f8eb63 Revert "Copy epoll(2) changes to minadb."
This reverts commit db8c959049.
2014-09-25 15:12:19 -07:00
Jeff Sharkey
e95ed95f05 am a6e13ae0: Include reason when wiping data.
* commit 'a6e13ae01bff5109361868f565187f16d045c82d':
  Include reason when wiping data.
2014-09-24 23:35:38 +00:00
Jeff Sharkey
a6e13ae01b Include reason when wiping data.
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: I1c439fbd29f96b9851810baca9101f683a0f18d8
2014-09-24 11:46:17 -07:00
Elliott Hughes
78a3027860 am 530b61e0: Merge "Copy epoll(2) changes to minadb."
* commit '530b61e0b5f154e5f38853c10a28e0ea6f41c2ca':
  Copy epoll(2) changes to minadb.
2014-09-23 18:57:39 +00:00
Elliott Hughes
530b61e0b5 Merge "Copy epoll(2) changes to minadb." 2014-09-23 18:36:34 +00:00
Elliott Hughes
db8c959049 Copy epoll(2) changes to minadb.
Bug: 17588403
Change-Id: Ib3525824ff09330bd9d6f9e96d662e5a55a20ec2
2014-09-23 10:50:55 -07:00
Doug Zongker
574443d895 create block map for all update packages on /data
Always create the block map for packages on /data; don't only look at
the encryptable/encrypted flags.

Bug: 17395453
Change-Id: Iaa7643a32898328277841e324305b9419a9e071c
2014-09-05 08:22:12 -07:00
Doug Zongker
40482ea2ae Merge "fix comment in blockimg updater code" into lmp-dev 2014-09-04 15:26:29 +00:00
Doug Zongker
f7bb09dae8 fix comment in blockimg updater code
The comment for the DEBUG_ERASE setting is exactly backwards.

Change-Id: I98ab5828365894217fc78976817a131e7d22d5c1
2014-09-04 08:10:32 -07:00
Andrew Boie
8328922ff0 use lseek64 instead of lseek
Otherwise, overflow problems can occur with images larger than
2G since the offsets will overflow a 32-bit off_t.

Change-Id: I05951a38ebeae83ad2cb938594e8d8adb323e2aa
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-09-04 07:54:17 -07:00