PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new battery entry into AppInfo page launch variable" into sc-dev am: a967b88ee4 am: 92f6d4fdf3 am: da5b7ee353

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639372

Change-Id: I5c78387f18d1d953828f7cee39b489b08238b97d
This commit is contained in:
Wesley Wang
2021-05-26 07:57:42 +00:00
committed by Automerger Merge Worker
parent 742c627e98 da5b7ee353
commit 1eaac06288
4 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
View File

@@ -96,7 +96,11 @@ public class AppBatteryPreferenceControllerTest {
when(mOtherUidBatteryConsumer.getUid()).thenReturn(OTHER_UID);
mController = spy(new AppBatteryPreferenceController(
RuntimeEnvironment.application, mFragment, "package1", null /* lifecycle */));
RuntimeEnvironment.application,
mFragment,
"package1" /* packageName */,
0 /* uId */,
null /* lifecycle */));
mController.mBatteryUtils = mBatteryUtils;
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mBatteryPreference);
}