Commit Graph
7512 Commits
Author SHA1 Message Date
Elliott Hughes 26dbad2b98 Add missing includes.
Change-Id: I0737456e0221ebe9cc854d65c95a7d37d0869d56
2015-01-28 12:09:05 -08:00
Dan Albert 435f65eaa1 am 88c30fb6: am eaeb55f7: Merge "Start losing code to libadb."
* commit '88c30fb652ad40835f1d1045e2c851ff8813e873':
  Start losing code to libadb.
2015-01-27 18:32:56 +00:00
Ethan Yonker 1b67fff361 Use TWAtomicInt in MTPStorage
Change-Id: I3450fd2334a441c3d9d40a856128a3cc932cb7f3
2015-01-27 08:50:48 -06:00
Ethan Yonker 045369540d Use TWAtomicInt in gui.cpp to make it thread safe
Change-Id: If05202355d3773e73541288c922fa6c69b1a9ad7
2015-01-27 08:41:28 -06:00
bigbiff 7abc5fe195 Add cancel backup capability.
This will stop the iteration of the partition objects, kill the
current twrpTar thread and remove the backup directory.

Implement TWAtomicInt class to give us a wrapper that automatically
uses mutexes before the read and write to help ensure that the
reads and writes will be atomic based on documentation.

Change-Id: I645b22bc980a292e9c7202acb24ffd22ebe68c63
2015-01-27 15:07:19 +01:00
Dan Albert 88c30fb652 am eaeb55f7: Merge "Start losing code to libadb."
* commit 'eaeb55f745c86487b4ad57da008d501fa1ebc37d':
  Start losing code to libadb.
2015-01-27 02:08:45 +00:00
Dan Albert eaeb55f745 Merge "Start losing code to libadb." 2015-01-27 00:51:09 +00:00
Christopher Ferris e497826dd8 am 2d67a483: am cdc38d04: Merge "Fix the v2 descriptor handling."
* commit '2d67a483ede93f1d3906e1d03f46af34887764ac':
  Fix the v2 descriptor handling.
2015-01-26 22:09:48 +00:00
Christopher Ferris 32d30e5924 am efa16af5: am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"
* commit 'efa16af53ebc3ef4974ff791d0f03ec66b20a5e8':
  adbd: Support for new f_fs descriptor format
2015-01-26 22:09:37 +00:00
Christopher Ferris 2d67a483ed am cdc38d04: Merge "Fix the v2 descriptor handling."
* commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf':
  Fix the v2 descriptor handling.
2015-01-26 21:45:16 +00:00
Christopher Ferris cdc38d0401 Merge "Fix the v2 descriptor handling." 2015-01-26 21:28:21 +00:00
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
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 528b3ee699 am 4db9c893: am d4069928: Merge "Add missing <string.h> include."
* commit '4db9c8935df6347e54aa9581f019a802d2ec7dad':
  Add missing <string.h> include.
2015-01-25 21:00:54 +00: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 267ec09d5d am e84e9310: am eade3a80: Merge "Remove superfluous OpenSSL include paths."
* commit 'e84e931040a4f77aea14aca4c756940f3891d977':
  Remove superfluous OpenSSL include paths.
2015-01-23 03:59:27 +00: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
Dees Troy 3454ade92d Use /twres instead of /res for theme resources
AOSP and other ROM trees now do a rm -rf of the res folder during
the ramdisk creation process that removes the TWRP resources.
Using /twres instead of /res works around this issue making TWRP
more compatible with AOSP and other build trees.

Change-Id: I0d4c7e06ca381ac5aa0069b6f2b8c47f7dec49e7
2015-01-22 15:21:27 -06:00
Ethan Yonker d9ff3c5dd0 Hide some non critical error messages
Change-Id: I6e43242e44ce63cea9472c75a9f7fedf1b34fbbe
2015-01-22 17:57:29 +01:00
Dees Troy 0f3aa1e157 Merge "Include libpcre if present" into android-5.0 2015-01-22 17:56:42 +01:00
Dees Troy e176a65e3d Include libpcre if present
Change-Id: I51bdabbd5b2c2263f3f72cdd2ffcba2bc97e0c43
2015-01-22 10:56:07 -06:00
Dees Troy 4f4a7a524a Remove fibmap.f2fs from relinking
Change-Id: Ibf43367446782642f41d437d1d97d62fc7dbb185
2015-01-22 17:54:21 +01:00
Ethan Yonker fd0439ed59 Move ORS command line into main thread
Also eliminate the mostly similar runPage function in favor of
using a single runPages function to avoid code duplication.

Change-Id: I46ef414beb4009fee16d4de13d8a5ab2b9678409
2015-01-22 17:51:57 +01:00
The Android Automerger 84e0323541 merge in lmp-mr1-release history after reset to lmp-mr1-dev 2015-01-19 06:08:52 -08:00
that f74ac8740c gui: clean up error handling in resource manager
Change-Id: Ib94e661ab0c608deb2d119168709c85a9a44b2fa
2015-01-18 12:00:02 +01:00
Jesse Zhao ec4e95407e am 465e8702: am 5bf74b23: Bump up max_map_count value.
* commit '465e8702912d06b7207878eb38b0df6f56f8bbb6':
  Bump up max_map_count value.
2015-01-15 22:17:37 +00: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
Ethan Yonker 4a64f63615 2.8.4.0
Change-Id: Iee99e021e8ec721ab1c12fcbcf5e7059b871ea0a
2015-01-12 22:09:59 -06:00
Ethan Yonker cf50da5742 Fix handling of custom themes after decrypt
Loading a custom theme from the decrypt action was preventing the
runPage function from exiting. This moves the loading of a custom
theme out of the action.

Change-Id: I86904b63a67a25ded56e3e1e569fe906264dc055
2015-01-12 22:08:35 -06:00
Vojtech Bocek e979abd6cc Fix some crashes during theme (re)loading
Change-Id: I01405fbe86a48ae79f2cbe633b89f2dcfb1ef266
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
2015-01-12 20:23:37 +01:00
Vojtech Bocek 85cfb7d7b7 Fix some actions being incorrectly threaded
Change-Id: Ic8406344994ef2a9972207f9281b52e64e22826b
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
2015-01-12 20:11:09 +01:00
that fb759d45f5 gui: simplify blanktimer
- get rid of separate thread, check timer in rendering thread instead
- use an enum for the blanking state instead of magic integers
- move #ifdefs for TW_NO_SCREEN_TIMEOUT inside blanktimer class
- move some #includes and enum TOUCH_STATE to pages.hpp

Change-Id: Id4b104e3680dc5db41d8ba85e32d722cf4086299
2015-01-11 12:16:53 +01:00
Ethan Yonker f66324ffbb Fix restore of images for mtd and bml nand
Change-Id: I843ddf7a5bca3ca7670dd6f19644b37cf017e5b1
2015-01-09 16:46:57 -06:00
Ethan Yonker 751a85e759 Allow for X and Y offsets in GUI
These can be used to center a lower resolution theme onto a
higher resolution screen. May be useful for Nexus 9 unless or
until we decide to do a 1536x2048 theme or on devices like the
Moto 360 and LG G Watch R.

The build flags will only affect the stock theme. If a custom
theme wishes to apply an offset, it can be done by setting
tw_x_offset and / or tw_y_offset in the variables section of the
XML.

Change-Id: I2390769ed861b96a4a3bb8a0f06d9021ec91b6b9
2015-01-09 23:37:04 +01:00
Vojtech Bocek fda239b10a Add locking to DataManager, remove unused C parts
Change-Id: I33e8f96611bd9a6795bdd3fb588c20716bdb5929
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
2015-01-09 23:12:47 +01:00
Dees Troy f9d818d2eb Merge "Use power button to go back in watch themes" into android-5.0 2015-01-09 23:10:49 +01:00
Vojtech Bocek 8360a34384 Use power button to go back in watch themes
Change-Id: I1463a0ba62a23c68c15f05e79a99fa8509314373
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
2015-01-09 16:10:03 -06:00
Ethan Yonker 0d47eb5686 Improve GUI handling of zip flashing
- change the page sooner so that users cannot activate the slider
  twice
- improve GUI messaging if a zip requests a cache wipe
- move update of the file count to the end so it is less visible
  to the user (e.g. during a cache wipe the counter should not
  read 0)

Change-Id: I5d478f07effe61ca37f3521a77c9e9243a9cb692
2015-01-09 23:07:25 +01:00
Ethan Yonker 96af84a409 Allow flashing of images via the GUI
- Use the Images... button in the lower right of the zip install
  page
- Unify image flashing functions between restore and image flash
- boot and recovery partitions are flashable by default
- use fstab flag flashimg=1 or 0 to override defaults
- file system partitions are currently not flashable

Change-Id: I822dc446030543c55d2153e219d67a1292374ffc
2015-01-09 23:07:07 +01:00
that 7d3b54f3c2 gui: fix action threading if background thread is busy
When the background thread is already running and we have at least one
threaded action in the list, we should not run any non-threaded actions
before ignoring the threaded action and following ones - it might cause
invalid state variables to be set. Run or ignore the whole list in the
background thread instead.

Change-Id: Ie634105b80f038893898a21539886bd757eb47ce
2015-01-09 22:52:51 +01:00
that c608548633 Run some actions in a separate thread
Some actions need to be threaded so we will run those in a
separate thread and deny requests to thread more actions if new
requests come in while a thread is already running.

Change-Id: I966c538e67860a6d8fe556e5a2eb7f7d1a987e74
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
2015-01-09 22:12:43 +01: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 5b84cf4056 am 479e5108: am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."
* commit '479e510811b8a81c47449faa8db6ed5d1d7a31b4':
  Use getmntent when accessing /proc/mounts.
2015-01-06 19:55:27 +00:00
Vojtech Bocek 41ae12482b Include libnetd_client in recovery
* Bionic tries to load it, and if it isn't in /sbin and /system
  is mounted, it loads it from there and prevents it from unmouting

Change-Id: I33d0b6ba4503f2822d96033fa26d53e10b8ce1c5
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
2015-01-06 11:36:58 -06:00