Merge "BatteryStats: force healthd update on screen on/off"

import android.os.Build;

import android.os.FileUtils;

import android.os.Handler;

import android.os.IBatteryPropertiesRegistrar;

import android.os.Looper;

import android.os.Message;

import android.os.Parcel;

import android.os.ParcelFormatException;

import android.os.Parcelable;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.WorkSource;

        boolean unpluggedScreenOff = unplugged && screenOff;

        if (unpluggedScreenOff != mOnBatteryScreenOffTimeBase.isRunning()) {

            updateKernelWakelocksLocked();

            updateBatteryPropertiesLocked();

            if (DEBUG_ENERGY_CPU) {

                Slog.d(TAG, "Updating cpu time because screen is now " +

                        (unpluggedScreenOff ? "off" : "on"));

        }

    }

    private void updateBatteryPropertiesLocked() {

        try {

            IBatteryPropertiesRegistrar registrar = IBatteryPropertiesRegistrar.Stub.asInterface(

                    ServiceManager.getService("batteryproperties"));

            registrar.scheduleUpdate();

        } catch (RemoteException e) {

            // Ignore.

        }

    }

    public void addIsolatedUidLocked(int isolatedUid, int appUid) {

        mIsolatedUids.put(isolatedUid, appUid);

    }