Commit Graph

7296 Commits

Author SHA1 Message Date
Tianjie Xu 5d1e7fbadd Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e am: e102ea13ee
am: 5f9617a51f

Change-Id: I674484fcdde5d9b7f847d6efef667638a8da6936
2017-03-26 00:02:08 +00:00
Tianjie Xu 5f9617a51f Merge "Don't fail ReadArgs if length to parse is 0" am: f4c949a41e
am: e102ea13ee

Change-Id: I56740f678375ad00f3ae90125c610c8f5003290e
2017-03-25 23:59:37 +00:00
Tianjie Xu e102ea13ee Merge "Don't fail ReadArgs if length to parse is 0"
am: f4c949a41e

Change-Id: Ic6daca7eb24b121058c7e9075d5719fcdada37ae
2017-03-25 23:57:08 +00:00
Tianjie Xu f4c949a41e Merge "Don't fail ReadArgs if length to parse is 0" 2017-03-25 23:53:31 +00:00
Tao Bao 45f967a1ad Merge "updater: Remove some redundant arguments." am: 5212a00588 am: 4ae56a3586
am: cf219a93c6

Change-Id: I7047eb4ce09d7aa69cd044ddce07cbb41e5ac246
2017-03-25 23:21:52 +00:00
Tao Bao cf219a93c6 Merge "updater: Remove some redundant arguments." am: 5212a00588
am: 4ae56a3586

Change-Id: I2fd18158ad74770e4a372b6288e65ceabfc18297
2017-03-25 23:19:05 +00:00
Tao Bao 4ae56a3586 Merge "updater: Remove some redundant arguments."
am: 5212a00588

Change-Id: I74ae1b87579bec0f1008b38e5ca913ef7c355238
2017-03-25 23:16:35 +00:00
Tao Bao 5212a00588 Merge "updater: Remove some redundant arguments." 2017-03-25 23:11:37 +00:00
Bowgo Tsai 524d0da309 Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e am: 85882b0779
am: ec96346b84

Change-Id: I7d1750e6031e42fb331974cc21b2a6f71e799584
2017-03-25 17:15:44 +00:00
Bowgo Tsai ec96346b84 Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e
am: 85882b0779

Change-Id: Ie7f75589e4ec7a3da4bc8cb31f0630837cbea4f4
2017-03-25 17:13:13 +00:00
Bowgo Tsai 85882b0779 Merge "libbootloader_message: use different fstab paths for normal/recovery boot"
am: 5f98326c1e

Change-Id: Ie5061ac357ee86a2192e8e1c1ab9e49a00fc1df0
2017-03-25 17:11:15 +00:00
Treehugger Robot 5f98326c1e Merge "libbootloader_message: use different fstab paths for normal/recovery boot" 2017-03-25 17:06:33 +00:00
Bowgo Tsai 37bd44174b libbootloader_message: use different fstab paths for normal/recovery boot
libbootloader_message is used by both normal boot and recovery boot.
It needs to use different fstab paths, respectively. Otherwise, factory
reset will fail when we move /fstab.{ro.hardware} to /vendor/etc/.

  Recovery boot: fs_mgr_read_fstab_with_dt("/etc/recovery.fstab")
  Normal boot: fs_mgr_read_fstab_default()

Bug: 35811655
Bug: 36502022

Test: normal boot sailfish, go to Settings > System & tap on
      "Factory Data reset"
Test: recovery boot sailfish

Change-Id: I253f5bdfb9be8a01f80856eb1194f85cdf992bbd
2017-03-25 19:25:43 +08:00
Tianjie Xu 2078b22e41 Add the missing sr-Latn into png files and rename the png locale header
Switch the locale header in the png files from Locale.toString() to
Locale.toLanguageTag(). For example, en_US --> en-us and sr__#Latn
--> sr-Latn. Also clean up recovery a bit to expect the new locale
format.

Bug: 35215015
Test: sr-Latn shows correctly under graphic tests && recovery tests pass
Change-Id: Ic62bab7756cdc6e5f98f26076f7c2dd046f811db
2017-03-24 16:54:52 -07:00
Tao Bao eb7c0dc6d0 Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c am: 7b82ad12f6
am: 0ec16d8831

Change-Id: Iaa368fdab1940c3b206e9c43396c364790f707b8
2017-03-24 23:17:09 +00:00
Tao Bao 0ec16d8831 Merge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c
am: 7b82ad12f6

Change-Id: I7404ce4db28555a98a24fd5020712edda84b04d5
2017-03-24 23:14:39 +00:00
Tao Bao 7b82ad12f6 Merge "updater: Drop the support for BBOTA v1 and v2."
am: 5479506c9c

Change-Id: If0f6acf7120c6bc4b4644a12aa83939b52ad48c5
2017-03-24 23:12:39 +00:00
Tao Bao 5479506c9c Merge "updater: Drop the support for BBOTA v1 and v2." 2017-03-24 23:06:56 +00:00
Tao Bao 91d12f9ef1 Merge "Const modifiers" am: 4efd353d8f am: 92d8772c49
am: d51bd8770a

Change-Id: I7a8f14bde0359dcd3d1a29d8ba37f373b205c47a
2017-03-24 20:37:08 +00:00
Tao Bao 3bea64c9f3 Merge "Removed C-style casts" am: 110155a604 am: 6a831e02b6
am: 6b3df6486e

Change-Id: Ib917ebb9e4bd7a5cd7dcd785593f0a2f4ef0aefb
2017-03-24 20:36:58 +00:00
Tao Bao d51bd8770a Merge "Const modifiers" am: 4efd353d8f
am: 92d8772c49

Change-Id: I453dbfb45e3f70586e77cb28207c164fe9cb72fa
2017-03-24 20:34:37 +00:00
Tao Bao 6b3df6486e Merge "Removed C-style casts" am: 110155a604
am: 6a831e02b6

Change-Id: If512cbe096ad18388fea2800d12182832d0ecda8
2017-03-24 20:34:27 +00:00
Tao Bao 92d8772c49 Merge "Const modifiers"
am: 4efd353d8f

Change-Id: I8ae993749d5f2c58cc5ef23f90845cf5a0bf756d
2017-03-24 20:32:39 +00:00
Tao Bao 6a831e02b6 Merge "Removed C-style casts"
am: 110155a604

Change-Id: I363e172a8f7f9e67dfc9474e0e10463690cdd833
2017-03-24 20:32:29 +00:00
Tao Bao 4efd353d8f Merge "Const modifiers" 2017-03-24 20:28:09 +00:00
Tao Bao 110155a604 Merge "Removed C-style casts" 2017-03-24 20:28:00 +00:00
Tao Bao 4db650ca10 Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6 am: 5da7e41ec8
am: be4578f009

Change-Id: I46cf74bc32cd1d2666a1b14df62b9fe96445c971
2017-03-24 20:20:57 +00:00
Tao Bao be4578f009 Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6
am: 5da7e41ec8

Change-Id: I56222c4a4bf245ca7c5a9506750125f23bed443f
2017-03-24 20:18:27 +00:00
Tao Bao 5da7e41ec8 Merge "Fix the wrong parameter when calling read_metadata_from_package()."
am: 6014db5da6

Change-Id: I55b44f34491f8103487bcd7b871d3615666b45d9
2017-03-24 20:16:26 +00:00
Tao Bao 6014db5da6 Merge "Fix the wrong parameter when calling read_metadata_from_package()." 2017-03-24 20:11:53 +00:00
Tao Bao 1b2a98bda3 Fix the wrong parameter when calling read_metadata_from_package().
The call to read_metadata_from_package() is broken due to being passed
an invalid pointer (ZipArchiveHandle vs ZipArchiveHandle*). It's
introduced when switching from minzip to libziparchive. Compiler didn't
complain, because ZipArchiveHandle is typedef'd as void*, which legitly
accepts a void**.

Also clean up secure_wipe_partition() logs a bit by using android-base
logging.

Bug: 36427762
Test: Send a wipe package.
Change-Id: I791a0f09a066f1c257dae890e7ae13d02a02e78b
2017-03-24 11:02:05 -07:00
Tao Bao bcf464988e updater: Remove some redundant arguments.
Clean up a few functions that take CommandParameters& as the first
parameter. We don't need to take duplicate arguments if they always come
from CommandParameters. This redundancy came from the point we replaced
strtok()s (commit baad2d454d).

Test: Apply an incremental update with the new updater.
Change-Id: I2912b8ce6bc7580bf7f566e125f12270e679e155
2017-03-24 00:34:36 -07:00
Tao Bao 3356777cae updater: Drop the support for BBOTA v1 and v2.
The script support for BBOTA v1 and v2 has been dropped in commit
8fad03e7712082eb880ffaaffb69eb13252ce220 (platform/build).

Bug: 33694730
Test: Apply an incremental with the new updater.
Test: recovery_component_test
Change-Id: I038b1bf8d10f030cab8ec0aa6ee565c5a9545dfd
2017-03-23 23:58:02 -07:00
Paul Crowley f5991542fa Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89 am: eddc9a15f9
am: 25bf90201c

Change-Id: Ie7451d7ed8acb7118655ca90ed1bd738447eef0d
2017-03-23 23:44:42 +00:00
Paul Crowley 25bf90201c Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89
am: eddc9a15f9

Change-Id: I41c7a52fda6b0df63869640193a198a98801ed75
2017-03-23 23:41:41 +00:00
Paul Crowley eddc9a15f9 Merge "Reword the wipe warning message to be more comprehensible."
am: f09efaff89

Change-Id: I4078499b8019361979a8d47cf9205e1ee865303c
2017-03-23 23:39:43 +00:00
Treehugger Robot f09efaff89 Merge "Reword the wipe warning message to be more comprehensible." 2017-03-23 23:36:42 +00:00
Tianjie Xu bf607c4a28 Don't fail ReadArgs if length to parse is 0
Test: recovery component tests pass
Change-Id: I0946ba498d845ec552ae7e4c79dc94618b2fdf6d
2017-03-23 15:12:22 -07:00
Paul Crowley 31ac0c61fe Reword the wipe warning message to be more comprehensible.
Test: My device was crashing anyway, so observed message on crash.
Bug: 34669779
Change-Id: Ib85d1d137139f5e14f735c972c2312acce2caf5f
2017-03-23 14:54:20 -07:00
Tao Bao 2bf8ff6205 Merge "Redundant checking of STL container element" am: b56a3c2e3a am: 9e05f26e1a
am: bc3d2ee5e5

Change-Id: I704638b127b43b1e2964f5679bdd486384563a8e
2017-03-23 21:51:59 +00:00
Tao Bao bc3d2ee5e5 Merge "Redundant checking of STL container element" am: b56a3c2e3a
am: 9e05f26e1a

Change-Id: I269ff1530179a77f38d824f67a219adb7c666271
2017-03-23 21:36:58 +00:00
Tao Bao 9e05f26e1a Merge "Redundant checking of STL container element"
am: b56a3c2e3a

Change-Id: If1dc1bd436b7ef97fbdc848373f59ce66881c0a2
2017-03-23 21:27:27 +00:00
Tao Bao b56a3c2e3a Merge "Redundant checking of STL container element" 2017-03-23 21:13:47 +00:00
Mikhail Lappo b49767c0ba Const modifiers
This functions do not change class variables
Would be good to mark them as const, so
class variables are not changed by coincidence

Change-Id: Iea34f6d26dbd1bde813035160e07ff2a681989e6
2017-03-23 21:52:30 +01:00
Mikhail Lappo 20791bdcd7 Removed C-style casts
In c++ code would be cleaner to use
c++ retinterpret cast instead of old
c-style notation

Change-Id: Ibeef5e0c374addf108c0a8876a6be45063d8e396
2017-03-23 21:52:04 +01:00
Tao Bao ef888d1b55 Merge "Checking unsigned variable less than zero" am: 0d264bf088 am: 957f6491f8
am: cd03df0652

Change-Id: Ic5bcbe14b6db759135274fd51a35703327c3826d
2017-03-23 20:05:31 +00:00
Tao Bao 1335a3772f Merge "Fixed scanf modifier" am: 577c668861 am: d414ae465e
am: 8859e2aea8

Change-Id: I0b38bfba79de254cd30f85ab7ea68603dec53017
2017-03-23 20:05:22 +00:00
Tao Bao cd03df0652 Merge "Checking unsigned variable less than zero" am: 0d264bf088
am: 957f6491f8

Change-Id: If9516fdbb4798675330cc3accdc299445e64e258
2017-03-23 20:02:30 +00:00
Tao Bao 8859e2aea8 Merge "Fixed scanf modifier" am: 577c668861
am: d414ae465e

Change-Id: If548f8240521dacba70e969f625728160d2bde2a
2017-03-23 20:02:22 +00:00
Tao Bao 957f6491f8 Merge "Checking unsigned variable less than zero"
am: 0d264bf088

Change-Id: I3a5013ec09e81ce1daae78a91975884a1f8d7a81
2017-03-23 19:59:32 +00:00