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

Commit 5ab93ad7 authored by Tony Mak's avatar Tony Mak
Browse files

Show app battery usage in correct user 

Test: m -j RunSettingsRoboTests

Fix: 38447829

Change-Id: I6c0f74b79468ee670f642edb0a50400c030d1925
parent 6784e419

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

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,8 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        args.putInt(EXTRA_POWER_USAGE_AMOUNT, (int) sipper.totalPowerMah);



        caller.startPreferencePanelAsUser(fragment, AdvancedPowerUsageDetail.class.getName(), args,

                R.string.battery_details_title, null, new UserHandle(UserHandle.myUserId()));

                R.string.battery_details_title, null,

                new UserHandle(UserHandle.getUserId(sipper.getUid())));

    }



    @Override

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

+26 −12
Original line number Diff line number Diff line
@@ -16,6 +16,19 @@ 


package com.android.settings.fuelgauge;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;



import android.app.Activity;

import android.content.Context;

import android.content.pm.ApplicationInfo;
@@ -23,6 +36,7 @@ import android.content.pm.PackageManager; 
import android.graphics.drawable.Drawable;

import android.os.BatteryStats;

import android.os.Bundle;

import android.os.UserHandle;

import android.support.v7.widget.RecyclerView;



import com.android.internal.os.BatterySipper;
@@ -53,18 +67,6 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;



import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,

        shadows = ShadowEntityHeaderController.class)
@@ -269,4 +271,16 @@ public class AdvancedPowerUsageDetailTest { 
        assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_ICON_ID)).isEqualTo(ICON_ID);

        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(null);

    }



    @Test

    public void testStartBatteryDetailPage_WorkApp() {

        final int appUid = 1010019;

        mBatterySipper.mPackages = PACKAGE_NAME;

        doReturn(appUid).when(mBatterySipper).getUid();

        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,

                mBatteryEntry, USAGE_PERCENT);



        verify(mTestActivity).startPreferencePanelAsUser(

                any(), anyString(), any(), anyInt(), any(), eq(new UserHandle(10)));

    }

}