am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev

* commit '45245d6117ae484bb84d9afa3fbda36d59886059':
  Fix issue #17671802: "content" command always prints...
This commit is contained in:
Dianne Hackborn
2014-09-26 21:57:49 +00:00
committed by Android Git Automerger
3 changed files with 41 additions and 42 deletions

View File

@@ -48,14 +48,8 @@ interface IBatteryStats {
// Returns -1 if nothing could be computed.
long computeChargeTimeRemaining();
void addIsolatedUid(int isolatedUid, int appUid);
void removeIsolatedUid(int isolatedUid, int appUid);
void noteEvent(int code, String name, int uid);
void noteProcessStart(String name, int uid);
void noteProcessState(String name, int uid, int state);
void noteProcessFinish(String name, int uid);
void noteSyncStart(String name, int uid);
void noteSyncFinish(String name, int uid);
void noteJobStart(String name, int uid);