Merge "Cleanup Binder interface between sensorservice and BatteryStats"

import android.telephony.SignalStrength;

interface IBatteryStats {

    // These first methods are also called by native code, so must

    // be kept in sync with frameworks/native/include/binder/IBatteryStats.h

    void noteStartSensor(int uid, int sensor);

    void noteStopSensor(int uid, int sensor);

    // Remaining methods are only used in Java.

    byte[] getStatistics();

    void noteStartWakelock(int uid, int pid, String name, int type);

    void noteStopWakelock(int uid, int pid, String name, int type);

    /* DO NOT CHANGE the position of noteStartSensor without updating

       SensorService.cpp */

    void noteStartSensor(int uid, int sensor);

    /* DO NOT CHANGE the position of noteStopSensor without updating

       SensorService.cpp */

    void noteStopSensor(int uid, int sensor);

    void noteStartWakelockFromSource(in WorkSource ws, int pid, String name, int type);

    void noteStopWakelockFromSource(in WorkSource ws, int pid, String name, int type);