Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86b8d5e5 authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Prevent error message on svc power reboot 

With the changes to sys.powerctl this variable is no longer set on a
power event - the power action is simply carried out. (This is to avoid
possible DoS of these power functions.) However, this means that this
property can no longer be read to see if a power event is happening.
Since there is no longer a way of telling if a remote exception is real
or not, best not to print out an error.

Note that this bug occurs on some devices, not all. I was able to
reproduce it reliably on a Pixel 7a, but not on a Pixel 7 or Cuttlefish.

Bug: 318323013
Test: adb shell svc power reboot

Change-Id: Icbc1ec1b7882140d4d742b056ea2adaafae67ee9
parent 3bd28b58

cmds/svc/src/com/android/commands/svc/PowerCommand.java

+4 −8
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.os.PowerManager; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.sysprop.InitProperties;



public class PowerCommand extends Svc.Command {

    private static final int FORCE_SUSPEND_DELAY_DEFAULT_MILLIS = 0;
@@ -142,12 +140,10 @@ public class PowerCommand extends Svc.Command { 
    // Check if remote exception is benign during shutdown. Pm can be killed

    // before system server during shutdown, so remote exception can be ignored

    // if it is already in shutdown flow.

    // sys.powerctl is no longer set to avoid a possible DOS attack (see

    // bionic/libc/bionic/system_property_set.cpp) so we have no real way of knowing if a

    // remote exception is real or simply because pm is killed (b/318323013)

    // So we simply do not display anything.

    private void maybeLogRemoteException(String msg) {

        String powerProp = SystemProperties.get("sys.powerctl");

        // Also check if userspace reboot is ongoing, since in case of userspace reboot value of the

        // sys.powerctl property will be reset.

        if (powerProp.isEmpty() && !InitProperties.userspace_reboot_in_progress().orElse(false)) {

            System.err.println(msg);

        }

    }

}