Merge "Show app battery usage in correct user" into oc-dev

        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

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import android.app.Activity;

import android.app.Fragment;

import android.graphics.drawable.Drawable;

import android.os.BatteryStats;

import android.os.Bundle;

import android.os.UserHandle;

import android.view.View;

import com.android.internal.os.BatterySipper;

import org.mockito.stubbing.Answer;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;

import org.robolectric.util.ReflectionHelpers;

@RunWith(SettingsRobolectricTestRunner.class)

        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)));

    }

}