Commit graph

80968 commits

Author SHA1 Message Date
Daniel Zheng
97df38b485 Merge "Adding const to task constructors" am: 83800601f6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2529764

Change-Id: Id1a8a2c96645065b82f1a44c33a427829b292949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:05:32 +00:00
Daniel Zheng
83800601f6 Merge "Adding const to task constructors" 2023-04-10 19:44:31 +00:00
Daniel Zheng
21d17b1d74 Merge "Cleaned up slot logic" am: 23631b9be7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2529073

Change-Id: I87ff9415e01bfecf8fb0156d10e9cf71d40f36be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 18:11:33 +00:00
Daniel Zheng
c457774df3 Merge "Correcting Reboot Task Functionality" am: dddb5fa80b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2485615

Change-Id: I9567222ddfd57762492e1671bb598b9f3de07eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 18:10:44 +00:00
Daniel Zheng
23631b9be7 Merge "Cleaned up slot logic" 2023-04-10 18:02:05 +00:00
Daniel Zheng
dddb5fa80b Merge "Correcting Reboot Task Functionality" 2023-04-10 17:46:03 +00:00
Daniel Zheng
e6dbd4f194 Adding const to task constructors
Adding const decorator to class constructor to ensure Flashing Plan
isn't modified during task construction

Bug: 194686221
Test: tested Flashall on raven
Change-Id: I99b71b2b756beaf871a31a1a035545d754d128e8
2023-04-10 09:53:08 -07:00
Daniel Zheng
1e6456b011 Cleaned up slot logic
Updating old clean up slot logic change. Some devices don't know current
slot so we can't always just call get_current_slot()

Test: tested flashall on raven
Change-Id: Id655f1c1ee0b1ff09331f0d91d77412836d0af8d
2023-04-10 09:35:48 -07:00
Treehugger Robot
3a2405ca6b Merge "Improve the formatting for init's README." am: 57c1a4e308
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2528060

Change-Id: I21076388250aff0429bcaa533c2f4067f7b2c99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 01:18:26 +00:00
Treehugger Robot
57c1a4e308 Merge "Improve the formatting for init's README." 2023-04-07 00:49:23 +00:00
Mateus Azis
1a2f73d76a Improve the formatting for init's README.
Make sure the arguments to "mkdir" show up in the same block.

Before: c3a119caa3/init/README.md
After: https://android.googlesource.com/platform/system/core/+/refs/changes/60/2528060/1/init/README.md

Test: N/A
Change-Id: I88b4931e70e2793566cce53c38c0295168463971
2023-04-06 13:46:35 -07:00
Thiébaud Weksteen
f449ee1f89 Merge "Skip newlines for SELinux logs" am: c3a119caa3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2521555

Change-Id: I771494bb6e19f519dc4059fe58e64b6b04964c2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 00:06:50 +00:00
Thiébaud Weksteen
c3a119caa3 Merge "Skip newlines for SELinux logs" 2023-04-05 23:37:51 +00:00
Kevin Jeon
fd8bf6dc55 Merge "Add pointer dereference in debuggerd error msg" am: 2a70a7432c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2525899

Change-Id: Ia98783eac73dd0a59f6ab746eca17a4d6896f6b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 23:06:27 +00:00
Kevin Jeon
2a70a7432c Merge "Add pointer dereference in debuggerd error msg" 2023-04-05 22:34:51 +00:00
Kevin Jeon
06af624e66 Add pointer dereference in debuggerd error msg
This change adds a missing pointer dereference to the InterceptResponse
when checking for a size mismatch.

Test: build
Bug: N/A
Change-Id: I88afed6f1c0f33fe237d337b0fb8fc0a0c0e3bac
2023-04-05 16:32:39 -04:00
Thiébaud Weksteen
f03dde8549 Skip newlines for SELinux logs
libselinux log messages usually end with a new line character. Android
log system does not require the new line character and will include the
character as-is in the log buffer.

This trimming was already implemented when the message is typed as
SELINUX_AVC (see SelinuxAvcLog). Move the truncation one level up so it
is occurring for all types of logs.

Test: boot & adb logcat & inspect SELinux logs
Change-Id: I360359c1b178ef24d555dd41f8d4a18b293a175c
2023-04-05 09:32:18 +10:00
Treehugger Robot
475ffb84b8 Merge "Revert "Cleaned up some slot logic"" am: b2fdbef489
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2520539

Change-Id: I17cd9b79fbfda5df7ba3b73fc634efbc9bd75344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 22:20:46 +00:00
Treehugger Robot
b2fdbef489 Merge "Revert "Cleaned up some slot logic"" 2023-04-03 21:49:25 +00:00
Kelvin Zhang
2a4a45f3e4 Revert "Cleaned up some slot logic"
This reverts commit bd85a18d0b.

Reason for revert: b/276759363

Change-Id: I3ba08cf4abeeb7769569512d50e7ff135438cf20
2023-04-03 20:44:05 +00:00
Treehugger Robot
fa81e50447 Merge "Allow libmodprobe to be used by host binaries" am: 6fac9acf2c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2514122

Change-Id: I892e8ea84f5bcbae61ac9266e7e7bb3a56013189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-01 04:24:28 +00:00
Treehugger Robot
c69c4b5146 Merge "Handle with the nonnull case in a tricky way" am: 1c324d3559
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2518595

Change-Id: I7fe4a24888d2545e7d34c6adc23a17e8551cd756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-01 04:18:50 +00:00
Treehugger Robot
6fac9acf2c Merge "Allow libmodprobe to be used by host binaries" 2023-04-01 03:49:04 +00:00
Treehugger Robot
1c324d3559 Merge "Handle with the nonnull case in a tricky way" 2023-04-01 02:46:24 +00:00
zijunzhao
fa8037c207 Handle with the nonnull case in a tricky way
The func readdir() is not allowed to pass a nullptr.
Bug: b/245972273
Test: mm

Change-Id: Idbb3f552b026dc6d727886d22989d3359ed6633b
2023-03-31 23:50:37 +00:00
Daniel Zheng
3128184702 Merge "Cleaned up some slot logic" am: b16aba889a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2503037

Change-Id: Iacf00e94b732fab0adc1ad5847ec057e53f1787f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 22:15:57 +00:00
Daniel Zheng
58d9dd700d Merge "Added some error logs to wipe" am: 719caca725
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2512335

Change-Id: I4b883b5fa0b41b9e2bb83fb69bbc1fb95395a135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 22:15:46 +00:00
Daniel Zheng
b16aba889a Merge "Cleaned up some slot logic" 2023-03-30 21:49:15 +00:00
Daniel Zheng
719caca725 Merge "Added some error logs to wipe" 2023-03-30 21:30:11 +00:00
Daniel Zheng
4b9782620e Merge "Added check to copy AVB footer" am: 4aa47338f2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2512556

Change-Id: I7fa470868758f4409e12ca56fae077b50c382326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:00:31 +00:00
Daniel Zheng
1418fb8ce0 Correcting Reboot Task Functionality
Modifying fastboot-info.txt to directly call reboot fastboot instead of
reboot userspace -> so no longer need "userspace" in reboot task. Also
moving skip_reboot check to task since in old code we can have
skip_reboot be true and still reboot to bootloader, fastboot, or
recovery

Test: tested reboot commands on Raven
Change-Id: I98ba51747bf7229a88ba737540c81d20b42e5981
2023-03-30 18:35:14 +00:00
Daniel Zheng
4aa47338f2 Merge "Added check to copy AVB footer" 2023-03-30 18:24:31 +00:00
Daniel Zheng
bd85a18d0b Cleaned up some slot logic
Doesn't look like we actually need current_slot, since we can always
just call function get_current_slot

Test: tested flashall on raven
Change-Id: Icba64bc9fdd08f36d44965e32558a73d0beab0e1
2023-03-30 18:21:28 +00:00
Daniel Zheng
6f213b2c79 Added some error logs to wipe
Changed so if we call wipe on a partition that doesn't exist we'll get
some helpful error messages.

Test: tested wipe test
Bug: 194686221
Change-Id: I19dc0396a7a98d0b2be7859edbffeb8acdc9850a
2023-03-30 18:19:04 +00:00
Daniel Zheng
e33e8a8685 Added check to copy AVB footer
is_logical shouldn't work in bootloader for some devices, so we also need to check
using should_flash_in_userspace to see if partition is dynamic

Test: tested to flash {partition} on raven and checked to see avb
footers are not copied from dynamic partitions

Change-Id: Iabb3ea535fa80b26cf1c08040beb3d4ea5e8c2ae
2023-03-30 18:19:04 +00:00
Mitch Phillips
0fe5879049 Merge "[debuggerd] New protocol to AM to handle recoverable crashes." am: 5a2a302108
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2485619

Change-Id: I08796411e26e90849cf503d639c725d56e6039f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:45:13 +00:00
Treehugger Robot
f5d65bf11c Merge "libprocessgroup: Check validity of uid and pid arguments" am: c1798def91
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2475605

Change-Id: I973a3f97b7bf4c51ad77b2ac3ee5d7213e539ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:43:59 +00:00
Kelvin Zhang
bdd595f0f9 Allow libmodprobe to be used by host binaries
Cuttlefish tooling need libmodprobe to determine if a kernel module is
signed.

Bug: 273752147
Test: th
Change-Id: Icea49802d032b27bd89ed8f0bee1bc4814298774
2023-03-29 15:29:02 -07:00
Mitch Phillips
5a2a302108 Merge "[debuggerd] New protocol to AM to handle recoverable crashes." 2023-03-29 20:28:35 +00:00
Treehugger Robot
c1798def91 Merge "libprocessgroup: Check validity of uid and pid arguments" 2023-03-29 19:49:18 +00:00
Vova Sharaienko
24956e370f Merge "[TeX] Introduced Telemetry Express Logging APIs" am: a662169c44
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2506668

Change-Id: I57cf496e309faf75c219390fa62f8c0a6fa55558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 22:30:53 +00:00
Vova Sharaienko
a662169c44 Merge "[TeX] Introduced Telemetry Express Logging APIs" 2023-03-28 22:05:28 +00:00
Treehugger Robot
d79524869c Merge "Updated fuzz_config in Android.bp file" am: c631556363
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2505655

Change-Id: Ia0862a9ea529834106084986ed6495944a3d0310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 04:41:10 +00:00
Treehugger Robot
c631556363 Merge "Updated fuzz_config in Android.bp file" 2023-03-28 04:05:22 +00:00
Lingxue Luo
77c8fc54ef Merge "Add ability to automatically bootup" am: 1295d2e8bb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2506598

Change-Id: I0dfc41e18f77453e2d082f73f6817383a06a5e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 23:02:47 +00:00
Lingxue Luo
1295d2e8bb Merge "Add ability to automatically bootup" 2023-03-24 21:41:06 +00:00
Vova Sharaienko
c246440dc5 [TeX] Introduced Telemetry Express Logging APIs
- provided C++ Histogram metric logging API with UID

Bug: 266586106
Test: m
Change-Id: I2ee92d423be5f9c137fa160d8c744340972f8036
2023-03-24 21:39:53 +00:00
Mike McCreavy
5766fe7dee Add ability to automatically bootup
Based on a new system property. This won't change any behavior if that
new system property isn't set.

Ignore-AOSP-First: WearOS specific change

Upstreaming from Wear: b/272526799
Bug: 199404658
Test: set the property, check that off-mode-charging automatically
reboots

(cherry picked from commit 332b3686290af70c73a464ce35b0c1124b2ce831)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:82d8011f170d5b1c936d117f4fb74836333714b6)
Merged-In: I98f37a840a43cb5216319457027b76fc493e3f62
Change-Id: I98f37a840a43cb5216319457027b76fc493e3f62

NOTE FOR REVIEWERS - original patch and result patch are not identical.
PLEASE REVIEW CAREFULLY.
Diffs between the patches:
0,6 +620,18 @@
         kick_animation(&batt_anim_);
     }
     health_info_ = health_info;
+
+    if (property_get_bool("ro.charger_mode_autoboot", false)) {
+        if (health_info_.battery_level >= boot_min_cap_) {
+            if (property_get_bool("ro.enable_boot_charger_mode", false)) {
+                LOGW("booting from charger mode\n");
+                property_set("sys.boot_from_charger_mode", "1");
+            } else {
+                LOGW("Battery SOC = %d%%, Automatically rebooting\n", health_info_.battery_level);
+                reboot(RB_AUTOBOOT);
+            }
+        }
+    }
 }

 int Charger::OnPrepareToWait(void) {

Original patch:
From 82d8011f170d5b1c936d117f4fb74836333714b6 Mon Sep 17 00:00:00 2001
From: Alice Sheng <alicesheng@google.com>
Date: Fri, 18 Mar 2022 10:25:31 -0700
Subject: [PATCH] Add ability to automatically bootup

Based on a new system property. This won't change any behavior if that
new system property isn't set.

Ignore-AOSP-First: WearOS specific change

Bug: 199404658
Test: set the property, check that off-mode-charging automatically
reboots

Change-Id: I98f37a840a43cb5216319457027b76fc493e3f62
(cherry picked from commit 332b3686290af70c73a464ce35b0c1124b2ce831)
---
2023-03-24 17:22:17 +00:00
Eric Biggers
c6c6f30beb Merge "libsparse: fix double free after block splitting" am: aa70ac106a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2506666

Change-Id: Ib71ec037449820efff80d112dcbbcf84a2ef38e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 01:18:39 +00:00
Eric Biggers
aa70ac106a Merge "libsparse: fix double free after block splitting" 2023-03-24 00:39:04 +00:00