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

Commit 60959001 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8429428 from 803c4a82 to tm-release 

Change-Id: I34a996094fd8b58fecb5bbf0feaf53cb210a4d2d
parents 59f7a604 803c4a82

media/libaaudio/scripts/measure_device_power.py

+5 −5
Original line number Diff line number Diff line
@@ -225,13 +225,13 @@ def measureEnergyForCommands(fileName): 
        line = fp.readline()

        while line:

            command = line.strip()

            if command.endswith('\\'):

                command = command[:-1].strip() # remove \\:

                runCommand(command)

            elif command.startswith("#"):

            if command.startswith("#"):

                # ignore comment

                print((command + "\n"))

                comment = command

                comment = command[1:].strip() # remove leading '#'

            elif command.endswith('\\'):

                command = command[:-1].strip() # remove \\

                runCommand(command)

            elif command:

                report = averageEnergyForCommand(command, DEFAULT_NUM_ITERATIONS)

                finalReport += comment + ", " + command + ", " + formatEnergyData(report) + "\n"

media/libaaudio/scripts/synthmark_tests.txt

0 → 100644
+45 −0
Original line number Diff line number Diff line 
# Measure energy consumption with synthmark.



# ADPF <400 RR

adb root \

adb shell setprop vendor.powerhal.adpf.uclamp_min.high_limit 400 \

adb shell synthmark -tj -n1 -N50 -B2 -z1

adb shell synthmark -tj -n1 -N75 -B2 -z1

adb shell synthmark -tj -n1 -N100 -B2 -z1



# ADPF <500 RR

adb root \

adb shell setprop vendor.powerhal.adpf.uclamp_min.high_limit 500 \

adb shell synthmark -tj -n1 -N50 -B2 -z1

adb shell synthmark -tj -n1 -N75 -B2 -z1

adb shell synthmark -tj -n1 -N100 -B2 -z1



# ADPF <600 RR

adb root \

adb shell setprop vendor.powerhal.adpf.uclamp_min.high_limit 600 \

adb shell synthmark -tj -n1 -N50 -B2 -z1

adb shell synthmark -tj -n1 -N75 -B2 -z1

adb shell synthmark -tj -n1 -N100 -B2 -z1



# None

adb shell synthmark -tj -n1 -N50 -B2 -z0

adb shell synthmark -tj -n1 -N75 -B2 -z0

adb shell synthmark -tj -n1 -N100 -B2 -z0



# uclamp

# adb root \

# adb shell synthmark -tj -n1 -N75 -B2 -u1



# steady

# adb shell synthmark -tj -n75 -B2 -u0



# CPU affinity

# adb shell synthmark -tj -n1 -N75 -B2 -u0 -c1

# adb shell synthmark -tj -n1 -N75 -B2 -u0 -c4

# adb shell synthmark -tj -n1 -N75 -B2 -u0 -c6



# steady + affinity

# adb shell synthmark -tj -n75 -B2 -u0 -c1

# adb shell synthmark -tj -n75 -B2 -u0 -c4

# adb shell synthmark -tj -n75 -B2 -u0 -c6

services/camera/libcameraservice/CameraService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -4450,7 +4450,8 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) { 
void CameraService::dumpOpenSessionClientLogs(int fd,

        const Vector<String16>& args, const String8& cameraId) {

    auto clientDescriptor = mActiveClientManager.get(cameraId);

    dprintf(fd, "  Device %s is open. Client instance dump:\n",

    dprintf(fd, "  %s : Device %s is open. Client instance dump:\n",

            getFormattedCurrentTime().string(),

            cameraId.string());

    dprintf(fd, "    Client priority score: %d state: %d\n",

        clientDescriptor->getPriority().getScore(),