Commit Graph

9577 Commits

Author SHA1 Message Date
Dan Albert 34a265cbac Stop using libstdc++.
am: 56deefba73  -s ours

* commit '56deefba73fb318ba0498da49adc64de960a6e29':
  Stop using libstdc++.
2015-11-19 22:42:24 +00:00
Tao Bao f4b871890b recovery: Switch to clang am: 7101b2e285 -s ours
am: 29cc06e50c

* commit '29cc06e50c3702e1835c1af911f5d2c69699e1c7':
  recovery: Switch to clang
2015-11-19 22:06:50 +00:00
Tao Bao 29cc06e50c recovery: Switch to clang
am: 7101b2e285  -s ours

* commit '7101b2e2854985727b7ef65e5b5057e0ecf2d034':
  recovery: Switch to clang
2015-11-19 21:59:07 +00:00
David Zeuthen 846c094fee Add slot_suffix field to struct bootloader_message.
This is needed by fs_mgr for certain A/B implementations.

Change-Id: I7bb404d61198eb7a962c2b693911f5156745daae
2015-11-16 14:28:40 -08:00
Tao Bao 8f90389966 recovery: Allow "Mount /system" for system_root_image.
When system images contain the root directory, there is no entry of
"/system" in the fstab. Change it to look for "/" instead if
ro.build.system_root_image is true. We actually mount the partition
to /system_root instead, and create a symlink to /system_root/system
for /system. This allows "adb shell" to work properly.

Bug: 22855115
Change-Id: I91864444950dc3229fda3cc133ddbadeb8817fb8
(cherry picked from commit abb8f7785e)
2015-11-16 14:28:40 -08:00
Tao Bao 32ac97675b applypatch: Fix the checking in WriteToPartition().
WriteToPartition() should consider a target name as valid if it contains
multiple colons. But only the first two fields will be used.

Bug: 22725128
Change-Id: I9d0236eaf97df9db9704acf53690d0ef85188e45
(cherry picked from commit 1ce7a2a63d)
2015-11-16 14:28:40 -08:00
Tao Bao f47259b184 applypatch: Support flash mode.
We may carry a full copy of recovery image in the /system, and use
/system/bin/install-recovery.sh to install the recovery. This CL adds
support to flash the recovery partition with the given image.

Bug: 22641135
Change-Id: I345eaaee269f6443527f45a9be7e4ee47f6b2b39
(cherry picked from commit 68c5a67967)
2015-11-16 14:28:40 -08:00
Tao Bao 3b199267d6 updater: libapplypatch needs libbase now.
Change-Id: Ibe3173edd6274b61bd9ca5ec394d7f6b4a403639
(cherry picked from commit 1b1ea17d55)
2015-11-16 14:28:40 -08:00
Tao Bao 27604fcbee applypatch: Refactor strtok().
We have android::base::Split() for the work.

Change-Id: Ic529db42090f700e6455d465c8b84b7f52d34d63
(cherry picked from commit 0a47ce27de)
2015-11-16 14:28:40 -08:00
Tao Bao 818fa781d1 DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.
Mostly trivial changes to make cpp compiler happy.

Change-Id: I69bd1d96fcccf506007f6144faf37e11cfba1270
(cherry picked from commit ba9a42aa7e)
2015-11-16 14:28:40 -08:00
Sami Tolvanen 806f72f9e6 Add error and range checks to parse_range
Only trusted input is passed to parse_range, but check for invalid
input to catch possible problems in transfer lists.

Bug: 21033983
Bug: 21034030
Bug: 21034172
Bug: 21034406
Change-Id: I1e266de3de15c99ee596ebdb034419fdfe7eba1f
(cherry picked from commit f2bac04e1b)
2015-11-16 14:28:40 -08:00
Dan Albert 56deefba73 Stop using libstdc++.
These are already getting libc++, so it isn't necessary. If any of the
other static libraries (such as adb) use new or delete from libc++,
there will be symbol collisions.

Change-Id: I55e43ec60006d3c2403122fa1174bde06f18e09f
(cherry picked from commit e49a9e527a)
2015-11-16 14:28:40 -08:00
Tao Bao 7101b2e285 recovery: Switch to clang
And a few trival fixes to suppress warnings.

Change-Id: Id28e3581aaca4bda59826afa80c0c1cdfb0442fc
(cherry picked from commit 80e46e08de)
2015-11-16 14:28:40 -08:00
Paul Lawrence fd1bfa2a41 Merge "Create convert_fbe breadcrumb file to support conversion to FBE" 2015-11-13 17:25:09 +00:00
Elliott Hughes 11c26abe2d Merge "We can use fclose directly in std::unique_ptr."
am: 5c6912148b

* commit '5c6912148b2143cbdf4cc580c723fac05e9324f8':
  We can use fclose directly in std::unique_ptr.
2015-11-13 16:37:44 +00:00
Elliott Hughes 5c6912148b Merge "We can use fclose directly in std::unique_ptr." 2015-11-13 16:27:55 +00:00
Paul Lawrence d0db337d72 Create convert_fbe breadcrumb file to support conversion to FBE
Change-Id: I38b29e1e34ea793e4b87cd27a1d39fa905fddf7a
2015-11-13 07:49:31 -08:00
Elliott Hughes 63b089e3aa We can use fclose directly in std::unique_ptr.
It turns out the standard explicitly states that if the pointer is
null, the deleter function won't be called. So it doesn't matter that
fclose(3) doesn't accept null.

Change-Id: I10e6e0d62209ec03ac60e673edd46f32ba279a04
2015-11-12 21:07:55 -08:00
Matt Mower 13a8f0b294 Free some memory allocations
Change-Id: Ifb6c186e43e1eb068e8075def16924ced04bb23d
2015-11-11 19:42:27 -06:00
Ethan Yonker e0f1f3b4d1 Move reloading of theme outside of the action thread
Reloading the GUI while the GUI is running and rendering is very
dangerous as we may be deleting GUI resources before or while we
are trying to render those same items. This change will allow us
to safely load new resources and delete the old ones.

Fixed a double free situation that was causing a crash on every
other theme reload.

Clear parsed xml documents when we are done loading the theme
instead of keeping them in memory for the life of the theme to
help save a little memory.

Store starting page so that if we request a reload, we can enter
the theme at the same starting point, which may come in handy if
we allow for language selection on alternate starting pages such
as the decrypt prompt or the system read only prompt.

Change-Id: I45a7e3fb3daeefac56d70f8d4936938eb1244b99
2015-11-09 14:57:23 -06:00
Ethan Yonker 5046857ceb Fix rules for libstlport
Change-Id: I571e906173c9e70de97e3cfefd10da5137dba4d4
2015-11-09 11:56:17 -06:00
Ethan Yonker 2c80efa0c8 Update rules for libpixelfinger_twrp
Change-Id: I40131f330e902afab033e810761bf98c07bbd03d
2015-11-07 07:57:36 -06:00
Ethan Yonker fd52b987e5 Fix bution action position when using textplacement TEXT_ONLY_RIGHT
This makes the touch target include both the text and the image
for buttons masquerading as a check box.

Change-Id: If8432c5863de136b1a215dabb3e06109ccce4410
2015-11-06 15:24:35 -06:00
Ethan Yonker a1de1496a9 Minor update to decrypt device routine for Nexus 6P decrypt
Move property setting of ro.crypto.state to after mounting any
needed partitions so that we can use this property as a trigger
for running services in init. Check to see if the property is
already set so that we do not set it and sleep multiple times if
the user enters an incorrect password.

Change-Id: I55558c5e227377381101b6305569d9eb31040790
2015-11-05 21:08:02 +02:00
Ethan Yonker 1673e3d4ea Treat /vendor like /system for read only
The vendor partition is verity checked just like system so we
should treat vendor as read only same as system.

Change-Id: Ida65c9f44d8610e52fcdcef0b4a50faf5c7110d2
2015-11-05 21:07:21 +02:00
Iftekhar Rifat 0543f06679 twrp: fb2png: do not pack relocations for executables
According to https://android.googlesource.com/platform/build/+/f55c5a52ac3d523cdcfb7cd7ab093d01da8b3caf%5E%21/#F0

Change-Id: I593ba16cabd59dc3bb690aa12f855113b3e9983f
2015-11-05 21:04:24 +02:00
Andrea Mennillo f591c87993 Fixup union sepolicy
This change solve two issue:
1) Policies related to recovery should be only included in recovery
policy
2) In CM trees the sepolicy dir was always bootable/recovery-
twrp/sepolicy, even if recovery path was bootable/recovery

Change-Id: I9466d22293074ba5f5240abe8b97a5d1bf30982d
2015-11-05 20:58:39 +02:00
that 54e9c839bc gui: fix default styles if object type is in element name
Change-Id: I4bc46d1772fee2ec77d95732fa3f69c267c2c34e
2015-11-05 20:52:46 +02:00
that 35f17402e4 gui: fix initial state of checkboxes in listbox
The GUI is initialized before DataManager loads the settings file,
so we need to update the checkboxes on page change too.

Change-Id: If4c694872608ec4014220364bd759c1399502994
2015-11-05 20:48:24 +02:00
Dees Troy 6299d2edc4 Merge "Revert :Force sync files written by minzip" into android-6.0 2015-11-05 19:45:31 +01:00
Tao Bao 8b5f9d74a0 Merge "uncrypt: remove O_SYNC to avoid time-out failures"
am: e4a3da9f51

* commit 'e4a3da9f51ca1e02179a1e0851f26015f4ec07fa':
  uncrypt: remove O_SYNC to avoid time-out failures
2015-11-05 18:07:57 +00:00
Tao Bao e4a3da9f51 Merge "uncrypt: remove O_SYNC to avoid time-out failures" 2015-11-05 18:02:05 +00:00
Jaegeuk Kim cc4e3c6002 uncrypt: remove O_SYNC to avoid time-out failures
This patch removes costly O_SYNC flag for encrypted block device.
After writing whole decrypted blocks, fsync should guarantee their consistency
from further power failures.
This patch reduces the elapsed time significantly consumed by upgrading packages
on an encrypted partition, so that it could avoid another time-out failures too.

Change-Id: I1fb9022c83ecc00bad09d107fc87a6a09babb0ec
Signed-off-by: Jaegeuk Kim <jaegeuk@motorola.com>
2015-11-04 11:43:58 -08:00
Tao Bao c40d9afaa4 Merge "recovery: Depend on mkfs.f2fs only if needed." am: a412198699
am: 4ea2b0c4ac

* commit '4ea2b0c4acddb4509c741ba0390be7b39e0b9de1':
  recovery: Depend on mkfs.f2fs only if needed.
2015-10-28 16:43:27 +00:00
Tao Bao 4ea2b0c4ac Merge "recovery: Depend on mkfs.f2fs only if needed."
am: a412198699

* commit 'a4121986990d7dde7918252a96d87e4c3c11c13c':
  recovery: Depend on mkfs.f2fs only if needed.
2015-10-28 16:36:23 +00:00
Tao Bao a412198699 Merge "recovery: Depend on mkfs.f2fs only if needed." 2015-10-28 16:32:50 +00:00
Tao Bao f68351209f recovery: Depend on mkfs.f2fs only if needed.
Don't build mkfs.f2fs unless device defines TARGET_USERIMAGES_USE_F2FS.

Change-Id: Ifac592c30315bbe7590c8fbf3a0844e6a7a31a1a
2015-10-27 22:00:35 -07:00
Ethan Yonker 25474e45b8 Fix screen timeout text placement
Change-Id: I7b020c7048f9bbb550e9f5100c604c01809e4fbd
2015-10-26 21:44:22 -05:00
Ethan Yonker 58b09f1a36 Fix SELinux issues for some devices
Reinstate some SELinux stuff in the default init.rc (noticed by
Kra1o5)

Add permissive.sh script to dependencies list for CM trees.

Change-Id: I36ade54378c413081d202002488309af35486d5f
2015-10-26 12:42:26 -05:00
Ethan Yonker 44925ad190 GUI TextBox
Allows the GUI to create a scrollable text box for long text that
may not all fit on the screen. Also includes code to allow the
console to wrap on spaces and other such characters instead of
wrapping in the middle of a word.

To see an example of how to add a text box to the XML, see:
https://gerrit.omnirom.org/#/c/14183/

Change-Id: Ifd139172ede290046b58ea3fe526e2e06da1d4ef
2015-10-26 11:54:16 -05:00
maxwen c3540a96ec Revert :Force sync files written by minzip
forward port from 5.x
https://gerrit.omnirom.org/#/c/12524/

Change-Id: I303662cf28278bd9dd3799b3d0b5a07f96169416
2015-10-25 22:22:10 +01:00
Ethan Yonker 7dad625926 Add nulls during reading of settings and info files
Change-Id: Ie6202a8cc709d8593768f447ef95b4a815605d6b
2015-10-25 00:38:44 +02:00
Ethan Yonker d0514ba806 Fix a bunch of warnings
Mostly adding __unused where needed.

Change-Id: Ia4f675b9b360782728c361ed1699db0cc277c3a5
2015-10-24 17:36:24 -05:00
Tao Bao 03540bc978 Merge "updater: Bump up the BBOTA version to 4." am: f204185f71
am: cc9dd3d524

* commit 'cc9dd3d524755da156ec95ed3a91bcf7966e7e7e':
  updater: Bump up the BBOTA version to 4.
2015-10-23 18:55:13 +00:00
Tao Bao cc9dd3d524 Merge "updater: Bump up the BBOTA version to 4."
am: f204185f71

* commit 'f204185f7138687769f95c28fe22fa88143bc004':
  updater: Bump up the BBOTA version to 4.
2015-10-23 18:45:30 +00:00
Tao Bao f204185f71 Merge "updater: Bump up the BBOTA version to 4." 2015-10-23 18:37:33 +00:00
Tao Bao 1fdec8685a updater: Bump up the BBOTA version to 4.
To accommodate new changes in N release, such as error correction [1]
and other potential changes to the updater.

[1]: commit 0a7b47397d

Change-Id: I4dd44417d07dd0a31729894628635a0aa1659008
2015-10-22 17:04:28 -07:00
that 8e213fdf08 fix build in Omni 4.4
Change-Id: Ida3984a6b774c2da12342d48d8644cd18de7396c
2015-10-22 08:10:38 -05:00
Sami Tolvanen a2fcae8130 am 339ec2ef: am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery"
* commit '339ec2ef02614f17823f9b00af8b35c1f8ee734c':
  Error correction: Use libfec in blockimg.cpp for recovery
2015-10-19 17:14:01 +00:00
Sami Tolvanen 339ec2ef02 am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery"
* commit '78615fa50bb10318035d31bccdf502913e1041b7':
  Error correction: Use libfec in blockimg.cpp for recovery
2015-10-19 10:06:42 -07:00