PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,727 Commits 1 Branch 0 Tags
081408da869d24b346ef8f10f587ba7e8f035cf3
Commit Graph
1727 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao BaoandAndroid Git Automerger 081408da86 am b3f4921c: am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions" 
* commit 'b3f4921c67bdc3260bfd6274c2ab53d10b53a9c2':
 2015-08-27 14:13:42 +00:00
Paul LawrenceandAndroid Git Automerger e7767f0e00 am 04d9b850: am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev 
* commit '04d9b8501a58de6ee7c5aa3635673150bf88cb06':
 2015-08-27 14:13:40 +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 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 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 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 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 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 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 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 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 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 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 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 BaoandAndroid Git Automerger 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 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 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 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 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 HughesandAndroid Git Automerger 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 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
Dan Albert b02e90f85c Use CPPFLAGS instead of CFLAGS. 
While we build these as C, to the build system they are technically
C++ and are subject to the global CPPFLAGS. Set LOCAL_CPPFLAGS here
instead of LOCAL_CFLAGS so we can be sure we override anything
provided by the build system.

Bug: http://b/23043421
Change-Id: I344b54ae4ff9f142365a42c33ba160c1be17a342
 2015-08-07 17:24:49 -07:00
Elliott HughesandAndroid Git Automerger 2496489cb4 am a9390df6: am 06689dc5: Merge "Fix recovery image build." 
* commit 'a9390df6c6b8d6cc98b102aeffc8e7acd300c857':
  Fix recovery image build.
 2015-08-07 21:13:05 +00:00
Elliott HughesandAndroid Git Automerger a9390df6c6 am 06689dc5: Merge "Fix recovery image build." 
* commit '06689dc53d14ab0449c64c097d2937179f986873':
  Fix recovery image build.
 2015-08-07 20:29:52 +00:00
Elliott HughesandGerrit Code Review 06689dc53d Merge "Fix recovery image build." 2015-08-07 20:24:21 +00:00
Elliott Hughes faa75006af Fix recovery image build. 
A recent adb cleanup changed the signature of adb_main.

Change-Id: I98d084f999966f1a7aa94c63e9ed996b3375096d
 2015-08-07 13:21:06 -07:00
Tao Bao e6aa3326c1 updater: Clean up char* with std::string. 
So we can remove a few free()s. And also replace a few pointers with
references.

Change-Id: I4b6332216704f4f9ea4a044b8d4bb7aa42a7ef26
 2015-08-06 13:05:00 -07:00
Jeremy CompostellaandGaelle Nassiet 1b7d9b7368 Fix potential crash 
Malloc might fail when replacing package path. In this case, print a
clear error message in the logs and let the OTA fails.

Change-Id: I7209d95edc025e3ee1b4478f5e04f6e852d97205
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
 2015-08-05 10:15:32 +02:00
Tao BaoandAndroid Git Automerger 40dfee777c am 68e77434: resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp 
* commit '68e77434d8967baf7f1a5b79a61febcc60e6cb0a':
  udpater: Call fsync() after rename().
 2015-08-04 21:39:54 +00:00
Tao Bao 68e77434d8 resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp 
Change-Id: Iba4d2e5c5c7d0e0c1088403ff32d8f0d12da925d
 2015-08-04 14:32:37 -07:00
Tao BaoandAndroid Git Automerger 5aa3ce3aaa am be19dce8: udpater: Call fsync() after rename(). 
* commit 'be19dce86ce7d4a83f1cfcd11db393f8be8f4397':
  udpater: Call fsync() after rename().
 2015-08-04 21:01:11 +00:00