PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,620 Commits 1 Branch 0 Tags
1a3ccc881f451ff733a587b9fac8d73a83c12dfd
Commit Graph

1620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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 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 e57ca0ec07 am 4854e292: am ad509fd4: Merge "Fix potential crash" 
* commit '4854e292e0cd0eb58bce4488dc849273904d9302':
  Fix potential crash
 2015-08-11 16:23:58 +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 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 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 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
Dan Albert 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 Albert 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 Albert 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 Hughes 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 Hughes a9390df6c6 am 06689dc5: Merge "Fix recovery image build." 
* commit '06689dc53d14ab0449c64c097d2937179f986873':
  Fix recovery image build.
 2015-08-07 20:29:52 +00:00
Elliott Hughes 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 Compostella 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 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 Bao 5aa3ce3aaa am be19dce8: udpater: Call fsync() after rename(). 
* commit 'be19dce86ce7d4a83f1cfcd11db393f8be8f4397':
  udpater: Call fsync() after rename().
 2015-08-04 21:01:11 +00:00
Tao Bao ddbfdf7951 am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()." 
* commit '393d1e739fc10e526bd3b7b83836a266bfa24079':
  udpater: Call fsync() after rename().
 2015-08-04 18:42:12 +00:00
Tao Bao 393d1e739f am 27c1ab20: Merge "udpater: Call fsync() after rename()." 
* commit '27c1ab2095f25253d0920eb6afe7cd2791a708dc':
  udpater: Call fsync() after rename().
 2015-08-04 18:33:00 +00:00
Tao Bao be19dce86c udpater: Call fsync() after rename(). 
We need to ensure the renamed filename reaches the underlying storage.

Bug: 22840552
Change-Id: I824b6e9d8a9c5966035be7b42a73678d07376342
(cherry picked from commit dc3922622a)
 2015-08-04 11:28:12 -07:00
Tao Bao 27c1ab2095 Merge "udpater: Call fsync() after rename()." 2015-08-04 18:24:53 +00:00
Tao Bao dc3922622a udpater: Call fsync() after rename(). 
We need to ensure the renamed filename reaches the underlying storage.

Bug: 22840552
Change-Id: Ide2e753a2038691d472b6ee173cbf68ac998a084
 2015-08-03 21:35:05 -07:00
Tao Bao 414c576cf8 am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." 
* commit '2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd':
  recovery: Allow "Mount /system" for system_root_image.
 2015-08-01 15:47:48 +00:00
Tao Bao 2e979ef6fd am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." 
* commit '302779e71cb1be68f60cb044c85436d4d6bcfecc':
  recovery: Allow "Mount /system" for system_root_image.
 2015-07-31 16:49:33 +00:00
Tao Bao 302779e71c Merge "recovery: Allow "Mount /system" for system_root_image." 2015-07-31 16:43:39 +00:00
Tao Bao abb8f7785e recovery: Allow "Mount /system" for system_root_image. 
When system images contain the root directory, there is no entry of
"/system" in the fstab. Change it to look for "/" instead if
ro.build.system_root_image is true. We actually mount the partition
to /system_root instead, and create a symlink to /system_root/system
for /system. This allows "adb shell" to work properly.

Bug: 22855115
Change-Id: Ibac493a5a9320c98ee3b60bd2cc635b925f5454a
 2015-07-30 17:22:29 -07:00
Tao Bao 7d71725d76 am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop." 
* commit '7666f65b2a1e4352c52df9fe7a0b26ce923a1477':
  updater: Hoist fsync() to outer loop.
 2015-07-28 00:34:59 +00:00
Tao Bao 7666f65b2a am 62e19231: Merge "updater: Hoist fsync() to outer loop." 
* commit '62e1923194de067c0ac589abcfc4f04fdddf2b1a':
  updater: Hoist fsync() to outer loop.
 2015-07-28 00:21:36 +00:00
Tao Bao 62e1923194 Merge "updater: Hoist fsync() to outer loop." 2015-07-28 00:12:31 +00:00
Tao Bao 187efff6f3 updater: Hoist fsync() to outer loop. 
Currently the fsync() inside write_all() may be called multiple times
when performing a command. Move that to the outer loop and call it
only after completing the command.

Also remove the O_SYNC flag when writing a stash.

Change-Id: I71e51d76051a2f7f504eef1aa585d2cb7a000d80
 2015-07-27 14:17:09 -07:00
Tao Bao 4b3ad009f7 am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." 
* commit '0622ccb34d504170b76b8f4dd5f0639794be679a':
  applypatch: Fix the checking in WriteToPartition().
 2015-07-25 01:03:22 +00:00
Tao Bao 0622ccb34d am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." 
* commit '6a4a33e39ea2fa8626335f6b9cccf407c71c0588':
  applypatch: Fix the checking in WriteToPartition().
 2015-07-24 23:08:59 +00:00
Tao Bao 6a4a33e39e Merge "applypatch: Fix the checking in WriteToPartition()." 2015-07-24 22:56:36 +00:00
Tao Bao 1ce7a2a63d applypatch: Fix the checking in WriteToPartition(). 
WriteToPartition() should consider a target name as valid if it contains
multiple colons. But only the first two fields will be used.

Bug: 22725128
Change-Id: Ie9404375e24045c115595eec6ce5b6423da8fc3e
 2015-07-24 15:33:35 -07:00
Tao Bao 6a06034d03 am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." 
* commit '3b753ad5da2ade45548f95b4a76219db3043db49':
  applypatch: Support flash mode.
 2015-07-24 21:10:46 +00:00