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

Commit eda172ce authored by Wesley Wang's avatar Wesley Wang
Browse files

Fix app battery usage list launch incorrect works app 

 - App usage page only use package name to launch the page, it can not
   identify the different userId between normal app and work profile
   app, add extra userId info into launch args
 - Remove no battery usage state/string if usage time is empty

Bug: 251471047
Test: make SettingsRoboTests
Change-Id: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
parent dba9928a

src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.AsyncTask; 
import android.os.BatteryUsageStats;

import android.os.Bundle;

import android.os.UidBatteryConsumer;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;
@@ -144,7 +145,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController 
        } else {

            Log.i(TAG, "Launch : " + mPackageName + " with package name");

            AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent,

                    mPackageName);

                    mPackageName, UserHandle.CURRENT);

        }

        return true;

    }

src/com/android/settings/applications/manageapplications/ManageApplications.java

+2 −1
Original line number Diff line number Diff line
@@ -686,7 +686,8 @@ public class ManageApplications extends InstrumentedFragment 
                break;

            case LIST_TYPE_BATTERY_OPTIMIZATION:

                AdvancedPowerUsageDetail.startBatteryDetailPage(

                        getActivity(), this, mCurrentPkgName);

                        getActivity(), this, mCurrentPkgName,

                        UserHandle.getUserHandleForUid(mCurrentUid));

                break;

            // TODO: Figure out if there is a way where we can spin up the profile's settings

            // process ahead of time, to avoid a long load of data when user clicks on a managed

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

+4 −6
Original line number Diff line number Diff line
@@ -219,7 +219,8 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
     * Start packageName's battery detail page.

     */

    public static void startBatteryDetailPage(

            Activity caller, Instrumentable instrumentable, String packageName) {

            Activity caller, Instrumentable instrumentable, String packageName,

            UserHandle userHandle) {

        final Bundle args = new Bundle(3);

        final PackageManager packageManager = caller.getPackageManager();

        args.putString(EXTRA_PACKAGE_NAME, packageName);
@@ -235,6 +236,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
                .setTitleRes(R.string.battery_details_title)

                .setArguments(args)

                .setSourceMetricsCategory(instrumentable.getMetricsCategory())

                .setUserHandle(userHandle)

                .launch();

    }
@@ -475,16 +477,12 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
    private CharSequence getAppActiveTime(Bundle bundle) {

        final long foregroundTimeMs = bundle.getLong(EXTRA_FOREGROUND_TIME);

        final long backgroundTimeMs = bundle.getLong(EXTRA_BACKGROUND_TIME);

        final int consumedPower = bundle.getInt(EXTRA_POWER_USAGE_AMOUNT);

        final int uid = bundle.getInt(EXTRA_UID, 0);

        final String slotTime = bundle.getString(EXTRA_SLOT_TIME, null);

        final long totalTimeMs = foregroundTimeMs + backgroundTimeMs;

        final CharSequence usageTimeSummary;



        if (totalTimeMs == 0) {

            usageTimeSummary = getText(

                    consumedPower > 0 ? R.string.battery_usage_without_time

                            : R.string.battery_not_usage);

            usageTimeSummary = getText(R.string.battery_usage_without_time);

        } else if (slotTime == null) {

            // Shows summary text with last full charge if slot time is null.

            usageTimeSummary = getAppFullChargeActiveSummary(

tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java

+5 −4
Original line number Diff line number Diff line
@@ -280,8 +280,7 @@ public class AdvancedPowerUsageDetailTest { 


        ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);

        verify(mEntityHeaderController).setSummary(captor.capture());

        assertThat(captor.getValue().toString())

                .isEqualTo("No usage from last full charge");

        assertThat(captor.getValue().toString()).isEmpty();

    }



    @Test
@@ -571,7 +570,8 @@ public class AdvancedPowerUsageDetailTest { 
    public void startBatteryDetailPage_noBatteryUsage_hasBasicData() {

        final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);



        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, PACKAGE_NAME[0]);

        AdvancedPowerUsageDetail.startBatteryDetailPage(

                mActivity, mFragment, PACKAGE_NAME[0], UserHandle.OWNER);



        verify(mActivity).startActivity(captor.capture());
@@ -589,7 +589,8 @@ public class AdvancedPowerUsageDetailTest { 
            PackageManager.NameNotFoundException {

        doReturn(UID).when(mPackageManager).getPackageUid(PACKAGE_NAME[0], 0 /* no flag */);



        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, PACKAGE_NAME[0]);

        AdvancedPowerUsageDetail.startBatteryDetailPage(

                mActivity, mFragment, PACKAGE_NAME[0], UserHandle.OWNER);



        assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);

    }