Merge in lollipop and attempt to fix merge conflicts

This will probably not compile and may need additional work.
For tracking purposes so we know what might still need looking at
as none of this has been compiled and tested, here is a list of
the merge conflicts that I attempted to fix before pushing this
set of changes:

git pull aosp lollipop-release
remote: Finding sources: 100% (992/992)
remote: Total 992 (delta 473), reused 992 (delta 473)
Receiving objects: 100% (992/992), 1.51 MiB | 516.00 KiB/s, done.
Resolving deltas: 100% (473/473), completed with 42 local objects.
 * branch            lollipop-release -> FETCH_HEAD
 * [new branch]      lollipop-release -> aosp/lollipop-release
Auto-merging verifier_test.cpp
CONFLICT (content): Merge conflict in verifier_test.cpp
Auto-merging verifier.h
CONFLICT (content): Merge conflict in verifier.h
Auto-merging verifier.cpp
CONFLICT (content): Merge conflict in verifier.cpp
Auto-merging updater/updater.c
Auto-merging updater/install.c
CONFLICT (content): Merge conflict in updater/install.c
Auto-merging updater/
CONFLICT (content): Merge conflict in updater/
Auto-merging uncrypt/
CONFLICT (content): Merge conflict in uncrypt/
Auto-merging ui.cpp
CONFLICT (content): Merge conflict in ui.cpp
Auto-merging screen_ui.cpp
Auto-merging roots.cpp
CONFLICT (content): Merge conflict in roots.cpp
CONFLICT (rename/delete): res-hdpi/images/progress_fill.png deleted
in HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42.
Version cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of
res-hdpi/images/progress_fill.png left in tree.
CONFLICT (rename/delete): res-hdpi/images/progress_empty.png deleted
in HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42.
Version cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of
res-hdpi/images/progress_empty.png left in tree.
CONFLICT (rename/delete): res-hdpi/images/icon_error.png deleted
in HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42.
Version cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of
res-hdpi/images/icon_error.png left in tree.
Auto-merging recovery.cpp
CONFLICT (content): Merge conflict in recovery.cpp
Auto-merging minui/resources.c
CONFLICT (content): Merge conflict in minui/resources.c
Auto-merging minui/minui.h
CONFLICT (content): Merge conflict in minui/minui.h
Auto-merging minui/graphics.c
CONFLICT (content): Merge conflict in minui/graphics.c
Auto-merging minui/
CONFLICT (content): Merge conflict in minui/
Removing minelf/Retouch.h
Removing minelf/Retouch.c
Auto-merging minadbd/usb_linux_client.c
CONFLICT (content): Merge conflict in minadbd/usb_linux_client.c
Auto-merging minadbd/adb.h
CONFLICT (content): Merge conflict in minadbd/adb.h
Auto-merging minadbd/adb.c
CONFLICT (content): Merge conflict in minadbd/adb.c
Auto-merging minadbd/
CONFLICT (content): Merge conflict in minadbd/
Auto-merging install.h
CONFLICT (content): Merge conflict in install.h
Auto-merging etc/init.rc
CONFLICT (content): Merge conflict in etc/init.rc
Auto-merging bootloader.h
Auto-merging applypatch/applypatch.c
Auto-merging applypatch/
CONFLICT (content): Merge conflict in applypatch/
Auto-merging adb_install.cpp
CONFLICT (content): Merge conflict in adb_install.cpp
CONFLICT (content): Merge conflict in
Automatic merge failed; fix conflicts and then commit the result.

Change-Id: I3e0e03e48ad8550912111c7a5c9a140ed0267e2c
tree: cfb0b940141a4273ac6ddb58070e36ea706b7358
  1. applypatch/
  2. bmlutils/
  3. crypto/
  4. digest/
  5. dosfstools/
  6. edify/
  7. etc/
  8. exfat/
  9. fb2png/
  10. flashutils/
  11. fonts/
  12. fuse/
  13. gui/
  14. htcdumlock/
  15. injecttwrp/
  16. libblkid/
  17. libcrecovery/
  18. libmincrypt/
  19. libtar/
  20. minadbd/
  21. minui/
  22. minuitwrp/
  23. minzip/
  24. minzipold/
  25. mmcutils/
  26. mtdutils/
  27. mtp/
  28. openaes/
  29. orscmd/
  30. pigz/
  31. prebuilt/
  32. res/
  33. res-hdpi/
  34. res-mdpi/
  35. res-xhdpi/
  36. res-xxhdpi/
  37. res-xxxhdpi/
  38. testdata/
  39. tests/
  40. toolbox/
  41. tools/
  42. twrpTarMain/
  43. uncrypt/
  44. updater/
  45. .gitignore
  46. adb_install.cpp
  47. adb_install.h
  49. asn1_decoder.cpp
  50. asn1_decoder.h
  51. bootloader.cpp
  52. bootloader.h
  54. common.h
  55. data.cpp
  56. data.h
  57. data.hpp
  58. default_device.cpp
  59. device.h
  60. find_file.cpp
  61. find_file.hpp
  62. fixPermissions.cpp
  63. fixPermissions.hpp
  64. fuse_sdcard_provider.c
  65. fuse_sdcard_provider.h
  66. fuse_sideload.c
  67. fuse_sideload.h
  68. infomanager.cpp
  69. infomanager.hpp
  70. install.cpp
  71. install.h
  73. legacy_properties.h
  74. legacy_property_service.c
  75. legacy_property_service.h
  76. mounts.c
  77. mounts.h
  78. NOTICE
  79. openrecoveryscript.cpp
  80. openrecoveryscript.hpp
  81. partition.cpp
  82. partitionmanager.cpp
  83. partitions.hpp
  85. recovery.cpp
  86. recovery_ui.h
  87. roots.cpp
  88. roots.h
  89. screen_ui.cpp
  90. screen_ui.h
  91. tarWrite.c
  92. tarWrite.h
  93. twcommon.h
  94. twinstall.cpp
  95. twinstall.h
  96. twrp-functions.cpp
  97. twrp-functions.hpp
  98. twrp.cpp
  99. twrpDigest.cpp
  100. twrpDigest.hpp
  101. twrpDU.cpp
  102. twrpDU.hpp
  103. twrpTar.cpp
  104. twrpTar.h
  105. twrpTar.hpp
  106. ui.cpp
  107. ui.h
  108. variables.h
  109. verifier.cpp
  110. verifier.h
  111. verifier_test.cpp

Team Win Recovery Project (TWRP)

The goal of this branch is to rebase TWRP onto AOSP while maintaining as much of the original AOSP code as possible. This goal should allow us to apply updates to the AOSP code going forward with little to no extra work. With this goal in mind, we will carefully consider any changes needed to the AOSP code before allowing them. In most cases, instead of changing the AOSP code, we'll create our own functions instead. The only changes that should be made to AOSP code should be those affecting startup of the recovery and some of the make files.

If there are changes that need to be merged from AOSP, we will pull the change directly from AOSP instead of creating a new patch in order to prevent merge conflicts with AOSP.

This branch is under final testing and will be used shortly for public builds, but has not officially been released.

You can find a compiling guide here.

More information about the project.

If you have code changes to submit those should be pushed to our gerrit instance. A guide can be found here.