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

Merge "Never store battery stats for cache" into oc-dr1-dev

Browse Source
This commit is contained in:
Lei Yu
2017-07-18 20:55:58 +00:00
committed by Android (Google) Code Review
parent aead86058d 114cf2a1a7
commit 8f8797f768
7 changed files with 101 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,7 +209,7 @@ public class InstalledAppDetails extends AppInfoBase
@Override
public Loader<BatteryStatsHelper> onCreateLoader(int id, Bundle args) {
return new BatteryStatsHelperLoader(getContext(), args);
return new BatteryStatsHelperLoader(getContext());
}
@Override

17
src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
View File

@@ -50,11 +50,7 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
if (mBatteryListener != null && Intent.ACTION_BATTERY_CHANGED.equals(action)
&& updateBatteryStatus(intent)) {
mBatteryListener.onBatteryChanged();
}
updateBatteryStatus(intent);
}
public void setBatteryChangedListener(OnBatteryChangedListener lsn) {
@@ -62,26 +58,27 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver {
}
public void register() {
mContext.registerReceiver(this,
final Intent intent = mContext.registerReceiver(this,
new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
updateBatteryStatus(intent);
}
public void unRegister() {
mContext.unregisterReceiver(this);
}
private boolean updateBatteryStatus(Intent intent) {
if (intent != null) {
private void updateBatteryStatus(Intent intent) {
if (intent != null && mBatteryListener != null && Intent.ACTION_BATTERY_CHANGED.equals(
intent.getAction())) {
String batteryLevel = Utils.getBatteryPercentage(intent);
String batteryStatus = Utils.getBatteryStatus(
mContext.getResources(), intent);
if (!batteryLevel.equals(mBatteryLevel) || !batteryStatus.equals(mBatteryStatus)) {
mBatteryLevel = batteryLevel;
mBatteryStatus = batteryStatus;
return true;
mBatteryListener.onBatteryChanged();
}
}
return false;
}
}

11
src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
View File

@@ -31,12 +31,13 @@ import com.android.settings.utils.AsyncLoader;
public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {
@VisibleForTesting
UserManager mUserManager;
private Bundle mBundle;
@VisibleForTesting
BatteryUtils mBatteryUtils;
public BatteryStatsHelperLoader(Context context, Bundle bundle) {
public BatteryStatsHelperLoader(Context context) {
super(context);
mBundle = bundle;
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mBatteryUtils = BatteryUtils.getInstance(context);
}
@Override
@@ -44,9 +45,8 @@ public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {
Context context = getContext();
final BatteryStatsHelper statsHelper = new BatteryStatsHelper(context,
true /* collectBatteryBroadcast */);
mBatteryUtils.initBatteryStatsHelper(statsHelper, null /* bundle */, mUserManager);
BatteryUtils.getInstance(context).initBatteryStatsHelper(statsHelper, mBundle,
mUserManager);
return statsHelper;
}
@@ -55,5 +55,4 @@ public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {
}
}

1
src/com/android/settings/fuelgauge/BatteryUtils.java
View File

@@ -370,6 +370,7 @@ public class BatteryUtils {
public void initBatteryStatsHelper(BatteryStatsHelper statsHelper, Bundle bundle,
UserManager userManager) {
statsHelper.create(bundle);
statsHelper.clearStats();
statsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, userManager.getUserProfiles());
}

15
src/com/android/settings/fuelgauge/PowerUsageBase.java
View File

@@ -82,19 +82,6 @@ public abstract class PowerUsageBase extends DashboardFragment
mBatteryBroadcastReceiver.unRegister();
}
@Override
public void onStop() {
super.onStop();
}
@Override
public void onDestroy() {
super.onDestroy();
if (getActivity().isChangingConfigurations()) {
mStatsHelper.storeState();
}
}
protected void restartBatteryStatsLoader() {
getLoaderManager().restartLoader(0, Bundle.EMPTY, this);
}
@@ -108,7 +95,7 @@ public abstract class PowerUsageBase extends DashboardFragment
@Override
public Loader<BatteryStatsHelper> onCreateLoader(int id,
Bundle args) {
return new BatteryStatsHelperLoader(getContext(), args);
return new BatteryStatsHelperLoader(getContext());
}
@Override