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

Commit d55de163 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Following renaming of battery stats."

parents 8d42ac22 b05bc145

src/com/android/settings/BatteryInfo.java

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.os.BatteryManager;

import android.os.BatteryStats;

import android.os.Bundle;

import android.os.Handler;

import android.os.IPowerManager;
@@ -163,7 +164,8 @@ public class BatteryInfo extends Activity { 
        mUptime = (TextView) findViewById(R.id.uptime);

        

        // Get awake time plugged in and on battery

        mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService("batteryinfo"));

        mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService(

                BatteryStats.SERVICE_NAME));

        mScreenStats = IPowerManager.Stub.asInterface(ServiceManager.getService(POWER_SERVICE));

        mHandler.sendEmptyMessageDelayed(EVENT_TICK, 1000);

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

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable { 


        addPreferencesFromResource(R.xml.power_usage_summary);

        mBatteryInfo = IBatteryStats.Stub.asInterface(

                ServiceManager.getService("batteryinfo"));

                ServiceManager.getService(BatteryStats.SERVICE_NAME));

        mUm = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);

        mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);

        mBatteryStatusPref = mAppListGroup.findPreference(KEY_BATTERY_STATUS);