Commit Graph

9577 Commits

Author SHA1 Message Date
Tao Bao d33e21a7ae am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."
* commit '0e7368a505f647a07cf3b6b93622b48ef27c3f45':
2015-08-27 03:38:24 +00:00
Tao Bao 9da33c6765 am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."
* commit '3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f':
2015-08-27 03:38:23 +00:00
Tao Bao f0e341b449 am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""
* commit '5391dfdb35221f782a4d0da29e31f4725dc507d3':
2015-08-27 03:38:22 +00:00
Paul Lawrence 3ac4765a14 am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
* commit '1915dd56e3cdc73d4d83453971486b64880e4603':
2015-08-27 03:38:15 +00:00
Tao Bao b3f4921c67 am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"
* commit '2fc4d4359b268cbf3d0f73d670a219f12d440e86':
2015-08-27 03:38:08 +00:00
Paul Lawrence 04d9b8501a am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev
* commit '7624d0d830ad6b185f0ba50f5ffd8b0e20386228':
2015-08-27 03:38:06 +00:00
Tao Bao d3982955c6 am 165c6ad3: am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."
* commit '165c6ad300380fcd132a676f809560a606894e52':
  updater: Remove the unused isunresumable in SaveStash().
2015-08-26 21:28:35 +00:00
Tao Bao 73468ee8fb am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."
* commit '5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5':
  updater: Remove the unused isunresumable in SaveStash().
2015-08-26 21:17:50 +00:00
Tao Bao 165c6ad300 am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."
* commit '5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5':
  updater: Remove the unused isunresumable in SaveStash().
2015-08-26 21:17:00 +00:00
Tao Bao 5a16eba2c3 am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."
* commit 'eef991389c7f739dd80bbe6e4a3699322c12dcfb':
  updater: Remove the unused isunresumable in SaveStash().
2015-08-26 21:10:23 +00:00
Tao Bao eef991389c Merge "updater: Remove the unused isunresumable in SaveStash()." 2015-08-26 21:03:01 +00:00
Ethan Yonker d6821a11bb Add TW_IGNORE_ABS_MT_TRACKING_ID
Fixes touch on Oppo R7 Plus

Oppo R7 Plus, when recovery is flashed and booted from the actual
recovery partition, the digitizer sends some extra touch data for
up to 10 different touch slots even if no actual touch is present
for those slots (ABS_MT_SLOT). This patch allows TWRP to handle
touch data properly for this device and maybe others.

Change-Id: I8f9171b605566788b674b3d4d96bd9f2f65736c2
2015-08-26 22:36:34 +02:00
Ethan Yonker 89583ef00f Fix up some TW_OEM_BUILD things
Fix factory reset now properly formats data as expected
Change text for ORS processing
Disable system read only check, SuperSU, and patch system
Stop copying fstab and version to cache

Change-Id: I20f5cae390afbb8d2d88e01b8d9b9bf4ff0fdea1
2015-08-26 22:36:16 +02:00
Tao Bao a89858766c am 1a3ccc88: am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
* commit '1a3ccc881f451ff733a587b9fac8d73a83c12dfd':
  GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
2015-08-26 03:52:39 +00:00
Tao Bao 1a3ccc881f am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
* commit 'dc61d17d5b3c9e85a2863ec461170263325f1466':
  GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
2015-08-26 03:47:45 +00:00
Tao Bao 304c65b8fc am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
* commit 'dc61d17d5b3c9e85a2863ec461170263325f1466':
  GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
2015-08-26 01:14:31 +00:00
Tao Bao 9739a2920c updater: Remove the unused isunresumable in SaveStash().
Change-Id: I6a8d9bea4c1cd8ea7b534682061b90e893b227a2
2015-08-25 18:05:38 -07:00
Tao Bao dc61d17d5b am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
* commit '50c17f9da69ed3de0cd3ed032c50af067c1dc1f1':
  GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
2015-08-26 01:05:09 +00:00
Tao Bao 50c17f9da6 Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" 2015-08-26 00:57:42 +00:00
Tao Bao 8a4c081939 am ba781587: am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
* commit 'ba781587cb1926782d7561aa7dcb5db44d09a70b':
  recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
2015-08-25 01:29:04 +00:00
Tao Bao ba781587cb am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
* commit '337db14f274fc73dd540aa71d2c21c431fe686ec':
  recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
2015-08-25 01:23:18 +00:00
Tao Bao 337db14f27 recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
Every watch has a (mostly identical) copy of the wear_ui. Factor them
out into a single copy for easier maintenance. Device-specific settings
should be defined in recovery_ui.cpp that inherits WearRecoveryUI class.

Bug: 22451422
Change-Id: Id07efca37d1b1d330e6327506c7b73ccf6ae9241
2015-08-24 17:31:47 -07:00
Shrinivas Sahukar a6153df887 GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
There is an integer overflow when the size of system goes beyond the
signed int limits. Hence changing pos to size_t.

Change-Id: I6e5e1b2f0e72030b30a6df09a01642f4c82abc79
2015-08-21 15:59:28 -07:00
Tao Bao 459a51739d am f0355aeb: am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."
* commit 'f0355aebe8bc833a6d287e11bf8cc9a56c43d32d':
  edify: Switch to C++.
2015-08-21 18:31:29 +00:00
Tao Bao f0355aebe8 am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."
* commit 'dbbdcf3fd817128f89474f9ea8c84743fc648a1a':
  edify: Switch to C++.
2015-08-21 18:24:12 +00:00
Tao Bao 822685a864 am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."
* commit 'dbbdcf3fd817128f89474f9ea8c84743fc648a1a':
  edify: Switch to C++.
2015-08-21 18:20:17 +00:00
Tao Bao dbbdcf3fd8 am 93fa4b67: Merge "edify: Switch to C++."
* commit '93fa4b677cac9288e936915f15ca8e5f76a4e4b6':
  edify: Switch to C++.
2015-08-21 17:39:39 +00:00
Tao Bao 93fa4b677c Merge "edify: Switch to C++." 2015-08-21 17:36:11 +00:00
Tao Bao 2a5a49d337 edify: Switch to C++.
Change-Id: I71aede6e29af1dc4bb858a62016c8035db5d3452
2015-08-20 12:11:04 -07:00
Tao Bao 62551d4a74 am e57ca0ec: am 4854e292: am ad509fd4: Merge "Fix potential crash"
* commit 'e57ca0ec07f357a1ef38d9a7439ea080bada4e74':
  Fix potential crash
2015-08-11 16:30:38 +00:00
Tao Bao e57ca0ec07 am 4854e292: am ad509fd4: Merge "Fix potential crash"
* commit '4854e292e0cd0eb58bce4488dc849273904d9302':
  Fix potential crash
2015-08-11 16:23:58 +00:00
Tao Bao a9a50fef97 am 4854e292: am ad509fd4: Merge "Fix potential crash"
* commit '4854e292e0cd0eb58bce4488dc849273904d9302':
  Fix potential crash
2015-08-11 16:23:52 +00:00
Tao Bao 4854e292e0 am ad509fd4: Merge "Fix potential crash"
* commit 'ad509fd4a2c597ced8e53b0817f754cb2209b98a':
  Fix potential crash
2015-08-11 16:17:24 +00:00
Tao Bao ad509fd4a2 Merge "Fix potential crash" 2015-08-11 16:11:44 +00:00
Tao Bao e601f2a0e3 am 0d42440e: am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."
* commit '0d42440ecb1c664862eaa7848cc45fb7ff0fb514':
  Use unique_ptr and unique_fd to manager FDs.
2015-08-10 17:48:42 +00:00
Tao Bao 6e14f4f1d1 am 36ca3800: am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."
* commit '36ca3800bc5231972ecfde53d1241e715a98ad4e':
  updater: Clean up char* with std::string.
2015-08-10 17:44:33 +00:00
Tao Bao 0d42440ecb am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."
* commit '434a1761aac48b8e3c13d5a6cb3edd90c8667f6f':
  Use unique_ptr and unique_fd to manager FDs.
2015-08-10 17:42:31 +00:00
Tao Bao 06e6ccb98a am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."
* commit '434a1761aac48b8e3c13d5a6cb3edd90c8667f6f':
  Use unique_ptr and unique_fd to manager FDs.
2015-08-10 17:42:19 +00:00
Tao Bao 36ca3800bc am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."
* commit '7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace':
  updater: Clean up char* with std::string.
2015-08-10 17:37:58 +00:00
Tao Bao b65a90235e am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."
* commit '7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace':
  updater: Clean up char* with std::string.
2015-08-10 17:37:52 +00:00
Tao Bao 434a1761aa am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."
* commit '0d46c7ab02eb97d6b4b2e26b9202fd9b4e9dd8c8':
  Use unique_ptr and unique_fd to manager FDs.
2015-08-10 17:35:06 +00:00
Tao Bao 7f89389a0b am 7c511184: Merge "updater: Clean up char* with std::string."
* commit '7c511184bf3ed44f3590027730a64d565c0e12ee':
  updater: Clean up char* with std::string.
2015-08-10 17:29:54 +00:00
Tao Bao 0d46c7ab02 Merge "Use unique_ptr and unique_fd to manager FDs." 2015-08-10 17:28:52 +00:00
Tao Bao 7c511184bf Merge "updater: Clean up char* with std::string." 2015-08-10 17:23:13 +00:00
Tao Bao c754792a07 Use unique_ptr and unique_fd to manager FDs.
Clean up leaky file descriptors in uncrypt/uncrypt.cpp. Add unique_fd
for open() and unique_file for fopen() to close FDs on destruction.

Bug: 21496020
Change-Id: I0174db0de9d5f59cd43b44757b8ef0f5912c91a2
2015-08-09 22:35:49 -07:00
Ethan Yonker bc85b63e78 Wipe crypto key when formatting data
Change-Id: I032fabb383b4063e3b31b6044ce39966b8c617d0
2015-08-09 12:48:14 -05:00
Matt Mower 85161af111 ORS: Report success if AOSP script succeeds
When AOSP recovery commands are processed, the GUI reports a failure
just before reboot even when all commands succeeded. Set op_status
before reboot to indicate success.

Change-Id: I09e9357b04cd81f418264bf00a75311f48357414
2015-08-09 17:22:25 +02:00
Dan Albert 07c8bb24df am f2a23a94: am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."
* commit 'f2a23a94cb9649ad7888749a82976ce01988e0f9':
  Use CPPFLAGS instead of CFLAGS.
2015-08-08 02:50:57 +00:00
Elliott Hughes 6f6a976191 am 2496489c: am a9390df6: am 06689dc5: Merge "Fix recovery image build."
* commit '2496489cb4ec75f13b0d30f580332e74bf4a2fa8':
  Fix recovery image build.
2015-08-08 02:48:47 +00:00
Dan Albert c2e91625a7 am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."
* commit '236b3eb6a085bd0762849b5feca880f6dc63787d':
  Use CPPFLAGS instead of CFLAGS.
2015-08-08 00:56:58 +00:00