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

Merge "Use package from sipper if default is null" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-31 18:58:22 +00:00
committed by Android (Google) Code Review
parent 48d54ff2f6 51872ed345
commit 8be9d6519f
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -1058,6 +1058,7 @@ public class InstalledAppDetails extends AppInfoBase
} else if (preference == mBatteryPreference) {
if (isBatteryStatsAvailable()) {
BatteryEntry entry = new BatteryEntry(getContext(), null, mUserManager, mSipper);
entry.defaultPackageName = mPackageName;
AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(),
this, mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry,
mBatteryPercent, null /* mAnomalies */);

6
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -137,7 +137,9 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
args.putString(EXTRA_PACKAGE_NAME, null);
} else {
// populate data for normal app
args.putString(EXTRA_PACKAGE_NAME, entry.defaultPackageName);
args.putString(EXTRA_PACKAGE_NAME, entry.defaultPackageName != null
? entry.defaultPackageName
: sipper.mPackages[0]);
}
args.putInt(EXTRA_UID, sipper.getUid());
@@ -212,7 +214,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
mAnomalies = getArguments().getParcelableArrayList(EXTRA_ANOMALY_LIST);
if (mAnomalies == null) {
getLoaderManager().initLoader(ANOMALY_LOADER, Bundle.EMPTY, this);
} else if (mAnomalies != null){
} else if (mAnomalies != null) {
mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalies);
}
}