PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,664 Commits 1 Branch 0 Tags
dffdd5eb6d366b2f35ec87f20f91207e3b4657c3
Commit Graph
1664 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao BaoandAndroid Git Automerger dffdd5eb6d am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs." 
* commit '06e6ccb98ab7b557e98a41af562ca515714e776a':
 2015-08-27 03:38:47 +00:00
Tao BaoandAndroid Git Automerger 85afda1752 am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string." 
* commit 'b65a90235e7d4fc3a2dbf68bb73ac323a88f1abc':
 2015-08-27 03:38:47 +00:00
Dan AlbertandAndroid Git Automerger 85a77d2abe am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." 
* commit 'c2e91625a7333ae993bab4c7069f25c2e9ecc8d3':
 2015-08-27 03:38:46 +00:00
Elliott HughesandAndroid Git Automerger 34fa6d3891 am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build." 
* commit '8fa0007a3eb59174f7c2fbf40a2a972dfb344531':
 2015-08-27 03:38:45 +00:00
Tao BaoandAndroid Git Automerger 371ab9058e am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp 
* commit '7daa48e62fa0ba002cffeddf8d520426a52d69a7':
 2015-08-27 03:38:43 +00:00
Tao BaoandAndroid Git Automerger ea5d8f0aff am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." 
* commit '0e2efab34546e1678855c979f06f0f56f4f38eb0':
 2015-08-27 03:38:36 +00:00
Tao BaoandAndroid Git Automerger 3fd097f8a8 am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." 
* commit '854ae7f9ba8981e0122549dceae9b371ad4f7be1':
 2015-08-27 03:38:35 +00:00
Tao BaoandAndroid Git Automerger 77de478325 am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." 
* commit 'f3f27990f23a338c02a52bea713bf391e7994028':
 2015-08-27 03:38:33 +00:00
Tao BaoandAndroid Git Automerger 05c4b53eb5 am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." 
* commit 'cb0e7f2da04b7dcaef50ec7a942cd5b5e64b4823':
 2015-08-27 03:38:33 +00:00
Tao BaoandAndroid Git Automerger f6bebbd72c am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." 
* commit '33185233541dda72af3fd8a1fc1786251c88e122':
 2015-08-27 03:38:30 +00:00
Tao BaoandAndroid Git Automerger d37f91d18d am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." 
* commit 'f0654b4414c750703f50d4e84319d31d57e86284':
 2015-08-27 03:38:29 +00:00
Tao BaoandAndroid Git Automerger c73e18f0a4 am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." 
* commit '7665d443e2e3de775661068c29df38581476cc71':
 2015-08-27 03:38:28 +00:00
Tao BaoandAndroid Git Automerger f075f9a17a am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." 
* commit '5040636abd451e4e45227493f328f1cda39a5177':
 2015-08-27 03:38:27 +00:00
Tao BaoandAndroid Git Automerger ca66fc1cb2 am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." 
* commit '596219d9c2ea760a473c9f90bfa0317c326913af':
 2015-08-27 03:38:26 +00:00
Tao BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 LawrenceandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 LawrenceandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 BaoandGerrit Code Review eef991389c Merge "updater: Remove the unused isunresumable in SaveStash()." 2015-08-26 21:03:01 +00:00
Tao BaoandAndroid Git Automerger 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 9739a2920c updater: Remove the unused isunresumable in SaveStash(). 
Change-Id: I6a8d9bea4c1cd8ea7b534682061b90e893b227a2
 2015-08-25 18:05:38 -07:00
Tao BaoandAndroid Git Automerger 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 BaoandGerrit Code Review 50c17f9da6 Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" 2015-08-26 00:57:42 +00:00
Tao BaoandAndroid Git Automerger 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 SahukarandTao Bao 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 BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger dbbdcf3fd8 am 93fa4b67: Merge "edify: Switch to C++." 
* commit '93fa4b677cac9288e936915f15ca8e5f76a4e4b6':
  edify: Switch to C++.
 2015-08-21 17:39:39 +00:00
Tao BaoandGerrit Code Review 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 BaoandAndroid Git Automerger e57ca0ec07 am 4854e292: am ad509fd4: Merge "Fix potential crash" 
* commit '4854e292e0cd0eb58bce4488dc849273904d9302':
  Fix potential crash
 2015-08-11 16:23:58 +00:00
Tao BaoandAndroid Git Automerger 4854e292e0 am ad509fd4: Merge "Fix potential crash" 
* commit 'ad509fd4a2c597ced8e53b0817f754cb2209b98a':
  Fix potential crash
 2015-08-11 16:17:24 +00:00
Tao BaoandGerrit Code Review ad509fd4a2 Merge "Fix potential crash" 2015-08-11 16:11:44 +00:00
Tao BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 BaoandGerrit Code Review 0d46c7ab02 Merge "Use unique_ptr and unique_fd to manager FDs." 2015-08-10 17:28:52 +00:00
Tao BaoandGerrit Code Review 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
Dan AlbertandAndroid Git Automerger 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
Dan AlbertandAndroid Git Automerger f2a23a94cb am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." 
* commit '236b3eb6a085bd0762849b5feca880f6dc63787d':
  Use CPPFLAGS instead of CFLAGS.
 2015-08-08 00:56:12 +00:00
Dan AlbertandAndroid Git Automerger 236b3eb6a0 am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." 
* commit 'e67104a6a778f70bd479e737b09eb32c835e250e':
  Use CPPFLAGS instead of CFLAGS.
 2015-08-08 00:51:16 +00:00
Dan AlbertandGerrit Code Review e67104a6a7 Merge "Use CPPFLAGS instead of CFLAGS." 2015-08-08 00:45:43 +00:00