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

Commit 9237e2cf authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Add a perf test for BatteryStatsHelper"

parents 69b4586f a101c0af

core/java/com/android/internal/app/IBatteryStats.aidl

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ interface IBatteryStats { 
    @UnsupportedAppUsage

    byte[] getStatistics();



    ParcelFileDescriptor getStatisticsStream();

    ParcelFileDescriptor getStatisticsStream(boolean updateAll);



    // Return true if we see the battery as currently charging.

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

core/java/com/android/internal/os/BatteryStatsHelper.java

+14 −5
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ public class BatteryStatsHelper { 
            }

        }

        return getStats(IBatteryStats.Stub.asInterface(

                ServiceManager.getService(BatteryStats.SERVICE_NAME)));

                ServiceManager.getService(BatteryStats.SERVICE_NAME)), true);

    }



    @UnsupportedAppUsage
@@ -223,8 +223,13 @@ public class BatteryStatsHelper { 


    @UnsupportedAppUsage

    public BatteryStats getStats() {

        return getStats(true /* updateAll */);

    }



    /** Retrieves stats from BatteryService, optionally getting updated numbers */

    public BatteryStats getStats(boolean updateAll) {

        if (mStats == null) {

            load();

            load(updateAll);

        }

        return mStats;

    }
@@ -720,19 +725,23 @@ public class BatteryStatsHelper { 


    @UnsupportedAppUsage

    private void load() {

        load(true);

    }



    private void load(boolean updateAll) {

        if (mBatteryInfo == null) {

            return;

        }

        mStats = getStats(mBatteryInfo);

        mStats = getStats(mBatteryInfo, updateAll);

        if (mCollectBatteryBroadcast) {

            mBatteryBroadcast = mContext.registerReceiver(null,

                    new IntentFilter(Intent.ACTION_BATTERY_CHANGED));

        }

    }



    private static BatteryStatsImpl getStats(IBatteryStats service) {

    private static BatteryStatsImpl getStats(IBatteryStats service, boolean updateAll) {

        try {

            ParcelFileDescriptor pfd = service.getStatisticsStream();

            ParcelFileDescriptor pfd = service.getStatisticsStream(updateAll);

            if (pfd != null) {

                if (false) {

                    Log.d(TAG, "selinux context: "

services/core/java/com/android/server/am/BatteryStatsService.java

+13 −5
Original line number Diff line number Diff line
@@ -519,16 +519,24 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        return data;

    }



    public ParcelFileDescriptor getStatisticsStream() {

    /**

     * Returns parceled BatteryStats as a MemoryFile.

     *

     * @param forceUpdate If true, runs a sync to get fresh battery stats. Otherwise,

     *                  returns the current values.

     */

    public ParcelFileDescriptor getStatisticsStream(boolean forceUpdate) {

        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.BATTERY_STATS, null);

        //Slog.i("foo", "SENDING BATTERY INFO:");

        //mStats.dumpLocked(new LogPrinter(Log.INFO, "foo", Log.LOG_ID_SYSTEM));

        Parcel out = Parcel.obtain();

        if (forceUpdate) {

            // Drain the handler queue to make sure we've handled all pending works, so we'll get

            // an accurate stats.

            awaitCompletion();

            syncStats("get-stats", BatteryExternalStatsWorker.UPDATE_ALL);

        }

        synchronized (mStats) {

            mStats.writeToParcel(out, 0);

        }

tests/BatteryStatsPerfTest/Android.bp

0 → 100644
+25 −0
Original line number Diff line number Diff line 
// Copyright (C) 2020 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



android_test {

    name: "BatteryStatsPerfTests",

    srcs: ["src/**/*.java"],

    static_libs: [

        "androidx.test.rules",

        "apct-perftests-utils",

        "truth-prebuilt",

    ],

    platform_apis: true,

    certificate: "platform",

}

tests/BatteryStatsPerfTest/AndroidManifest.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.frameworks.perftests.batterystats">

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

    <uses-permission android:name="android.permission.BATTERY_STATS"/>



    <application>

        <uses-library android:name="android.test.runner" />

    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.frameworks.perftests.batterystats"/>

</manifest>