Merge "TIF: Unhide URI util methods" into nyc-dev
diff --git a/api/current.txt b/api/current.txt
index 486a0f8..9180dab 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -21192,6 +21192,7 @@
method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
method public void setDataSource(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
+ method public void setDataSource(android.content.res.AssetFileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setDataSource(java.io.FileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setDataSource(android.media.MediaDataSource) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
diff --git a/api/system-current.txt b/api/system-current.txt
index faf584e..dc08cd3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -22700,6 +22700,7 @@
method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
method public void setDataSource(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
+ method public void setDataSource(android.content.res.AssetFileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setDataSource(java.io.FileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setDataSource(android.media.MediaDataSource) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
diff --git a/api/test-current.txt b/api/test-current.txt
index a9c3a6a..bad0868 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -21201,6 +21201,7 @@
method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
method public void setDataSource(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
+ method public void setDataSource(android.content.res.AssetFileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setDataSource(java.io.FileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setDataSource(android.media.MediaDataSource) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index a738b2e..8281279 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -623,7 +623,7 @@
/**
* The statistics associated with a particular service.
*/
- public abstract class Serv {
+ public static abstract class Serv {
/**
* Returns the amount of time spent started.
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 0074788..5d78008 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2780,6 +2780,11 @@
*/
public static final Uri DEFAULT_RINGTONE_URI = getUriFor(RINGTONE);
+ /** {@hide} */
+ public static final String RINGTONE_CACHE = "ringtone_cache";
+ /** {@hide} */
+ public static final Uri RINGTONE_CACHE_URI = getUriFor(RINGTONE_CACHE);
+
/**
* Persistent store for the system-wide default notification sound.
*
@@ -2798,6 +2803,11 @@
*/
public static final Uri DEFAULT_NOTIFICATION_URI = getUriFor(NOTIFICATION_SOUND);
+ /** {@hide} */
+ public static final String NOTIFICATION_SOUND_CACHE = "notification_sound_cache";
+ /** {@hide} */
+ public static final Uri NOTIFICATION_SOUND_CACHE_URI = getUriFor(NOTIFICATION_SOUND_CACHE);
+
/**
* Persistent store for the system-wide default alarm alert.
*
@@ -2816,6 +2826,11 @@
*/
public static final Uri DEFAULT_ALARM_ALERT_URI = getUriFor(ALARM_ALERT);
+ /** {@hide} */
+ public static final String ALARM_ALERT_CACHE = "alarm_alert_cache";
+ /** {@hide} */
+ public static final Uri ALARM_ALERT_CACHE_URI = getUriFor(ALARM_ALERT_CACHE);
+
/**
* Persistent store for the system default media button event receiver.
*
diff --git a/core/java/android/view/RenderNode.java b/core/java/android/view/RenderNode.java
index a4cb703..a45c18d 100644
--- a/core/java/android/view/RenderNode.java
+++ b/core/java/android/view/RenderNode.java
@@ -779,7 +779,7 @@
return mOwningView != null && mOwningView.mAttachInfo != null;
}
- public void addAnimator(AnimatedVectorDrawable.VectorDrawableAnimator animatorSet) {
+ public void addAnimator(AnimatedVectorDrawable.VectorDrawableAnimatorRT animatorSet) {
if (mOwningView == null || mOwningView.mAttachInfo == null) {
throw new IllegalStateException("Cannot start this animator on a detached view!");
}
diff --git a/core/java/com/android/internal/app/LocaleHelper.java b/core/java/com/android/internal/app/LocaleHelper.java
index c7459d7..aca93ab 100644
--- a/core/java/com/android/internal/app/LocaleHelper.java
+++ b/core/java/com/android/internal/app/LocaleHelper.java
@@ -16,8 +16,8 @@
package com.android.internal.app;
-import android.icu.util.ULocale;
import android.icu.text.ListFormatter;
+import android.icu.util.ULocale;
import android.util.LocaleList;
import java.text.Collator;
@@ -99,7 +99,7 @@
* @return the localized name of the locale.
*/
public static String getDisplayName(Locale locale, Locale displayLocale, boolean sentenceCase) {
- String result = ULocale.getDisplayName(locale.toLanguageTag(),
+ String result = ULocale.getDisplayNameWithDialect(locale.toLanguageTag(),
ULocale.forLocale(displayLocale));
return sentenceCase ? toSentenceCase(result, displayLocale) : result;
}
@@ -112,7 +112,8 @@
* @return the localized name of the locale.
*/
public static String getDisplayName(Locale locale, boolean sentenceCase) {
- String result = ULocale.getDisplayName(locale.toLanguageTag(), ULocale.getDefault());
+ String result = ULocale.getDisplayNameWithDialect(locale.toLanguageTag(),
+ ULocale.getDefault());
return sentenceCase ? toSentenceCase(result, Locale.getDefault()) : result;
}
@@ -155,7 +156,7 @@
}
ListFormatter lfn = ListFormatter.getInstance(dispLocale);
- return lfn.format(localeNames);
+ return lfn.format((Object[]) localeNames);
}
/**
diff --git a/core/java/com/android/internal/app/SuggestedLocaleAdapter.java b/core/java/com/android/internal/app/SuggestedLocaleAdapter.java
index 478a56d..0d4a5aa 100644
--- a/core/java/com/android/internal/app/SuggestedLocaleAdapter.java
+++ b/core/java/com/android/internal/app/SuggestedLocaleAdapter.java
@@ -23,7 +23,6 @@
import android.widget.BaseAdapter;
import android.widget.Filter;
import android.widget.Filterable;
-import android.widget.ImageView;
import android.widget.TextView;
import com.android.internal.R;
@@ -156,16 +155,9 @@
}
TextView text = (TextView) convertView.findViewById(R.id.locale);
- ImageView localized = (ImageView) convertView.findViewById(R.id.l10nWarn);
LocaleStore.LocaleInfo item = (LocaleStore.LocaleInfo) getItem(position);
text.setText(item.getLabel());
- if (item.isTranslated() || mCountryMode) {
- localized.setVisibility(View.GONE);
- text.setTextLocale(item.getLocale());
- } else {
- localized.setVisibility(View.VISIBLE);
- text.setTextLocale(Locale.getDefault());
- }
+ text.setTextLocale(item.getLocale());
if (mCountryMode) {
int layoutDir = TextUtils.getLayoutDirectionFromLocale(item.getParent());
//noinspection ResourceType
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 648b1a5..d917cdb 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -93,7 +93,7 @@
* battery life. All times are represented in microseconds except where indicated
* otherwise.
*/
-public final class BatteryStatsImpl extends BatteryStats {
+public class BatteryStatsImpl extends BatteryStats {
private static final String TAG = "BatteryStatsImpl";
private static final boolean DEBUG = false;
public static final boolean DEBUG_ENERGY = false;
@@ -126,6 +126,8 @@
// Number of transmit power states the Bluetooth controller can be in.
private static final int NUM_BT_TX_LEVELS = 1;
+ protected Clocks mClocks;
+
private final JournaledFile mFile;
public final AtomicFile mCheckinFile;
public final AtomicFile mDailyFile;
@@ -185,6 +187,21 @@
}
}
+ public interface Clocks {
+ public long elapsedRealtime();
+ public long uptimeMillis();
+ }
+
+ public static class SystemClocks implements Clocks {
+ public long elapsedRealtime() {
+ return SystemClock.elapsedRealtime();
+ }
+
+ public long uptimeMillis() {
+ return SystemClock.uptimeMillis();
+ }
+ }
+
public interface ExternalStatsSync {
public static final int UPDATE_CPU = 0x01;
public static final int UPDATE_WIFI = 0x02;
@@ -236,7 +253,7 @@
// These are the objects that will want to do something when the device
// is unplugged from power.
- final TimeBase mOnBatteryTimeBase = new TimeBase();
+ protected final TimeBase mOnBatteryTimeBase = new TimeBase();
// These are the objects that will want to do something when the device
// is unplugged from power *and* the screen is off.
@@ -541,6 +558,11 @@
}
public BatteryStatsImpl() {
+ this(new SystemClocks());
+ }
+
+ public BatteryStatsImpl(Clocks clocks) {
+ init(clocks);
mFile = null;
mCheckinFile = null;
mDailyFile = null;
@@ -549,25 +571,40 @@
clearHistoryLocked();
}
+ private void init(Clocks clocks) {
+ mClocks = clocks;
+ mMobileNetworkStats = new NetworkStats[] {
+ new NetworkStats(mClocks.elapsedRealtime(), 50),
+ new NetworkStats(mClocks.elapsedRealtime(), 50),
+ new NetworkStats(mClocks.elapsedRealtime(), 50)
+ };
+ mWifiNetworkStats = new NetworkStats[] {
+ new NetworkStats(mClocks.elapsedRealtime(), 50),
+ new NetworkStats(mClocks.elapsedRealtime(), 50),
+ new NetworkStats(mClocks.elapsedRealtime(), 50)
+ };
+ }
+
public static interface TimeBaseObs {
void onTimeStarted(long elapsedRealtime, long baseUptime, long baseRealtime);
void onTimeStopped(long elapsedRealtime, long baseUptime, long baseRealtime);
}
- static class TimeBase {
- private final ArrayList<TimeBaseObs> mObservers = new ArrayList<>();
+ // methods are protected not private to be VisibleForTesting
+ public static class TimeBase {
+ protected final ArrayList<TimeBaseObs> mObservers = new ArrayList<>();
- private long mUptime;
- private long mRealtime;
+ protected long mUptime;
+ protected long mRealtime;
- private boolean mRunning;
+ protected boolean mRunning;
- private long mPastUptime;
- private long mUptimeStart;
- private long mPastRealtime;
- private long mRealtimeStart;
- private long mUnpluggedUptime;
- private long mUnpluggedRealtime;
+ protected long mPastUptime;
+ protected long mUptimeStart;
+ protected long mPastRealtime;
+ protected long mRealtimeStart;
+ protected long mUnpluggedUptime;
+ protected long mUnpluggedRealtime;
public void dump(PrintWriter pw, String prefix) {
StringBuilder sb = new StringBuilder(128);
@@ -608,6 +645,10 @@
}
}
+ public boolean hasObserver(TimeBaseObs observer) {
+ return mObservers.contains(observer);
+ }
+
public void init(long uptime, long realtime) {
mRealtime = 0;
mUptime = 0;
@@ -626,7 +667,10 @@
} else {
mUptimeStart = uptime;
mRealtimeStart = realtime;
+ // TODO: Since mUptimeStart was just reset and we are running, getUptime will
+ // just return mPastUptime. Also, are we sure we don't want to reset that?
mUnpluggedUptime = getUptime(uptime);
+ // TODO: likewise.
mUnpluggedRealtime = getRealtime(realtime);
}
}
@@ -949,13 +993,14 @@
* State for keeping track of timing information.
*/
public static abstract class Timer extends BatteryStats.Timer implements TimeBaseObs {
- final int mType;
- final TimeBase mTimeBase;
+ protected final Clocks mClocks;
+ protected final int mType;
+ protected final TimeBase mTimeBase;
- int mCount;
- int mLoadedCount;
- int mLastCount;
- int mUnpluggedCount;
+ protected int mCount;
+ protected int mLoadedCount;
+ protected int mLastCount;
+ protected int mUnpluggedCount;
// Times are in microseconds for better accuracy when dividing by the
// lock count, and are in "battery realtime" units.
@@ -965,32 +1010,32 @@
* boot, to the last time something interesting happened in the
* current run.
*/
- long mTotalTime;
+ protected long mTotalTime;
/**
* The total time we loaded for the previous runs. Subtract this from
* mTotalTime to find the time for the current run of the system.
*/
- long mLoadedTime;
+ protected long mLoadedTime;
/**
* The run time of the last run of the system, as loaded from the
* saved data.
*/
- long mLastTime;
+ protected long mLastTime;
/**
* The value of mTotalTime when unplug() was last called. Subtract
* this from mTotalTime to find the time since the last unplug from
* power.
*/
- long mUnpluggedTime;
+ protected long mUnpluggedTime;
/**
* The total time this timer has been running until the latest mark has been set.
* Subtract this from mTotalTime to get the time spent running since the mark was set.
*/
- long mTimeBeforeMark;
+ protected long mTimeBeforeMark;
/**
* Constructs from a parcel.
@@ -998,7 +1043,8 @@
* @param timeBase
* @param in
*/
- Timer(int type, TimeBase timeBase, Parcel in) {
+ public Timer(Clocks clocks, int type, TimeBase timeBase, Parcel in) {
+ mClocks = clocks;
mType = type;
mTimeBase = timeBase;
@@ -1015,7 +1061,8 @@
if (DEBUG) Log.i(TAG, "**** READ TIMER #" + mType + ": mTotalTime=" + mTotalTime);
}
- Timer(int type, TimeBase timeBase) {
+ public Timer(Clocks clocks, int type, TimeBase timeBase) {
+ mClocks = clocks;
mType = type;
mTimeBase = timeBase;
timeBase.add(this);
@@ -1029,7 +1076,7 @@
* Clear state of this timer. Returns true if the timer is inactive
* so can be completely dropped.
*/
- boolean reset(boolean detachIfReset) {
+ public boolean reset(boolean detachIfReset) {
mTotalTime = mLoadedTime = mLastTime = mTimeBeforeMark = 0;
mCount = mLoadedCount = mLastCount = 0;
if (detachIfReset) {
@@ -1038,7 +1085,7 @@
return true;
}
- void detach() {
+ public void detach() {
mTimeBase.remove(this);
}
@@ -1142,13 +1189,13 @@
}
- void writeSummaryFromParcelLocked(Parcel out, long elapsedRealtimeUs) {
+ public void writeSummaryFromParcelLocked(Parcel out, long elapsedRealtimeUs) {
long runTime = computeRunTimeLocked(mTimeBase.getRealtime(elapsedRealtimeUs));
out.writeLong(runTime);
out.writeInt(mCount);
}
- void readSummaryFromParcelLocked(Parcel in) {
+ public void readSummaryFromParcelLocked(Parcel in) {
// Multiply by 1000 for backwards compatibility
mTotalTime = mLoadedTime = in.readLong();
mLastTime = 0;
@@ -1162,7 +1209,7 @@
}
}
- public static final class SamplingTimer extends Timer {
+ public static class SamplingTimer extends Timer {
/**
* The most recent reported count from /proc/wakelocks.
@@ -1202,8 +1249,8 @@
*/
int mUpdateVersion;
- SamplingTimer(TimeBase timeBase, Parcel in) {
- super(0, timeBase, in);
+ SamplingTimer(Clocks clocks, TimeBase timeBase, Parcel in) {
+ super(clocks, 0, timeBase, in);
mCurrentReportedCount = in.readInt();
mUnpluggedReportedCount = in.readInt();
mCurrentReportedTotalTime = in.readLong();
@@ -1212,8 +1259,8 @@
mTimeBaseRunning = timeBase.isRunning();
}
- SamplingTimer(TimeBase timeBase, boolean trackReportedValues) {
- super(0, timeBase);
+ SamplingTimer(Clocks clocks, TimeBase timeBase, boolean trackReportedValues) {
+ super(clocks, 0, timeBase);
mTrackingReportedValues = trackReportedValues;
mTimeBaseRunning = timeBase.isRunning();
}
@@ -1301,20 +1348,20 @@
out.writeInt(mTrackingReportedValues ? 1 : 0);
}
- boolean reset(boolean detachIfReset) {
+ public boolean reset(boolean detachIfReset) {
super.reset(detachIfReset);
setStale();
return true;
}
- void writeSummaryFromParcelLocked(Parcel out, long batteryRealtime) {
+ public void writeSummaryFromParcelLocked(Parcel out, long batteryRealtime) {
super.writeSummaryFromParcelLocked(out, batteryRealtime);
out.writeLong(mCurrentReportedTotalTime);
out.writeInt(mCurrentReportedCount);
out.writeInt(mTrackingReportedValues ? 1 : 0);
}
- void readSummaryFromParcelLocked(Parcel in) {
+ public void readSummaryFromParcelLocked(Parcel in) {
super.readSummaryFromParcelLocked(in);
mUnpluggedReportedTotalTime = mCurrentReportedTotalTime = in.readLong();
mUnpluggedReportedCount = mCurrentReportedCount = in.readInt();
@@ -1326,7 +1373,7 @@
* A timer that increments in batches. It does not run for durations, but just jumps
* for a pre-determined amount.
*/
- public static final class BatchTimer extends Timer {
+ public static class BatchTimer extends Timer {
final Uid mUid;
/**
@@ -1344,16 +1391,16 @@
*/
boolean mInDischarge;
- BatchTimer(Uid uid, int type, TimeBase timeBase, Parcel in) {
- super(type, timeBase, in);
+ BatchTimer(Clocks clocks, Uid uid, int type, TimeBase timeBase, Parcel in) {
+ super(clocks, type, timeBase, in);
mUid = uid;
mLastAddedTime = in.readLong();
mLastAddedDuration = in.readLong();
mInDischarge = timeBase.isRunning();
}
- BatchTimer(Uid uid, int type, TimeBase timeBase) {
- super(type, timeBase);
+ BatchTimer(Clocks clocks, Uid uid, int type, TimeBase timeBase) {
+ super(clocks, type, timeBase);
mUid = uid;
mInDischarge = timeBase.isRunning();
}
@@ -1367,7 +1414,7 @@
@Override
public void onTimeStopped(long elapsedRealtime, long baseUptime, long baseRealtime) {
- recomputeLastDuration(SystemClock.elapsedRealtime() * 1000, false);
+ recomputeLastDuration(mClocks.elapsedRealtime() * 1000, false);
mInDischarge = false;
super.onTimeStopped(elapsedRealtime, baseUptime, baseRealtime);
}
@@ -1416,7 +1463,7 @@
}
public void addDuration(BatteryStatsImpl stats, long durationMillis) {
- final long now = SystemClock.elapsedRealtime() * 1000;
+ final long now = mClocks.elapsedRealtime() * 1000;
recomputeLastDuration(now, true);
mLastAddedTime = now;
mLastAddedDuration = durationMillis * 1000;
@@ -1427,7 +1474,7 @@
}
public void abortLastDuration(BatteryStatsImpl stats) {
- final long now = SystemClock.elapsedRealtime() * 1000;
+ final long now = mClocks.elapsedRealtime() * 1000;
recomputeLastDuration(now, true);
}
@@ -1438,7 +1485,7 @@
@Override
protected long computeRunTimeLocked(long curBatteryRealtime) {
- final long overage = computeOverage(SystemClock.elapsedRealtime() * 1000);
+ final long overage = computeOverage(mClocks.elapsedRealtime() * 1000);
if (overage > 0) {
return mTotalTime = overage;
}
@@ -1446,8 +1493,8 @@
}
@Override
- boolean reset(boolean detachIfReset) {
- final long now = SystemClock.elapsedRealtime() * 1000;
+ public boolean reset(boolean detachIfReset) {
+ final long now = mClocks.elapsedRealtime() * 1000;
recomputeLastDuration(now, true);
boolean stillActive = mLastAddedTime == now;
super.reset(!stillActive && detachIfReset);
@@ -1458,7 +1505,7 @@
/**
* State for keeping track of timing information.
*/
- public static final class StopwatchTimer extends Timer {
+ public static class StopwatchTimer extends Timer {
final Uid mUid;
final ArrayList<StopwatchTimer> mTimerPool;
@@ -1485,22 +1532,22 @@
*/
boolean mInList;
- StopwatchTimer(Uid uid, int type, ArrayList<StopwatchTimer> timerPool,
+ public StopwatchTimer(Clocks clocks, Uid uid, int type, ArrayList<StopwatchTimer> timerPool,
TimeBase timeBase, Parcel in) {
- super(type, timeBase, in);
+ super(clocks, type, timeBase, in);
mUid = uid;
mTimerPool = timerPool;
mUpdateTime = in.readLong();
}
- StopwatchTimer(Uid uid, int type, ArrayList<StopwatchTimer> timerPool,
+ public StopwatchTimer(Clocks clocks, Uid uid, int type, ArrayList<StopwatchTimer> timerPool,
TimeBase timeBase) {
- super(type, timeBase);
+ super(clocks, type, timeBase);
mUid = uid;
mTimerPool = timerPool;
}
- void setTimeout(long timeout) {
+ public void setTimeout(long timeout) {
mTimeout = timeout;
}
@@ -1528,7 +1575,7 @@
+ " mAcquireTime=" + mAcquireTime);
}
- void startRunningLocked(long elapsedRealtimeMs) {
+ public void startRunningLocked(long elapsedRealtimeMs) {
if (mNesting++ == 0) {
final long batteryRealtime = mTimeBase.getRealtime(elapsedRealtimeMs * 1000);
mUpdateTime = batteryRealtime;
@@ -1550,11 +1597,11 @@
}
}
- boolean isRunningLocked() {
+ public boolean isRunningLocked() {
return mNesting > 0;
}
- void stopRunningLocked(long elapsedRealtimeMs) {
+ public void stopRunningLocked(long elapsedRealtimeMs) {
// Ignore attempt to stop a timer that isn't running
if (mNesting == 0) {
return;
@@ -1587,7 +1634,7 @@
}
}
- void stopAllRunningLocked(long elapsedRealtimeMs) {
+ public void stopAllRunningLocked(long elapsedRealtimeMs) {
if (mNesting > 0) {
mNesting = 1;
stopRunningLocked(elapsedRealtimeMs);
@@ -1632,18 +1679,18 @@
}
@Override
- boolean reset(boolean detachIfReset) {
+ public boolean reset(boolean detachIfReset) {
boolean canDetach = mNesting <= 0;
super.reset(canDetach && detachIfReset);
if (mNesting > 0) {
- mUpdateTime = mTimeBase.getRealtime(SystemClock.elapsedRealtime() * 1000);
+ mUpdateTime = mTimeBase.getRealtime(mClocks.elapsedRealtime() * 1000);
}
mAcquireTime = mTotalTime;
return canDetach;
}
@Override
- void detach() {
+ public void detach() {
super.detach();
if (mTimerPool != null) {
mTimerPool.remove(this);
@@ -1651,7 +1698,7 @@
}
@Override
- void readSummaryFromParcelLocked(Parcel in) {
+ public void readSummaryFromParcelLocked(Parcel in) {
super.readSummaryFromParcelLocked(in);
mNesting = 0;
}
@@ -1943,7 +1990,7 @@
public SamplingTimer getWakeupReasonTimerLocked(String name) {
SamplingTimer timer = mWakeupReasonStats.get(name);
if (timer == null) {
- timer = new SamplingTimer(mOnBatteryTimeBase, true);
+ timer = new SamplingTimer(mClocks, mOnBatteryTimeBase, true);
mWakeupReasonStats.put(name, timer);
}
return timer;
@@ -1956,7 +2003,8 @@
public SamplingTimer getKernelWakelockTimerLocked(String name) {
SamplingTimer kwlt = mKernelWakelockStats.get(name);
if (kwlt == null) {
- kwlt = new SamplingTimer(mOnBatteryScreenOffTimeBase, true /* track reported values */);
+ kwlt = new SamplingTimer(mClocks, mOnBatteryScreenOffTimeBase,
+ true /* track reported values */);
mKernelWakelockStats.put(name, kwlt);
}
return kwlt;
@@ -2729,8 +2777,8 @@
if (!mActiveEvents.updateState(code, name, uid, 0)) {
return;
}
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
addHistoryEventLocked(elapsedRealtime, uptime, code, name, uid);
}
@@ -2740,7 +2788,7 @@
// If the start clock time has changed by more than a year, then presumably
// the previous time was completely bogus. So we are going to figure out a
// new time based on how much time has elapsed since we started counting.
- mStartClockTime = currentTime - (SystemClock.elapsedRealtime()-(mRealtimeStart/1000));
+ mStartClockTime = currentTime - (mClocks.elapsedRealtime()-(mRealtimeStart/1000));
return true;
}
return false;
@@ -2748,8 +2796,8 @@
public void noteCurrentTimeChangedLocked() {
final long currentTime = System.currentTimeMillis();
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
recordCurrentTimeChangeLocked(currentTime, elapsedRealtime, uptime);
ensureStartClockTime(currentTime);
}
@@ -2766,8 +2814,8 @@
if (!mRecordAllHistory) {
return;
}
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_PROC_START, name, uid);
}
@@ -2800,15 +2848,15 @@
if (!mRecordAllHistory) {
return;
}
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_PROC_FINISH, name, uid);
}
public void noteSyncStartLocked(String name, int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
getUidStatsLocked(uid).noteStartSyncLocked(name, elapsedRealtime);
if (!mActiveEvents.updateState(HistoryItem.EVENT_SYNC_START, name, uid, 0)) {
return;
@@ -2818,8 +2866,8 @@
public void noteSyncFinishLocked(String name, int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
getUidStatsLocked(uid).noteStopSyncLocked(name, elapsedRealtime);
if (!mActiveEvents.updateState(HistoryItem.EVENT_SYNC_FINISH, name, uid, 0)) {
return;
@@ -2829,8 +2877,8 @@
public void noteJobStartLocked(String name, int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
getUidStatsLocked(uid).noteStartJobLocked(name, elapsedRealtime);
if (!mActiveEvents.updateState(HistoryItem.EVENT_JOB_START, name, uid, 0)) {
return;
@@ -2840,8 +2888,8 @@
public void noteJobFinishLocked(String name, int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
getUidStatsLocked(uid).noteStopJobLocked(name, elapsedRealtime);
if (!mActiveEvents.updateState(HistoryItem.EVENT_JOB_FINISH, name, uid, 0)) {
return;
@@ -2854,8 +2902,8 @@
return;
}
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (!mActiveEvents.updateState(HistoryItem.EVENT_ALARM_START, name, uid, 0)) {
return;
}
@@ -2867,8 +2915,8 @@
return;
}
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (!mActiveEvents.updateState(HistoryItem.EVENT_ALARM_FINISH, name, uid, 0)) {
return;
}
@@ -2898,8 +2946,8 @@
HashMap<String, SparseIntArray> active = mActiveEvents.getStateForEvent(
HistoryItem.EVENT_PROC);
if (active != null) {
- long mSecRealtime = SystemClock.elapsedRealtime();
- final long mSecUptime = SystemClock.uptimeMillis();
+ long mSecRealtime = mClocks.elapsedRealtime();
+ final long mSecUptime = mClocks.uptimeMillis();
for (HashMap.Entry<String, SparseIntArray> ent : active.entrySet()) {
SparseIntArray uids = ent.getValue();
for (int j=0; j<uids.size(); j++) {
@@ -2913,8 +2961,8 @@
HashMap<String, SparseIntArray> active = mActiveEvents.getStateForEvent(
HistoryItem.EVENT_PROC);
if (active != null) {
- long mSecRealtime = SystemClock.elapsedRealtime();
- final long mSecUptime = SystemClock.uptimeMillis();
+ long mSecRealtime = mClocks.elapsedRealtime();
+ final long mSecUptime = mClocks.uptimeMillis();
for (HashMap.Entry<String, SparseIntArray> ent : active.entrySet()) {
SparseIntArray uids = ent.getValue();
for (int j=0; j<uids.size(); j++) {
@@ -3023,8 +3071,8 @@
public void noteStartWakeFromSourceLocked(WorkSource ws, int pid, String name,
String historyName, int type, boolean unimportantForLogging) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
final int N = ws.size();
for (int i=0; i<N; i++) {
noteStartWakeLocked(ws.get(i), pid, name, historyName, type, unimportantForLogging,
@@ -3035,8 +3083,8 @@
public void noteChangeWakelockFromSourceLocked(WorkSource ws, int pid, String name,
String historyName, int type, WorkSource newWs, int newPid, String newName,
String newHistoryName, int newType, boolean newUnimportantForLogging) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
// For correct semantics, we start the need worksources first, so that we won't
// make inappropriate history items as if all wake locks went away and new ones
// appeared. This is okay because tracking of wake locks allows nesting.
@@ -3053,8 +3101,8 @@
public void noteStopWakeFromSourceLocked(WorkSource ws, int pid, String name,
String historyName, int type) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
final int N = ws.size();
for (int i=0; i<N; i++) {
noteStopWakeLocked(ws.get(i), pid, name, historyName, type, elapsedRealtime, uptime);
@@ -3072,8 +3120,8 @@
}
public void noteWakeupReasonLocked(String reason) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (DEBUG_HISTORY) Slog.v(TAG, "Wakeup reason \"" + reason +"\": "
+ Integer.toHexString(mHistoryCur.states));
aggregateLastWakeupUptimeLocked(uptime);
@@ -3147,8 +3195,8 @@
public void noteStartSensorLocked(int uid, int sensor) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mSensorNesting == 0) {
mHistoryCur.states |= HistoryItem.STATE_SENSOR_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Start sensor to: "
@@ -3161,8 +3209,8 @@
public void noteStopSensorLocked(int uid, int sensor) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mSensorNesting--;
if (mSensorNesting == 0) {
mHistoryCur.states &= ~HistoryItem.STATE_SENSOR_ON_FLAG;
@@ -3177,8 +3225,8 @@
public void noteStartGpsLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mGpsNesting == 0) {
mHistoryCur.states |= HistoryItem.STATE_GPS_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Start GPS to: "
@@ -3191,8 +3239,8 @@
public void noteStopGpsLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mGpsNesting--;
if (mGpsNesting == 0) {
mHistoryCur.states &= ~HistoryItem.STATE_GPS_ON_FLAG;
@@ -3223,8 +3271,8 @@
if (state == Display.STATE_ON) {
// Screen turning on.
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mHistoryCur.states |= HistoryItem.STATE_SCREEN_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Screen on to: "
+ Integer.toHexString(mHistoryCur.states));
@@ -3235,7 +3283,7 @@
}
updateTimeBasesLocked(mOnBatteryTimeBase.isRunning(), false,
- SystemClock.uptimeMillis() * 1000, elapsedRealtime * 1000);
+ mClocks.uptimeMillis() * 1000, elapsedRealtime * 1000);
// Fake a wake lock, so we consider the device waked as long
// as the screen is on.
@@ -3248,8 +3296,8 @@
}
} else if (oldState == Display.STATE_ON) {
// Screen turning off or dozing.
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mHistoryCur.states &= ~HistoryItem.STATE_SCREEN_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Screen off to: "
+ Integer.toHexString(mHistoryCur.states));
@@ -3263,7 +3311,7 @@
elapsedRealtime, uptime);
updateTimeBasesLocked(mOnBatteryTimeBase.isRunning(), true,
- SystemClock.uptimeMillis() * 1000, elapsedRealtime * 1000);
+ mClocks.uptimeMillis() * 1000, elapsedRealtime * 1000);
// Update discharge amounts.
if (mOnBatteryInternal) {
@@ -3279,8 +3327,8 @@
if (bin < 0) bin = 0;
else if (bin >= NUM_SCREEN_BRIGHTNESS_BINS) bin = NUM_SCREEN_BRIGHTNESS_BINS-1;
if (mScreenBrightnessBin != bin) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mHistoryCur.states = (mHistoryCur.states&~HistoryItem.STATE_BRIGHTNESS_MASK)
| (bin << HistoryItem.STATE_BRIGHTNESS_SHIFT);
if (DEBUG_HISTORY) Slog.v(TAG, "Screen brightness " + bin + " to: "
@@ -3304,15 +3352,15 @@
}
public void noteWakeUpLocked(String reason, int reasonUid) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_SCREEN_WAKE_UP,
reason, reasonUid);
}
public void noteInteractiveLocked(boolean interactive) {
if (mInteractive != interactive) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
mInteractive = interactive;
if (DEBUG) Slog.v(TAG, "Interactive: " + interactive);
if (interactive) {
@@ -3324,16 +3372,16 @@
}
public void noteConnectivityChangedLocked(int type, String extra) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_CONNECTIVITY_CHANGED,
extra, type);
mNumConnectivityChange++;
}
public void noteMobileRadioPowerState(int powerState, long timestampNs) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mMobileRadioPowerState != powerState) {
long realElapsedRealtimeMs;
final boolean active =
@@ -3375,8 +3423,8 @@
int stepState = enabled ? STEP_LEVEL_MODE_POWER_SAVE : 0;
mModStepMode |= (mCurStepMode&STEP_LEVEL_MODE_POWER_SAVE) ^ stepState;
mCurStepMode = (mCurStepMode&~STEP_LEVEL_MODE_POWER_SAVE) | stepState;
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mPowerSaveModeEnabled = enabled;
if (enabled) {
mHistoryCur.states2 |= HistoryItem.STATE2_POWER_SAVE_FLAG;
@@ -3394,8 +3442,8 @@
}
public void noteDeviceIdleModeLocked(int mode, String activeReason, int activeUid) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
boolean nowIdling = mode == DEVICE_IDLE_MODE_FULL;
if (mDeviceIdling && !nowIdling && activeReason == null) {
// We don't go out of general idling mode until explicitly taken out of
@@ -3460,8 +3508,8 @@
}
public void notePackageInstalledLocked(String pkgName, int versionCode) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_PACKAGE_INSTALLED,
pkgName, versionCode);
PackageChange pc = new PackageChange();
@@ -3472,8 +3520,8 @@
}
public void notePackageUninstalledLocked(String pkgName) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_PACKAGE_UNINSTALLED,
pkgName, 0);
PackageChange pc = new PackageChange();
@@ -3491,8 +3539,8 @@
public void notePhoneOnLocked() {
if (!mPhoneOn) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mHistoryCur.states2 |= HistoryItem.STATE2_PHONE_IN_CALL_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Phone on to: "
+ Integer.toHexString(mHistoryCur.states));
@@ -3504,8 +3552,8 @@
public void notePhoneOffLocked() {
if (mPhoneOn) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mHistoryCur.states2 &= ~HistoryItem.STATE2_PHONE_IN_CALL_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Phone off to: "
+ Integer.toHexString(mHistoryCur.states));
@@ -3516,7 +3564,7 @@
}
void stopAllPhoneSignalStrengthTimersLocked(int except) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
for (int i = 0; i < SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {
if (i == except) {
continue;
@@ -3548,8 +3596,8 @@
mPhoneSimStateRaw = simState;
mPhoneSignalStrengthBinRaw = strengthBin;
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (simState == TelephonyManager.SIM_STATE_ABSENT) {
// In this case we will always be STATE_OUT_OF_SERVICE, so need
@@ -3697,8 +3745,8 @@
}
if (DEBUG) Log.i(TAG, "Phone Data Connection -> " + dataType + " = " + hasData);
if (mPhoneDataConnectionType != bin) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mHistoryCur.states = (mHistoryCur.states&~HistoryItem.STATE_DATA_CONNECTION_MASK)
| (bin << HistoryItem.STATE_DATA_CONNECTION_SHIFT);
if (DEBUG_HISTORY) Slog.v(TAG, "Data connection " + bin + " to: "
@@ -3715,8 +3763,8 @@
public void noteWifiOnLocked() {
if (!mWifiOn) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mHistoryCur.states2 |= HistoryItem.STATE2_WIFI_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "WIFI on to: "
+ Integer.toHexString(mHistoryCur.states));
@@ -3728,8 +3776,8 @@
}
public void noteWifiOffLocked() {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mWifiOn) {
mHistoryCur.states2 &= ~HistoryItem.STATE2_WIFI_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "WIFI off to: "
@@ -3743,8 +3791,8 @@
public void noteAudioOnLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mAudioOnNesting == 0) {
mHistoryCur.states |= HistoryItem.STATE_AUDIO_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Audio on to: "
@@ -3761,8 +3809,8 @@
return;
}
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (--mAudioOnNesting == 0) {
mHistoryCur.states &= ~HistoryItem.STATE_AUDIO_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Audio off to: "
@@ -3775,8 +3823,8 @@
public void noteVideoOnLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mVideoOnNesting == 0) {
mHistoryCur.states2 |= HistoryItem.STATE2_VIDEO_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Video on to: "
@@ -3793,8 +3841,8 @@
return;
}
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (--mVideoOnNesting == 0) {
mHistoryCur.states2 &= ~HistoryItem.STATE2_VIDEO_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Video off to: "
@@ -3807,8 +3855,8 @@
public void noteResetAudioLocked() {
if (mAudioOnNesting > 0) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mAudioOnNesting = 0;
mHistoryCur.states &= ~HistoryItem.STATE_AUDIO_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Audio off to: "
@@ -3824,8 +3872,8 @@
public void noteResetVideoLocked() {
if (mVideoOnNesting > 0) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mAudioOnNesting = 0;
mHistoryCur.states2 &= ~HistoryItem.STATE2_VIDEO_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Video off to: "
@@ -3841,12 +3889,12 @@
public void noteActivityResumedLocked(int uid) {
uid = mapUid(uid);
- getUidStatsLocked(uid).noteActivityResumedLocked(SystemClock.elapsedRealtime());
+ getUidStatsLocked(uid).noteActivityResumedLocked(mClocks.elapsedRealtime());
}
public void noteActivityPausedLocked(int uid) {
uid = mapUid(uid);
- getUidStatsLocked(uid).noteActivityPausedLocked(SystemClock.elapsedRealtime());
+ getUidStatsLocked(uid).noteActivityPausedLocked(mClocks.elapsedRealtime());
}
public void noteVibratorOnLocked(int uid, long durationMillis) {
@@ -3861,8 +3909,8 @@
public void noteFlashlightOnLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mFlashlightOnNesting++ == 0) {
mHistoryCur.states2 |= HistoryItem.STATE2_FLASHLIGHT_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Flashlight on to: "
@@ -3878,8 +3926,8 @@
return;
}
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (--mFlashlightOnNesting == 0) {
mHistoryCur.states2 &= ~HistoryItem.STATE2_FLASHLIGHT_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Flashlight off to: "
@@ -3892,8 +3940,8 @@
public void noteCameraOnLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mCameraOnNesting++ == 0) {
mHistoryCur.states2 |= HistoryItem.STATE2_CAMERA_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Camera on to: "
@@ -3909,8 +3957,8 @@
return;
}
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (--mCameraOnNesting == 0) {
mHistoryCur.states2 &= ~HistoryItem.STATE2_CAMERA_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Camera off to: "
@@ -3923,8 +3971,8 @@
public void noteResetCameraLocked() {
if (mCameraOnNesting > 0) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mCameraOnNesting = 0;
mHistoryCur.states2 &= ~HistoryItem.STATE2_CAMERA_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Camera off to: "
@@ -3940,8 +3988,8 @@
public void noteResetFlashlightLocked() {
if (mFlashlightOnNesting > 0) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mFlashlightOnNesting = 0;
mHistoryCur.states2 &= ~HistoryItem.STATE2_FLASHLIGHT_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "Flashlight off to: "
@@ -4015,8 +4063,8 @@
}
public void noteWifiRadioPowerState(int powerState, long timestampNs) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mWifiRadioPowerState != powerState) {
final boolean active =
powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_MEDIUM
@@ -4035,8 +4083,8 @@
public void noteWifiRunningLocked(WorkSource ws) {
if (!mGlobalWifiRunning) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mHistoryCur.states2 |= HistoryItem.STATE2_WIFI_RUNNING_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "WIFI running to: "
+ Integer.toHexString(mHistoryCur.states));
@@ -4056,7 +4104,7 @@
public void noteWifiRunningChangedLocked(WorkSource oldWs, WorkSource newWs) {
if (mGlobalWifiRunning) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
int N = oldWs.size();
for (int i=0; i<N; i++) {
int uid = mapUid(oldWs.get(i));
@@ -4074,8 +4122,8 @@
public void noteWifiStoppedLocked(WorkSource ws) {
if (mGlobalWifiRunning) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mHistoryCur.states2 &= ~HistoryItem.STATE2_WIFI_RUNNING_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "WIFI stopped to: "
+ Integer.toHexString(mHistoryCur.states));
@@ -4096,7 +4144,7 @@
public void noteWifiStateLocked(int wifiState, String accessPoint) {
if (DEBUG) Log.i(TAG, "WiFi state -> " + wifiState);
if (mWifiState != wifiState) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
if (mWifiState >= 0) {
mWifiStateTimer[mWifiState].stopRunningLocked(elapsedRealtime);
}
@@ -4109,8 +4157,8 @@
public void noteWifiSupplicantStateChangedLocked(int supplState, boolean failedAuth) {
if (DEBUG) Log.i(TAG, "WiFi suppl state -> " + supplState);
if (mWifiSupplState != supplState) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mWifiSupplState >= 0) {
mWifiSupplStateTimer[mWifiSupplState].stopRunningLocked(elapsedRealtime);
}
@@ -4126,7 +4174,7 @@
}
void stopAllWifiSignalStrengthTimersLocked(int except) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
for (int i = 0; i < NUM_WIFI_SIGNAL_STRENGTH_BINS; i++) {
if (i == except) {
continue;
@@ -4141,8 +4189,8 @@
int strengthBin = WifiManager.calculateSignalLevel(newRssi, NUM_WIFI_SIGNAL_STRENGTH_BINS);
if (DEBUG) Log.i(TAG, "WiFi rssi -> " + newRssi + " bin=" + strengthBin);
if (mWifiSignalStrengthBin != strengthBin) {
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mWifiSignalStrengthBin >= 0) {
mWifiSignalStrengthsTimer[mWifiSignalStrengthBin].stopRunningLocked(
elapsedRealtime);
@@ -4168,8 +4216,8 @@
public void noteFullWifiLockAcquiredLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mWifiFullLockNesting == 0) {
mHistoryCur.states |= HistoryItem.STATE_WIFI_FULL_LOCK_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "WIFI full lock on to: "
@@ -4182,8 +4230,8 @@
public void noteFullWifiLockReleasedLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mWifiFullLockNesting--;
if (mWifiFullLockNesting == 0) {
mHistoryCur.states &= ~HistoryItem.STATE_WIFI_FULL_LOCK_FLAG;
@@ -4198,8 +4246,8 @@
public void noteWifiScanStartedLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mWifiScanNesting == 0) {
mHistoryCur.states |= HistoryItem.STATE_WIFI_SCAN_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "WIFI scan started for: "
@@ -4212,8 +4260,8 @@
public void noteWifiScanStoppedLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mWifiScanNesting--;
if (mWifiScanNesting == 0) {
mHistoryCur.states &= ~HistoryItem.STATE_WIFI_SCAN_FLAG;
@@ -4226,13 +4274,13 @@
public void noteWifiBatchedScanStartedLocked(int uid, int csph) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
getUidStatsLocked(uid).noteWifiBatchedScanStartedLocked(csph, elapsedRealtime);
}
public void noteWifiBatchedScanStoppedLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
getUidStatsLocked(uid).noteWifiBatchedScanStoppedLocked(elapsedRealtime);
}
@@ -4240,8 +4288,8 @@
public void noteWifiMulticastEnabledLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (mWifiMulticastNesting == 0) {
mHistoryCur.states |= HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG;
if (DEBUG_HISTORY) Slog.v(TAG, "WIFI multicast on to: "
@@ -4254,8 +4302,8 @@
public void noteWifiMulticastDisabledLocked(int uid) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
mWifiMulticastNesting--;
if (mWifiMulticastNesting == 0) {
mHistoryCur.states &= ~HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG;
@@ -4369,7 +4417,7 @@
// During device boot, qtaguid isn't enabled until after the inital
// loading of battery stats. Now that they're enabled, take our initial
// snapshot for future delta calculation.
- updateMobileRadioStateLocked(SystemClock.elapsedRealtime(), null);
+ updateMobileRadioStateLocked(mClocks.elapsedRealtime(), null);
updateWifiStateLocked(null);
}
@@ -4623,8 +4671,8 @@
@Override public long getStartClockTime() {
final long currentTime = System.currentTimeMillis();
if (ensureStartClockTime(currentTime)) {
- recordCurrentTimeChangeLocked(currentTime, SystemClock.elapsedRealtime(),
- SystemClock.uptimeMillis());
+ recordCurrentTimeChangeLocked(currentTime, mClocks.elapsedRealtime(),
+ mClocks.uptimeMillis());
}
return mStartClockTime;
}
@@ -4652,7 +4700,11 @@
/**
* The statistics associated with a particular uid.
*/
- public final class Uid extends BatteryStats.Uid {
+ public static class Uid extends BatteryStats.Uid {
+ /**
+ * BatteryStatsImpl that we are associated with.
+ */
+ protected BatteryStatsImpl mBsi;
final int mUid;
@@ -4717,35 +4769,25 @@
long mCurStepUserTime;
long mCurStepSystemTime;
- LongSamplingCounter mUserCpuTime = new LongSamplingCounter(mOnBatteryTimeBase);
- LongSamplingCounter mSystemCpuTime = new LongSamplingCounter(mOnBatteryTimeBase);
- LongSamplingCounter mCpuPower = new LongSamplingCounter(mOnBatteryTimeBase);
+ LongSamplingCounter mUserCpuTime;
+ LongSamplingCounter mSystemCpuTime;
+ LongSamplingCounter mCpuPower;
LongSamplingCounter[][] mCpuClusterSpeed;
/**
* The statistics we have collected for this uid's wake locks.
*/
- final OverflowArrayMap<Wakelock> mWakelockStats = new OverflowArrayMap<Wakelock>() {
- @Override public Wakelock instantiateObject() { return new Wakelock(); }
- };
+ final OverflowArrayMap<Wakelock> mWakelockStats;
/**
* The statistics we have collected for this uid's syncs.
*/
- final OverflowArrayMap<StopwatchTimer> mSyncStats = new OverflowArrayMap<StopwatchTimer>() {
- @Override public StopwatchTimer instantiateObject() {
- return new StopwatchTimer(Uid.this, SYNC, null, mOnBatteryTimeBase);
- }
- };
+ final OverflowArrayMap<StopwatchTimer> mSyncStats;
/**
* The statistics we have collected for this uid's jobs.
*/
- final OverflowArrayMap<StopwatchTimer> mJobStats = new OverflowArrayMap<StopwatchTimer>() {
- @Override public StopwatchTimer instantiateObject() {
- return new StopwatchTimer(Uid.this, JOB, null, mOnBatteryTimeBase);
- }
- };
+ final OverflowArrayMap<StopwatchTimer> mJobStats;
/**
* The statistics we have collected for this uid's sensor activations.
@@ -4767,17 +4809,41 @@
*/
final SparseArray<Pid> mPids = new SparseArray<>();
- public Uid(int uid) {
+ public Uid(BatteryStatsImpl bsi, int uid) {
+ mBsi = bsi;
mUid = uid;
- mWifiRunningTimer = new StopwatchTimer(Uid.this, WIFI_RUNNING,
- mWifiRunningTimers, mOnBatteryTimeBase);
- mFullWifiLockTimer = new StopwatchTimer(Uid.this, FULL_WIFI_LOCK,
- mFullWifiLockTimers, mOnBatteryTimeBase);
- mWifiScanTimer = new StopwatchTimer(Uid.this, WIFI_SCAN,
- mWifiScanTimers, mOnBatteryTimeBase);
+
+ mUserCpuTime = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
+ mSystemCpuTime = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
+ mCpuPower = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
+
+ mWakelockStats = mBsi.new OverflowArrayMap<Wakelock>() {
+ @Override public Wakelock instantiateObject() {
+ return new Wakelock(mBsi, Uid.this);
+ }
+ };
+ mSyncStats = mBsi.new OverflowArrayMap<StopwatchTimer>() {
+ @Override public StopwatchTimer instantiateObject() {
+ return new StopwatchTimer(mBsi.mClocks, Uid.this, SYNC, null,
+ mBsi.mOnBatteryTimeBase);
+ }
+ };
+ mJobStats = mBsi.new OverflowArrayMap<StopwatchTimer>() {
+ @Override public StopwatchTimer instantiateObject() {
+ return new StopwatchTimer(mBsi.mClocks, Uid.this, JOB, null,
+ mBsi.mOnBatteryTimeBase);
+ }
+ };
+
+ mWifiRunningTimer = new StopwatchTimer(mBsi.mClocks, this, WIFI_RUNNING,
+ mBsi.mWifiRunningTimers, mBsi.mOnBatteryTimeBase);
+ mFullWifiLockTimer = new StopwatchTimer(mBsi.mClocks, this, FULL_WIFI_LOCK,
+ mBsi.mFullWifiLockTimers, mBsi.mOnBatteryTimeBase);
+ mWifiScanTimer = new StopwatchTimer(mBsi.mClocks, this, WIFI_SCAN,
+ mBsi.mWifiScanTimers, mBsi.mOnBatteryTimeBase);
mWifiBatchedScanTimer = new StopwatchTimer[NUM_WIFI_BATCHED_SCAN_BINS];
- mWifiMulticastTimer = new StopwatchTimer(Uid.this, WIFI_MULTICAST_ENABLED,
- mWifiMulticastTimers, mOnBatteryTimeBase);
+ mWifiMulticastTimer = new StopwatchTimer(mBsi.mClocks, this, WIFI_MULTICAST_ENABLED,
+ mBsi.mWifiMulticastTimers, mBsi.mOnBatteryTimeBase);
mProcessStateTimer = new StopwatchTimer[NUM_PROCESS_STATE];
}
@@ -4821,8 +4887,8 @@
if (!mWifiRunning) {
mWifiRunning = true;
if (mWifiRunningTimer == null) {
- mWifiRunningTimer = new StopwatchTimer(Uid.this, WIFI_RUNNING,
- mWifiRunningTimers, mOnBatteryTimeBase);
+ mWifiRunningTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, WIFI_RUNNING,
+ mBsi.mWifiRunningTimers, mBsi.mOnBatteryTimeBase);
}
mWifiRunningTimer.startRunningLocked(elapsedRealtimeMs);
}
@@ -4841,8 +4907,8 @@
if (!mFullWifiLockOut) {
mFullWifiLockOut = true;
if (mFullWifiLockTimer == null) {
- mFullWifiLockTimer = new StopwatchTimer(Uid.this, FULL_WIFI_LOCK,
- mFullWifiLockTimers, mOnBatteryTimeBase);
+ mFullWifiLockTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, FULL_WIFI_LOCK,
+ mBsi.mFullWifiLockTimers, mBsi.mOnBatteryTimeBase);
}
mFullWifiLockTimer.startRunningLocked(elapsedRealtimeMs);
}
@@ -4861,8 +4927,8 @@
if (!mWifiScanStarted) {
mWifiScanStarted = true;
if (mWifiScanTimer == null) {
- mWifiScanTimer = new StopwatchTimer(Uid.this, WIFI_SCAN,
- mWifiScanTimers, mOnBatteryTimeBase);
+ mWifiScanTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, WIFI_SCAN,
+ mBsi.mWifiScanTimers, mBsi.mOnBatteryTimeBase);
}
mWifiScanTimer.startRunningLocked(elapsedRealtimeMs);
}
@@ -4911,8 +4977,8 @@
if (!mWifiMulticastEnabled) {
mWifiMulticastEnabled = true;
if (mWifiMulticastTimer == null) {
- mWifiMulticastTimer = new StopwatchTimer(Uid.this, WIFI_MULTICAST_ENABLED,
- mWifiMulticastTimers, mOnBatteryTimeBase);
+ mWifiMulticastTimer = new StopwatchTimer(mBsi.mClocks, Uid.this,
+ WIFI_MULTICAST_ENABLED, mBsi.mWifiMulticastTimers, mBsi.mOnBatteryTimeBase);
}
mWifiMulticastTimer.startRunningLocked(elapsedRealtimeMs);
}
@@ -4943,7 +5009,7 @@
public ControllerActivityCounterImpl getOrCreateWifiControllerActivityLocked() {
if (mWifiControllerActivity == null) {
- mWifiControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ mWifiControllerActivity = new ControllerActivityCounterImpl(mBsi.mOnBatteryTimeBase,
NUM_BT_TX_LEVELS);
}
return mWifiControllerActivity;
@@ -4951,7 +5017,7 @@
public ControllerActivityCounterImpl getOrCreateBluetoothControllerActivityLocked() {
if (mBluetoothControllerActivity == null) {
- mBluetoothControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ mBluetoothControllerActivity = new ControllerActivityCounterImpl(mBsi.mOnBatteryTimeBase,
NUM_BT_TX_LEVELS);
}
return mBluetoothControllerActivity;
@@ -4959,7 +5025,7 @@
public ControllerActivityCounterImpl getOrCreateModemControllerActivityLocked() {
if (mModemControllerActivity == null) {
- mModemControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ mModemControllerActivity = new ControllerActivityCounterImpl(mBsi.mOnBatteryTimeBase,
ModemActivityInfo.TX_POWER_LEVELS);
}
return mModemControllerActivity;
@@ -4967,8 +5033,8 @@
public StopwatchTimer createAudioTurnedOnTimerLocked() {
if (mAudioTurnedOnTimer == null) {
- mAudioTurnedOnTimer = new StopwatchTimer(Uid.this, AUDIO_TURNED_ON,
- mAudioTurnedOnTimers, mOnBatteryTimeBase);
+ mAudioTurnedOnTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, AUDIO_TURNED_ON,
+ mBsi.mAudioTurnedOnTimers, mBsi.mOnBatteryTimeBase);
}
return mAudioTurnedOnTimer;
}
@@ -4991,8 +5057,8 @@
public StopwatchTimer createVideoTurnedOnTimerLocked() {
if (mVideoTurnedOnTimer == null) {
- mVideoTurnedOnTimer = new StopwatchTimer(Uid.this, VIDEO_TURNED_ON,
- mVideoTurnedOnTimers, mOnBatteryTimeBase);
+ mVideoTurnedOnTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, VIDEO_TURNED_ON,
+ mBsi.mVideoTurnedOnTimers, mBsi.mOnBatteryTimeBase);
}
return mVideoTurnedOnTimer;
}
@@ -5015,8 +5081,8 @@
public StopwatchTimer createFlashlightTurnedOnTimerLocked() {
if (mFlashlightTurnedOnTimer == null) {
- mFlashlightTurnedOnTimer = new StopwatchTimer(Uid.this, FLASHLIGHT_TURNED_ON,
- mFlashlightTurnedOnTimers, mOnBatteryTimeBase);
+ mFlashlightTurnedOnTimer = new StopwatchTimer(mBsi.mClocks, Uid.this,
+ FLASHLIGHT_TURNED_ON, mBsi.mFlashlightTurnedOnTimers, mBsi.mOnBatteryTimeBase);
}
return mFlashlightTurnedOnTimer;
}
@@ -5039,8 +5105,8 @@
public StopwatchTimer createCameraTurnedOnTimerLocked() {
if (mCameraTurnedOnTimer == null) {
- mCameraTurnedOnTimer = new StopwatchTimer(Uid.this, CAMERA_TURNED_ON,
- mCameraTurnedOnTimers, mOnBatteryTimeBase);
+ mCameraTurnedOnTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, CAMERA_TURNED_ON,
+ mBsi.mCameraTurnedOnTimers, mBsi.mOnBatteryTimeBase);
}
return mCameraTurnedOnTimer;
}
@@ -5063,16 +5129,16 @@
public StopwatchTimer createForegroundActivityTimerLocked() {
if (mForegroundActivityTimer == null) {
- mForegroundActivityTimer = new StopwatchTimer(
- Uid.this, FOREGROUND_ACTIVITY, null, mOnBatteryTimeBase);
+ mForegroundActivityTimer = new StopwatchTimer(mBsi.mClocks, Uid.this,
+ FOREGROUND_ACTIVITY, null, mBsi.mOnBatteryTimeBase);
}
return mForegroundActivityTimer;
}
public StopwatchTimer createBluetoothScanTimerLocked() {
if (mBluetoothScanTimer == null) {
- mBluetoothScanTimer = new StopwatchTimer(Uid.this, BLUETOOTH_SCAN_ON,
- mBluetoothScanOnTimers, mOnBatteryTimeBase);
+ mBluetoothScanTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, BLUETOOTH_SCAN_ON,
+ mBsi.mBluetoothScanOnTimers, mBsi.mOnBatteryTimeBase);
}
return mBluetoothScanTimer;
}
@@ -5108,18 +5174,19 @@
public BatchTimer createVibratorOnTimerLocked() {
if (mVibratorOnTimer == null) {
- mVibratorOnTimer = new BatchTimer(Uid.this, VIBRATOR_ON, mOnBatteryTimeBase);
+ mVibratorOnTimer = new BatchTimer(mBsi.mClocks, Uid.this, VIBRATOR_ON,
+ mBsi.mOnBatteryTimeBase);
}
return mVibratorOnTimer;
}
public void noteVibratorOnLocked(long durationMillis) {
- createVibratorOnTimerLocked().addDuration(BatteryStatsImpl.this, durationMillis);
+ createVibratorOnTimerLocked().addDuration(mBsi, durationMillis);
}
public void noteVibratorOffLocked() {
if (mVibratorOnTimer != null) {
- mVibratorOnTimer.abortLastDuration(BatteryStatsImpl.this);
+ mVibratorOnTimer.abortLastDuration(mBsi);
}
}
@@ -5215,11 +5282,11 @@
if (i < 0 || i >= NUM_PROCESS_STATE) return;
if (in == null) {
- mProcessStateTimer[i] = new StopwatchTimer(this, PROCESS_STATE, null,
- mOnBatteryTimeBase);
+ mProcessStateTimer[i] = new StopwatchTimer(mBsi.mClocks, this, PROCESS_STATE, null,
+ mBsi.mOnBatteryTimeBase);
} else {
- mProcessStateTimer[i] = new StopwatchTimer(this, PROCESS_STATE, null,
- mOnBatteryTimeBase, in);
+ mProcessStateTimer[i] = new StopwatchTimer(mBsi.mClocks, this, PROCESS_STATE, null,
+ mBsi.mOnBatteryTimeBase, in);
}
}
@@ -5266,17 +5333,17 @@
void makeWifiBatchedScanBin(int i, Parcel in) {
if (i < 0 || i >= NUM_WIFI_BATCHED_SCAN_BINS) return;
- ArrayList<StopwatchTimer> collected = mWifiBatchedScanTimers.get(i);
+ ArrayList<StopwatchTimer> collected = mBsi.mWifiBatchedScanTimers.get(i);
if (collected == null) {
collected = new ArrayList<StopwatchTimer>();
- mWifiBatchedScanTimers.put(i, collected);
+ mBsi.mWifiBatchedScanTimers.put(i, collected);
}
if (in == null) {
- mWifiBatchedScanTimer[i] = new StopwatchTimer(this, WIFI_BATCHED_SCAN, collected,
- mOnBatteryTimeBase);
+ mWifiBatchedScanTimer[i] = new StopwatchTimer(mBsi.mClocks, this, WIFI_BATCHED_SCAN,
+ collected, mBsi.mOnBatteryTimeBase);
} else {
- mWifiBatchedScanTimer[i] = new StopwatchTimer(this, WIFI_BATCHED_SCAN, collected,
- mOnBatteryTimeBase, in);
+ mWifiBatchedScanTimer[i] = new StopwatchTimer(mBsi.mClocks, this, WIFI_BATCHED_SCAN,
+ collected, mBsi.mOnBatteryTimeBase, in);
}
}
@@ -5284,7 +5351,7 @@
void initUserActivityLocked() {
mUserActivityCounters = new Counter[NUM_USER_ACTIVITY_TYPES];
for (int i=0; i<NUM_USER_ACTIVITY_TYPES; i++) {
- mUserActivityCounters[i] = new Counter(mOnBatteryTimeBase);
+ mUserActivityCounters[i] = new Counter(mBsi.mOnBatteryTimeBase);
}
}
@@ -5383,11 +5450,11 @@
mNetworkByteActivityCounters = new LongSamplingCounter[NUM_NETWORK_ACTIVITY_TYPES];
mNetworkPacketActivityCounters = new LongSamplingCounter[NUM_NETWORK_ACTIVITY_TYPES];
for (int i = 0; i < NUM_NETWORK_ACTIVITY_TYPES; i++) {
- mNetworkByteActivityCounters[i] = new LongSamplingCounter(mOnBatteryTimeBase);
- mNetworkPacketActivityCounters[i] = new LongSamplingCounter(mOnBatteryTimeBase);
+ mNetworkByteActivityCounters[i] = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
+ mNetworkPacketActivityCounters[i] = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
}
- mMobileRadioActiveTime = new LongSamplingCounter(mOnBatteryTimeBase);
- mMobileRadioActiveCount = new LongSamplingCounter(mOnBatteryTimeBase);
+ mMobileRadioActiveTime = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
+ mMobileRadioActiveCount = new LongSamplingCounter(mBsi.mOnBatteryTimeBase);
}
/**
@@ -5475,12 +5542,12 @@
mWifiControllerActivity.reset(false);
}
- if (mBluetoothActivity != null) {
- mBluetoothActivity.reset(false);
+ if (mBsi.mBluetoothActivity != null) {
+ mBsi.mBluetoothActivity.reset(false);
}
- if (mModemActivity != null) {
- mModemActivity.reset(false);
+ if (mBsi.mModemActivity != null) {
+ mBsi.mModemActivity.reset(false);
}
mUserCpuTime.reset(false);
@@ -5871,7 +5938,7 @@
mWakelockStats.clear();
for (int j = 0; j < numWakelocks; j++) {
String wakelockName = in.readString();
- Uid.Wakelock wakelock = new Wakelock();
+ Uid.Wakelock wakelock = new Wakelock(mBsi, this);
wakelock.readFromParcelLocked(timeBase, screenOffTimeBase, in);
mWakelockStats.add(wakelockName, wakelock);
}
@@ -5882,7 +5949,7 @@
String syncName = in.readString();
if (in.readInt() != 0) {
mSyncStats.add(syncName,
- new StopwatchTimer(Uid.this, SYNC, null, timeBase, in));
+ new StopwatchTimer(mBsi.mClocks, Uid.this, SYNC, null, timeBase, in));
}
}
@@ -5891,7 +5958,8 @@
for (int j = 0; j < numJobs; j++) {
String jobName = in.readString();
if (in.readInt() != 0) {
- mJobStats.add(jobName, new StopwatchTimer(Uid.this, JOB, null, timeBase, in));
+ mJobStats.add(jobName, new StopwatchTimer(mBsi.mClocks, Uid.this, JOB, null,
+ timeBase, in));
}
}
@@ -5899,8 +5967,8 @@
mSensorStats.clear();
for (int k = 0; k < numSensors; k++) {
int sensorNumber = in.readInt();
- Uid.Sensor sensor = new Sensor(sensorNumber);
- sensor.readFromParcelLocked(mOnBatteryTimeBase, in);
+ Uid.Sensor sensor = new Sensor(mBsi, this, sensorNumber);
+ sensor.readFromParcelLocked(mBsi.mOnBatteryTimeBase, in);
mSensorStats.put(sensorNumber, sensor);
}
@@ -5908,7 +5976,7 @@
mProcessStats.clear();
for (int k = 0; k < numProcs; k++) {
String processName = in.readString();
- Uid.Proc proc = new Proc(processName);
+ Uid.Proc proc = new Proc(mBsi, processName);
proc.readFromParcelLocked(in);
mProcessStats.put(processName, proc);
}
@@ -5917,29 +5985,29 @@
mPackageStats.clear();
for (int l = 0; l < numPkgs; l++) {
String packageName = in.readString();
- Uid.Pkg pkg = new Pkg();
+ Uid.Pkg pkg = new Pkg(mBsi);
pkg.readFromParcelLocked(in);
mPackageStats.put(packageName, pkg);
}
mWifiRunning = false;
if (in.readInt() != 0) {
- mWifiRunningTimer = new StopwatchTimer(Uid.this, WIFI_RUNNING,
- mWifiRunningTimers, mOnBatteryTimeBase, in);
+ mWifiRunningTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, WIFI_RUNNING,
+ mBsi.mWifiRunningTimers, mBsi.mOnBatteryTimeBase, in);
} else {
mWifiRunningTimer = null;
}
mFullWifiLockOut = false;
if (in.readInt() != 0) {
- mFullWifiLockTimer = new StopwatchTimer(Uid.this, FULL_WIFI_LOCK,
- mFullWifiLockTimers, mOnBatteryTimeBase, in);
+ mFullWifiLockTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, FULL_WIFI_LOCK,
+ mBsi.mFullWifiLockTimers, mBsi.mOnBatteryTimeBase, in);
} else {
mFullWifiLockTimer = null;
}
mWifiScanStarted = false;
if (in.readInt() != 0) {
- mWifiScanTimer = new StopwatchTimer(Uid.this, WIFI_SCAN,
- mWifiScanTimers, mOnBatteryTimeBase, in);
+ mWifiScanTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, WIFI_SCAN,
+ mBsi.mWifiScanTimers, mBsi.mOnBatteryTimeBase, in);
} else {
mWifiScanTimer = null;
}
@@ -5953,44 +6021,44 @@
}
mWifiMulticastEnabled = false;
if (in.readInt() != 0) {
- mWifiMulticastTimer = new StopwatchTimer(Uid.this, WIFI_MULTICAST_ENABLED,
- mWifiMulticastTimers, mOnBatteryTimeBase, in);
+ mWifiMulticastTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, WIFI_MULTICAST_ENABLED,
+ mBsi.mWifiMulticastTimers, mBsi.mOnBatteryTimeBase, in);
} else {
mWifiMulticastTimer = null;
}
if (in.readInt() != 0) {
- mAudioTurnedOnTimer = new StopwatchTimer(Uid.this, AUDIO_TURNED_ON,
- mAudioTurnedOnTimers, mOnBatteryTimeBase, in);
+ mAudioTurnedOnTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, AUDIO_TURNED_ON,
+ mBsi.mAudioTurnedOnTimers, mBsi.mOnBatteryTimeBase, in);
} else {
mAudioTurnedOnTimer = null;
}
if (in.readInt() != 0) {
- mVideoTurnedOnTimer = new StopwatchTimer(Uid.this, VIDEO_TURNED_ON,
- mVideoTurnedOnTimers, mOnBatteryTimeBase, in);
+ mVideoTurnedOnTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, VIDEO_TURNED_ON,
+ mBsi.mVideoTurnedOnTimers, mBsi.mOnBatteryTimeBase, in);
} else {
mVideoTurnedOnTimer = null;
}
if (in.readInt() != 0) {
- mFlashlightTurnedOnTimer = new StopwatchTimer(Uid.this, FLASHLIGHT_TURNED_ON,
- mFlashlightTurnedOnTimers, mOnBatteryTimeBase, in);
+ mFlashlightTurnedOnTimer = new StopwatchTimer(mBsi.mClocks, Uid.this,
+ FLASHLIGHT_TURNED_ON, mBsi.mFlashlightTurnedOnTimers, mBsi.mOnBatteryTimeBase, in);
} else {
mFlashlightTurnedOnTimer = null;
}
if (in.readInt() != 0) {
- mCameraTurnedOnTimer = new StopwatchTimer(Uid.this, CAMERA_TURNED_ON,
- mCameraTurnedOnTimers, mOnBatteryTimeBase, in);
+ mCameraTurnedOnTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, CAMERA_TURNED_ON,
+ mBsi.mCameraTurnedOnTimers, mBsi.mOnBatteryTimeBase, in);
} else {
mCameraTurnedOnTimer = null;
}
if (in.readInt() != 0) {
- mForegroundActivityTimer = new StopwatchTimer(
- Uid.this, FOREGROUND_ACTIVITY, null, mOnBatteryTimeBase, in);
+ mForegroundActivityTimer = new StopwatchTimer(mBsi.mClocks, Uid.this,
+ FOREGROUND_ACTIVITY, null, mBsi.mOnBatteryTimeBase, in);
} else {
mForegroundActivityTimer = null;
}
if (in.readInt() != 0) {
- mBluetoothScanTimer = new StopwatchTimer(Uid.this, BLUETOOTH_SCAN_ON,
- mBluetoothScanOnTimers, mOnBatteryTimeBase, in);
+ mBluetoothScanTimer = new StopwatchTimer(mBsi.mClocks, Uid.this, BLUETOOTH_SCAN_ON,
+ mBsi.mBluetoothScanOnTimers, mBsi.mOnBatteryTimeBase, in);
} else {
mBluetoothScanTimer = null;
}
@@ -6003,14 +6071,15 @@
}
}
if (in.readInt() != 0) {
- mVibratorOnTimer = new BatchTimer(Uid.this, VIBRATOR_ON, mOnBatteryTimeBase, in);
+ mVibratorOnTimer = new BatchTimer(mBsi.mClocks, Uid.this, VIBRATOR_ON,
+ mBsi.mOnBatteryTimeBase, in);
} else {
mVibratorOnTimer = null;
}
if (in.readInt() != 0) {
mUserActivityCounters = new Counter[NUM_USER_ACTIVITY_TYPES];
for (int i=0; i<NUM_USER_ACTIVITY_TYPES; i++) {
- mUserActivityCounters[i] = new Counter(mOnBatteryTimeBase, in);
+ mUserActivityCounters[i] = new Counter(mBsi.mOnBatteryTimeBase, in);
}
} else {
mUserActivityCounters = null;
@@ -6021,45 +6090,45 @@
= new LongSamplingCounter[NUM_NETWORK_ACTIVITY_TYPES];
for (int i = 0; i < NUM_NETWORK_ACTIVITY_TYPES; i++) {
mNetworkByteActivityCounters[i]
- = new LongSamplingCounter(mOnBatteryTimeBase, in);
+ = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
mNetworkPacketActivityCounters[i]
- = new LongSamplingCounter(mOnBatteryTimeBase, in);
+ = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
}
- mMobileRadioActiveTime = new LongSamplingCounter(mOnBatteryTimeBase, in);
- mMobileRadioActiveCount = new LongSamplingCounter(mOnBatteryTimeBase, in);
+ mMobileRadioActiveTime = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
+ mMobileRadioActiveCount = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
} else {
mNetworkByteActivityCounters = null;
mNetworkPacketActivityCounters = null;
}
if (in.readInt() != 0) {
- mWifiControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ mWifiControllerActivity = new ControllerActivityCounterImpl(mBsi.mOnBatteryTimeBase,
NUM_WIFI_TX_LEVELS, in);
} else {
mWifiControllerActivity = null;
}
if (in.readInt() != 0) {
- mBluetoothControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ mBluetoothControllerActivity = new ControllerActivityCounterImpl(mBsi.mOnBatteryTimeBase,
NUM_BT_TX_LEVELS, in);
} else {
mBluetoothControllerActivity = null;
}
if (in.readInt() != 0) {
- mModemControllerActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
+ mModemControllerActivity = new ControllerActivityCounterImpl(mBsi.mOnBatteryTimeBase,
ModemActivityInfo.TX_POWER_LEVELS, in);
} else {
mModemControllerActivity = null;
}
- mUserCpuTime = new LongSamplingCounter(mOnBatteryTimeBase, in);
- mSystemCpuTime = new LongSamplingCounter(mOnBatteryTimeBase, in);
- mCpuPower = new LongSamplingCounter(mOnBatteryTimeBase, in);
+ mUserCpuTime = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
+ mSystemCpuTime = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
+ mCpuPower = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
if (in.readInt() != 0) {
int numCpuClusters = in.readInt();
- if (mPowerProfile != null && mPowerProfile.getNumCpuClusters() != numCpuClusters) {
+ if (mBsi.mPowerProfile != null && mBsi.mPowerProfile.getNumCpuClusters() != numCpuClusters) {
throw new ParcelFormatException("Incompatible number of cpu clusters");
}
@@ -6067,8 +6136,8 @@
for (int cluster = 0; cluster < numCpuClusters; cluster++) {
if (in.readInt() != 0) {
int numSpeeds = in.readInt();
- if (mPowerProfile != null &&
- mPowerProfile.getNumSpeedStepsInCpuCluster(cluster) != numSpeeds) {
+ if (mBsi.mPowerProfile != null &&
+ mBsi.mPowerProfile.getNumSpeedStepsInCpuCluster(cluster) != numSpeeds) {
throw new ParcelFormatException("Incompatible number of cpu speeds");
}
@@ -6076,7 +6145,7 @@
mCpuClusterSpeed[cluster] = cpuSpeeds;
for (int speed = 0; speed < numSpeeds; speed++) {
if (in.readInt() != 0) {
- cpuSpeeds[speed] = new LongSamplingCounter(mOnBatteryTimeBase, in);
+ cpuSpeeds[speed] = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
}
}
} else {
@@ -6091,7 +6160,17 @@
/**
* The statistics associated with a particular wake lock.
*/
- public final class Wakelock extends BatteryStats.Uid.Wakelock {
+ public static class Wakelock extends BatteryStats.Uid.Wakelock {
+ /**
+ * BatteryStatsImpl that we are associated with.
+ */
+ protected BatteryStatsImpl mBsi;
+
+ /**
+ * BatteryStatsImpl that we are associated with.
+ */
+ protected Uid mUid;
+
/**
* How long (in ms) this uid has been keeping the device partially awake.
*/
@@ -6112,6 +6191,11 @@
*/
StopwatchTimer mTimerDraw;
+ public Wakelock(BatteryStatsImpl bsi, Uid uid) {
+ mBsi = bsi;
+ mUid = uid;
+ }
+
/**
* Reads a possibly null Timer from a Parcel. The timer is associated with the
* proper timer pool from the given BatteryStatsImpl object.
@@ -6125,7 +6209,7 @@
return null;
}
- return new StopwatchTimer(Uid.this, type, pool, timeBase, in);
+ return new StopwatchTimer(mBsi.mClocks, mUid, type, pool, timeBase, in);
}
boolean reset() {
@@ -6165,10 +6249,10 @@
void readFromParcelLocked(TimeBase timeBase, TimeBase screenOffTimeBase, Parcel in) {
mTimerPartial = readTimerFromParcel(WAKE_TYPE_PARTIAL,
- mPartialTimers, screenOffTimeBase, in);
- mTimerFull = readTimerFromParcel(WAKE_TYPE_FULL, mFullTimers, timeBase, in);
- mTimerWindow = readTimerFromParcel(WAKE_TYPE_WINDOW, mWindowTimers, timeBase, in);
- mTimerDraw = readTimerFromParcel(WAKE_TYPE_DRAW, mDrawTimers, timeBase, in);
+ mBsi.mPartialTimers, screenOffTimeBase, in);
+ mTimerFull = readTimerFromParcel(WAKE_TYPE_FULL, mBsi.mFullTimers, timeBase, in);
+ mTimerWindow = readTimerFromParcel(WAKE_TYPE_WINDOW, mBsi.mWindowTimers, timeBase, in);
+ mTimerDraw = readTimerFromParcel(WAKE_TYPE_DRAW, mBsi.mDrawTimers, timeBase, in);
}
void writeToParcelLocked(Parcel out, long elapsedRealtimeUs) {
@@ -6195,32 +6279,32 @@
case WAKE_TYPE_PARTIAL:
t = mTimerPartial;
if (t == null) {
- t = new StopwatchTimer(Uid.this, WAKE_TYPE_PARTIAL,
- mPartialTimers, mOnBatteryScreenOffTimeBase);
+ t = new StopwatchTimer(mBsi.mClocks, mUid, WAKE_TYPE_PARTIAL,
+ mBsi.mPartialTimers, mBsi.mOnBatteryScreenOffTimeBase);
mTimerPartial = t;
}
return t;
case WAKE_TYPE_FULL:
t = mTimerFull;
if (t == null) {
- t = new StopwatchTimer(Uid.this, WAKE_TYPE_FULL,
- mFullTimers, mOnBatteryTimeBase);
+ t = new StopwatchTimer(mBsi.mClocks, mUid, WAKE_TYPE_FULL,
+ mBsi.mFullTimers, mBsi.mOnBatteryTimeBase);
mTimerFull = t;
}
return t;
case WAKE_TYPE_WINDOW:
t = mTimerWindow;
if (t == null) {
- t = new StopwatchTimer(Uid.this, WAKE_TYPE_WINDOW,
- mWindowTimers, mOnBatteryTimeBase);
+ t = new StopwatchTimer(mBsi.mClocks, mUid, WAKE_TYPE_WINDOW,
+ mBsi.mWindowTimers, mBsi.mOnBatteryTimeBase);
mTimerWindow = t;
}
return t;
case WAKE_TYPE_DRAW:
t = mTimerDraw;
if (t == null) {
- t = new StopwatchTimer(Uid.this, WAKE_TYPE_DRAW,
- mDrawTimers, mOnBatteryTimeBase);
+ t = new StopwatchTimer(mBsi.mClocks, mUid, WAKE_TYPE_DRAW,
+ mBsi.mDrawTimers, mBsi.mOnBatteryTimeBase);
mTimerDraw = t;
}
return t;
@@ -6230,11 +6314,23 @@
}
}
- public final class Sensor extends BatteryStats.Uid.Sensor {
+ public static class Sensor extends BatteryStats.Uid.Sensor {
+ /**
+ * BatteryStatsImpl that we are associated with.
+ */
+ protected BatteryStatsImpl mBsi;
+
+ /**
+ * BatteryStatsImpl that we are associated with.
+ */
+ protected Uid mUid;
+
final int mHandle;
StopwatchTimer mTimer;
- public Sensor(int handle) {
+ public Sensor(BatteryStatsImpl bsi, Uid uid, int handle) {
+ mBsi = bsi;
+ mUid = uid;
mHandle = handle;
}
@@ -6243,12 +6339,12 @@
return null;
}
- ArrayList<StopwatchTimer> pool = mSensorTimers.get(mHandle);
+ ArrayList<StopwatchTimer> pool = mBsi.mSensorTimers.get(mHandle);
if (pool == null) {
pool = new ArrayList<StopwatchTimer>();
- mSensorTimers.put(mHandle, pool);
+ mBsi.mSensorTimers.put(mHandle, pool);
}
- return new StopwatchTimer(Uid.this, 0, pool, timeBase, in);
+ return new StopwatchTimer(mBsi.mClocks, mUid, 0, pool, timeBase, in);
}
boolean reset() {
@@ -6281,7 +6377,12 @@
/**
* The statistics associated with a particular process.
*/
- public final class Proc extends BatteryStats.Uid.Proc implements TimeBaseObs {
+ public static class Proc extends BatteryStats.Uid.Proc implements TimeBaseObs {
+ /**
+ * BatteryStatsImpl that we are associated with.
+ */
+ protected BatteryStatsImpl mBsi;
+
/**
* The name of this process.
*/
@@ -6384,9 +6485,10 @@
ArrayList<ExcessivePower> mExcessivePower;
- Proc(String name) {
+ public Proc(BatteryStatsImpl bsi, String name) {
+ mBsi = bsi;
mName = name;
- mOnBatteryTimeBase.add(this);
+ mBsi.mOnBatteryTimeBase.add(this);
}
public void onTimeStarted(long elapsedRealtime, long baseUptime, long baseRealtime) {
@@ -6403,7 +6505,7 @@
void detach() {
mActive = false;
- mOnBatteryTimeBase.remove(this);
+ mBsi.mOnBatteryTimeBase.remove(this);
}
public int countExcessivePowers() {
@@ -6617,7 +6719,12 @@
/**
* The statistics associated with a particular package.
*/
- public final class Pkg extends BatteryStats.Uid.Pkg implements TimeBaseObs {
+ public static class Pkg extends BatteryStats.Uid.Pkg implements TimeBaseObs {
+ /**
+ * BatteryStatsImpl that we are associated with.
+ */
+ protected BatteryStatsImpl mBsi;
+
/**
* Number of times wakeup alarms have occurred for this app.
*/
@@ -6628,8 +6735,9 @@
*/
final ArrayMap<String, Serv> mServiceStats = new ArrayMap<>();
- Pkg() {
- mOnBatteryScreenOffTimeBase.add(this);
+ public Pkg(BatteryStatsImpl bsi) {
+ mBsi = bsi;
+ mBsi.mOnBatteryScreenOffTimeBase.add(this);
}
public void onTimeStarted(long elapsedRealtime, long baseUptime, long baseRealtime) {
@@ -6639,7 +6747,7 @@
}
void detach() {
- mOnBatteryScreenOffTimeBase.remove(this);
+ mBsi.mOnBatteryScreenOffTimeBase.remove(this);
}
void readFromParcelLocked(Parcel in) {
@@ -6647,14 +6755,14 @@
mWakeupAlarms.clear();
for (int i=0; i<numWA; i++) {
String tag = in.readString();
- mWakeupAlarms.put(tag, new Counter(mOnBatteryTimeBase, in));
+ mWakeupAlarms.put(tag, new Counter(mBsi.mOnBatteryTimeBase, in));
}
int numServs = in.readInt();
mServiceStats.clear();
for (int m = 0; m < numServs; m++) {
String serviceName = in.readString();
- Uid.Pkg.Serv serv = new Serv();
+ Uid.Pkg.Serv serv = new Serv(mBsi);
mServiceStats.put(serviceName, serv);
serv.readFromParcelLocked(in);
@@ -6686,7 +6794,7 @@
public void noteWakeupAlarmLocked(String tag) {
Counter c = mWakeupAlarms.get(tag);
if (c == null) {
- c = new Counter(mOnBatteryTimeBase);
+ c = new Counter(mBsi.mOnBatteryTimeBase);
mWakeupAlarms.put(tag, c);
}
c.stepAtomic();
@@ -6700,99 +6808,113 @@
/**
* The statistics associated with a particular service.
*/
- public final class Serv extends BatteryStats.Uid.Pkg.Serv implements TimeBaseObs {
+ public static class Serv extends BatteryStats.Uid.Pkg.Serv implements TimeBaseObs {
+ /**
+ * BatteryStatsImpl that we are associated with.
+ */
+ protected BatteryStatsImpl mBsi;
+
+ /**
+ * The android package in which this service resides.
+ */
+ protected Pkg mPkg;
+
/**
* Total time (ms in battery uptime) the service has been left started.
*/
- long mStartTime;
+ protected long mStartTime;
/**
* If service has been started and not yet stopped, this is
* when it was started.
*/
- long mRunningSince;
+ protected long mRunningSince;
/**
* True if we are currently running.
*/
- boolean mRunning;
+ protected boolean mRunning;
/**
* Total number of times startService() has been called.
*/
- int mStarts;
+ protected int mStarts;
/**
* Total time (ms in battery uptime) the service has been left launched.
*/
- long mLaunchedTime;
+ protected long mLaunchedTime;
/**
* If service has been launched and not yet exited, this is
* when it was launched (ms in battery uptime).
*/
- long mLaunchedSince;
+ protected long mLaunchedSince;
/**
* True if we are currently launched.
*/
- boolean mLaunched;
+ protected boolean mLaunched;
/**
* Total number times the service has been launched.
*/
- int mLaunches;
+ protected int mLaunches;
/**
* The amount of time spent started loaded from a previous save
* (ms in battery uptime).
*/
- long mLoadedStartTime;
+ protected long mLoadedStartTime;
/**
* The number of starts loaded from a previous save.
*/
- int mLoadedStarts;
+ protected int mLoadedStarts;
/**
* The number of launches loaded from a previous save.
*/
- int mLoadedLaunches;
+ protected int mLoadedLaunches;
/**
* The amount of time spent started as of the last run (ms
* in battery uptime).
*/
- long mLastStartTime;
+ protected long mLastStartTime;
/**
* The number of starts as of the last run.
*/
- int mLastStarts;
+ protected int mLastStarts;
/**
* The number of launches as of the last run.
*/
- int mLastLaunches;
+ protected int mLastLaunches;
/**
* The amount of time spent started when last unplugged (ms
* in battery uptime).
*/
- long mUnpluggedStartTime;
+ protected long mUnpluggedStartTime;
/**
* The number of starts when last unplugged.
*/
- int mUnpluggedStarts;
+ protected int mUnpluggedStarts;
/**
* The number of launches when last unplugged.
*/
- int mUnpluggedLaunches;
+ protected int mUnpluggedLaunches;
- Serv() {
- mOnBatteryTimeBase.add(this);
+ /**
+ * Construct a Serv. Also adds it to the on-battery time base as a listener.
+ */
+ public Serv(BatteryStatsImpl bsi) {
+ mBsi = bsi;
+ mBsi.mOnBatteryTimeBase.add(this);
}
public void onTimeStarted(long elapsedRealtime, long baseUptime,
@@ -6806,11 +6928,14 @@
long baseRealtime) {
}
- void detach() {
- mOnBatteryTimeBase.remove(this);
+ /**
+ * Remove this Serv as a listener from the time base.
+ */
+ public void detach() {
+ mBsi.mOnBatteryTimeBase.remove(this);
}
- void readFromParcelLocked(Parcel in) {
+ public void readFromParcelLocked(Parcel in) {
mStartTime = in.readLong();
mRunningSince = in.readLong();
mRunning = in.readInt() != 0;
@@ -6830,7 +6955,7 @@
mUnpluggedLaunches = in.readInt();
}
- void writeToParcelLocked(Parcel out) {
+ public void writeToParcelLocked(Parcel out) {
out.writeLong(mStartTime);
out.writeLong(mRunningSince);
out.writeInt(mRunning ? 1 : 0);
@@ -6847,12 +6972,12 @@
out.writeInt(mUnpluggedLaunches);
}
- long getLaunchTimeToNowLocked(long batteryUptime) {
+ public long getLaunchTimeToNowLocked(long batteryUptime) {
if (!mLaunched) return mLaunchedTime;
return mLaunchedTime + batteryUptime - mLaunchedSince;
}
- long getStartTimeToNowLocked(long batteryUptime) {
+ public long getStartTimeToNowLocked(long batteryUptime) {
if (!mRunning) return mStartTime;
return mStartTime + batteryUptime - mRunningSince;
}
@@ -6860,14 +6985,14 @@
public void startLaunchedLocked() {
if (!mLaunched) {
mLaunches++;
- mLaunchedSince = getBatteryUptimeLocked();
+ mLaunchedSince = mBsi.getBatteryUptimeLocked();
mLaunched = true;
}
}
public void stopLaunchedLocked() {
if (mLaunched) {
- long time = getBatteryUptimeLocked() - mLaunchedSince;
+ long time = mBsi.getBatteryUptimeLocked() - mLaunchedSince;
if (time > 0) {
mLaunchedTime += time;
} else {
@@ -6880,14 +7005,14 @@
public void startRunningLocked() {
if (!mRunning) {
mStarts++;
- mRunningSince = getBatteryUptimeLocked();
+ mRunningSince = mBsi.getBatteryUptimeLocked();
mRunning = true;
}
}
public void stopRunningLocked() {
if (mRunning) {
- long time = getBatteryUptimeLocked() - mRunningSince;
+ long time = mBsi.getBatteryUptimeLocked() - mRunningSince;
if (time > 0) {
mStartTime += time;
} else {
@@ -6898,7 +7023,7 @@
}
public BatteryStatsImpl getBatteryStats() {
- return BatteryStatsImpl.this;
+ return mBsi;
}
@Override
@@ -6937,7 +7062,7 @@
}
final Serv newServiceStatsLocked() {
- return new Serv();
+ return new Serv(mBsi);
}
}
@@ -6948,7 +7073,7 @@
public Proc getProcessStatsLocked(String name) {
Proc ps = mProcessStats.get(name);
if (ps == null) {
- ps = new Proc(name);
+ ps = new Proc(mBsi, name);
mProcessStats.put(name, ps);
}
@@ -6977,7 +7102,7 @@
if (mProcessState == uidRunningState) return;
- final long elapsedRealtime = SystemClock.elapsedRealtime();
+ final long elapsedRealtime = mBsi.mClocks.elapsedRealtime();
if (mProcessState != ActivityManager.PROCESS_STATE_NONEXISTENT) {
mProcessStateTimer[mProcessState].stopRunningLocked(elapsedRealtime);
@@ -7011,7 +7136,7 @@
public Pkg getPackageStatsLocked(String name) {
Pkg ps = mPackageStats.get(name);
if (ps == null) {
- ps = new Pkg();
+ ps = new Pkg(mBsi);
mPackageStats.put(name, ps);
}
@@ -7046,7 +7171,7 @@
}
public void readWakeSummaryFromParcelLocked(String wlName, Parcel in) {
- Wakelock wl = new Wakelock();
+ Wakelock wl = new Wakelock(mBsi, this);
mWakelockStats.add(wlName, wl);
if (in.readInt() != 0) {
wl.getStopwatchTimer(WAKE_TYPE_FULL).readSummaryFromParcelLocked(in);
@@ -7068,19 +7193,20 @@
if (!create) {
return null;
}
- se = new Sensor(sensor);
+ se = new Sensor(mBsi, this, sensor);
mSensorStats.put(sensor, se);
}
StopwatchTimer t = se.mTimer;
if (t != null) {
return t;
}
- ArrayList<StopwatchTimer> timers = mSensorTimers.get(sensor);
+ ArrayList<StopwatchTimer> timers = mBsi.mSensorTimers.get(sensor);
if (timers == null) {
timers = new ArrayList<StopwatchTimer>();
- mSensorTimers.put(sensor, timers);
+ mBsi.mSensorTimers.put(sensor, timers);
}
- t = new StopwatchTimer(Uid.this, BatteryStats.SENSOR, timers, mOnBatteryTimeBase);
+ t = new StopwatchTimer(mBsi.mClocks, this, BatteryStats.SENSOR, timers,
+ mBsi.mOnBatteryTimeBase);
se.mTimer = t;
return t;
}
@@ -7186,11 +7312,18 @@
}
public BatteryStatsImpl getBatteryStats() {
- return BatteryStatsImpl.this;
+ return mBsi;
}
}
public BatteryStatsImpl(File systemDir, Handler handler, ExternalStatsSync externalSync) {
+ this(new SystemClocks(), systemDir, handler, externalSync);
+ }
+
+ public BatteryStatsImpl(Clocks clocks, File systemDir, Handler handler,
+ ExternalStatsSync externalSync) {
+ init(clocks);
+
if (systemDir != null) {
mFile = new JournaledFile(new File(systemDir, "batterystats.bin"),
new File(systemDir, "batterystats.bin.tmp"));
@@ -7202,24 +7335,28 @@
mExternalSync = externalSync;
mHandler = new MyHandler(handler.getLooper());
mStartCount++;
- mScreenOnTimer = new StopwatchTimer(null, -1, null, mOnBatteryTimeBase);
+ mScreenOnTimer = new StopwatchTimer(mClocks, null, -1, null, mOnBatteryTimeBase);
for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
- mScreenBrightnessTimer[i] = new StopwatchTimer(null, -100-i, null, mOnBatteryTimeBase);
- }
- mInteractiveTimer = new StopwatchTimer(null, -10, null, mOnBatteryTimeBase);
- mPowerSaveModeEnabledTimer = new StopwatchTimer(null, -2, null, mOnBatteryTimeBase);
- mDeviceIdleModeLightTimer = new StopwatchTimer(null, -11, null, mOnBatteryTimeBase);
- mDeviceIdleModeFullTimer = new StopwatchTimer(null, -14, null, mOnBatteryTimeBase);
- mDeviceLightIdlingTimer = new StopwatchTimer(null, -15, null, mOnBatteryTimeBase);
- mDeviceIdlingTimer = new StopwatchTimer(null, -12, null, mOnBatteryTimeBase);
- mPhoneOnTimer = new StopwatchTimer(null, -3, null, mOnBatteryTimeBase);
- for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {
- mPhoneSignalStrengthsTimer[i] = new StopwatchTimer(null, -200-i, null,
+ mScreenBrightnessTimer[i] = new StopwatchTimer(mClocks, null, -100-i, null,
mOnBatteryTimeBase);
}
- mPhoneSignalScanningTimer = new StopwatchTimer(null, -200+1, null, mOnBatteryTimeBase);
+ mInteractiveTimer = new StopwatchTimer(mClocks, null, -10, null, mOnBatteryTimeBase);
+ mPowerSaveModeEnabledTimer = new StopwatchTimer(mClocks, null, -2, null,
+ mOnBatteryTimeBase);
+ mDeviceIdleModeLightTimer = new StopwatchTimer(mClocks, null, -11, null,
+ mOnBatteryTimeBase);
+ mDeviceIdleModeFullTimer = new StopwatchTimer(mClocks, null, -14, null, mOnBatteryTimeBase);
+ mDeviceLightIdlingTimer = new StopwatchTimer(mClocks, null, -15, null, mOnBatteryTimeBase);
+ mDeviceIdlingTimer = new StopwatchTimer(mClocks, null, -12, null, mOnBatteryTimeBase);
+ mPhoneOnTimer = new StopwatchTimer(mClocks, null, -3, null, mOnBatteryTimeBase);
+ for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {
+ mPhoneSignalStrengthsTimer[i] = new StopwatchTimer(mClocks, null, -200-i, null,
+ mOnBatteryTimeBase);
+ }
+ mPhoneSignalScanningTimer = new StopwatchTimer(mClocks, null, -200+1, null,
+ mOnBatteryTimeBase);
for (int i=0; i<NUM_DATA_CONNECTION_TYPES; i++) {
- mPhoneDataConnectionsTimer[i] = new StopwatchTimer(null, -300-i, null,
+ mPhoneDataConnectionsTimer[i] = new StopwatchTimer(mClocks, null, -300-i, null,
mOnBatteryTimeBase);
}
for (int i = 0; i < NUM_NETWORK_ACTIVITY_TYPES; i++) {
@@ -7232,31 +7369,34 @@
mModemActivity = new ControllerActivityCounterImpl(mOnBatteryTimeBase,
ModemActivityInfo.TX_POWER_LEVELS);
- mMobileRadioActiveTimer = new StopwatchTimer(null, -400, null, mOnBatteryTimeBase);
- mMobileRadioActivePerAppTimer = new StopwatchTimer(null, -401, null, mOnBatteryTimeBase);
+ mMobileRadioActiveTimer = new StopwatchTimer(mClocks, null, -400, null, mOnBatteryTimeBase);
+ mMobileRadioActivePerAppTimer = new StopwatchTimer(mClocks, null, -401, null,
+ mOnBatteryTimeBase);
mMobileRadioActiveAdjustedTime = new LongSamplingCounter(mOnBatteryTimeBase);
mMobileRadioActiveUnknownTime = new LongSamplingCounter(mOnBatteryTimeBase);
mMobileRadioActiveUnknownCount = new LongSamplingCounter(mOnBatteryTimeBase);
- mWifiOnTimer = new StopwatchTimer(null, -4, null, mOnBatteryTimeBase);
- mGlobalWifiRunningTimer = new StopwatchTimer(null, -5, null, mOnBatteryTimeBase);
+ mWifiOnTimer = new StopwatchTimer(mClocks, null, -4, null, mOnBatteryTimeBase);
+ mGlobalWifiRunningTimer = new StopwatchTimer(mClocks, null, -5, null, mOnBatteryTimeBase);
for (int i=0; i<NUM_WIFI_STATES; i++) {
- mWifiStateTimer[i] = new StopwatchTimer(null, -600-i, null, mOnBatteryTimeBase);
- }
- for (int i=0; i<NUM_WIFI_SUPPL_STATES; i++) {
- mWifiSupplStateTimer[i] = new StopwatchTimer(null, -700-i, null, mOnBatteryTimeBase);
- }
- for (int i=0; i<NUM_WIFI_SIGNAL_STRENGTH_BINS; i++) {
- mWifiSignalStrengthsTimer[i] = new StopwatchTimer(null, -800-i, null,
+ mWifiStateTimer[i] = new StopwatchTimer(mClocks, null, -600-i, null,
mOnBatteryTimeBase);
}
- mAudioOnTimer = new StopwatchTimer(null, -7, null, mOnBatteryTimeBase);
- mVideoOnTimer = new StopwatchTimer(null, -8, null, mOnBatteryTimeBase);
- mFlashlightOnTimer = new StopwatchTimer(null, -9, null, mOnBatteryTimeBase);
- mCameraOnTimer = new StopwatchTimer(null, -13, null, mOnBatteryTimeBase);
- mBluetoothScanTimer = new StopwatchTimer(null, -14, null, mOnBatteryTimeBase);
+ for (int i=0; i<NUM_WIFI_SUPPL_STATES; i++) {
+ mWifiSupplStateTimer[i] = new StopwatchTimer(mClocks, null, -700-i, null,
+ mOnBatteryTimeBase);
+ }
+ for (int i=0; i<NUM_WIFI_SIGNAL_STRENGTH_BINS; i++) {
+ mWifiSignalStrengthsTimer[i] = new StopwatchTimer(mClocks, null, -800-i, null,
+ mOnBatteryTimeBase);
+ }
+ mAudioOnTimer = new StopwatchTimer(mClocks, null, -7, null, mOnBatteryTimeBase);
+ mVideoOnTimer = new StopwatchTimer(mClocks, null, -8, null, mOnBatteryTimeBase);
+ mFlashlightOnTimer = new StopwatchTimer(mClocks, null, -9, null, mOnBatteryTimeBase);
+ mCameraOnTimer = new StopwatchTimer(mClocks, null, -13, null, mOnBatteryTimeBase);
+ mBluetoothScanTimer = new StopwatchTimer(mClocks, null, -14, null, mOnBatteryTimeBase);
mOnBattery = mOnBatteryInternal = false;
- long uptime = SystemClock.uptimeMillis() * 1000;
- long realtime = SystemClock.elapsedRealtime() * 1000;
+ long uptime = mClocks.uptimeMillis() * 1000;
+ long realtime = mClocks.elapsedRealtime() * 1000;
initTimes(uptime, realtime);
mStartPlatformVersion = mEndPlatformVersion = Build.ID;
mDischargeStartLevel = 0;
@@ -7270,6 +7410,11 @@
}
public BatteryStatsImpl(Parcel p) {
+ this(new SystemClocks(), p);
+ }
+
+ public BatteryStatsImpl(Clocks clocks, Parcel p) {
+ init(clocks);
mFile = null;
mCheckinFile = null;
mDailyFile = null;
@@ -7808,9 +7953,9 @@
public void resetAllStatsCmdLocked() {
resetAllStatsLocked();
- final long mSecUptime = SystemClock.uptimeMillis();
+ final long mSecUptime = mClocks.uptimeMillis();
long uptime = mSecUptime * 1000;
- long mSecRealtime = SystemClock.elapsedRealtime();
+ long mSecRealtime = mClocks.elapsedRealtime();
long realtime = mSecRealtime * 1000;
mDischargeStartLevel = mHistoryCur.batteryLevel;
pullPendingStateUpdatesLocked();
@@ -7835,7 +7980,7 @@
private void resetAllStatsLocked() {
mStartCount = 0;
- initTimes(SystemClock.uptimeMillis() * 1000, SystemClock.elapsedRealtime() * 1000);
+ initTimes(mClocks.uptimeMillis() * 1000, mClocks.elapsedRealtime() * 1000);
mScreenOnTimer.reset(false);
for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
mScreenBrightnessTimer[i].reset(false);
@@ -7983,17 +8128,8 @@
private static final int NETWORK_STATS_NEXT = 1;
private static final int NETWORK_STATS_DELTA = 2;
- private final NetworkStats[] mMobileNetworkStats = new NetworkStats[] {
- new NetworkStats(SystemClock.elapsedRealtime(), 50),
- new NetworkStats(SystemClock.elapsedRealtime(), 50),
- new NetworkStats(SystemClock.elapsedRealtime(), 50)
- };
-
- private final NetworkStats[] mWifiNetworkStats = new NetworkStats[] {
- new NetworkStats(SystemClock.elapsedRealtime(), 50),
- new NetworkStats(SystemClock.elapsedRealtime(), 50),
- new NetworkStats(SystemClock.elapsedRealtime(), 50)
- };
+ private NetworkStats[] mMobileNetworkStats;
+ private NetworkStats[] mWifiNetworkStats;
/**
* Retrieves the delta of network stats for the given network ifaces. Uses networkStatsBuffer
@@ -8026,7 +8162,7 @@
Slog.d(TAG, "Updating wifi stats");
}
- final long elapsedRealtimeMs = SystemClock.elapsedRealtime();
+ final long elapsedRealtimeMs = mClocks.elapsedRealtime();
NetworkStats delta = null;
try {
if (!ArrayUtils.isEmpty(mWifiIfaces)) {
@@ -8570,7 +8706,7 @@
SamplingTimer kwlt = mKernelWakelockStats.get(name);
if (kwlt == null) {
- kwlt = new SamplingTimer(mOnBatteryScreenOffTimeBase,
+ kwlt = new SamplingTimer(mClocks, mOnBatteryScreenOffTimeBase,
true /* track reported val */);
mKernelWakelockStats.put(name, kwlt);
}
@@ -8663,7 +8799,7 @@
// Read the CPU data for each UID. This will internally generate a snapshot so next time
// we read, we get a delta. If we are to distribute the cpu time, then do so. Otherwise
// we just ignore the data.
- final long startTimeMs = SystemClock.elapsedRealtime();
+ final long startTimeMs = mClocks.elapsedRealtime();
mKernelUidCpuTimeReader.readDelta(!mOnBatteryInternal ? null :
new KernelUidCpuTimeReader.Callback() {
@Override
@@ -8735,7 +8871,7 @@
});
if (DEBUG_ENERGY_CPU) {
- Slog.d(TAG, "Reading cpu stats took " + (SystemClock.elapsedRealtime() - startTimeMs) +
+ Slog.d(TAG, "Reading cpu stats took " + (mClocks.elapsedRealtime() - startTimeMs) +
" ms");
}
@@ -9000,8 +9136,8 @@
public void setBatteryStateLocked(int status, int health, int plugType, int level,
int temp, int volt) {
final boolean onBattery = plugType == BATTERY_PLUGGED_NONE;
- final long uptime = SystemClock.uptimeMillis();
- final long elapsedRealtime = SystemClock.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
if (!mHaveBatteryLevel) {
mHaveBatteryLevel = true;
// We start out assuming that the device is plugged in (not
@@ -9147,7 +9283,7 @@
}
public long getAwakeTimePlugged() {
- return (SystemClock.uptimeMillis() * 1000) - getAwakeTimeBattery();
+ return (mClocks.uptimeMillis() * 1000) - getAwakeTimeBattery();
}
@Override
@@ -9310,8 +9446,8 @@
return mDailyPackageChanges;
}
- long getBatteryUptimeLocked() {
- return mOnBatteryTimeBase.getUptime(SystemClock.uptimeMillis() * 1000);
+ protected long getBatteryUptimeLocked() {
+ return mOnBatteryTimeBase.getUptime(mClocks.uptimeMillis() * 1000);
}
@Override
@@ -9429,7 +9565,7 @@
public Uid getUidStatsLocked(int uid) {
Uid u = mUidStats.get(uid);
if (u == null) {
- u = new Uid(uid);
+ u = new Uid(this, uid);
mUidStats.put(uid, u);
}
return u;
@@ -9474,7 +9610,7 @@
}
public void shutdownLocked() {
- recordShutdownLocked(SystemClock.elapsedRealtime(), SystemClock.uptimeMillis());
+ recordShutdownLocked(mClocks.elapsedRealtime(), mClocks.uptimeMillis());
writeSyncLocked();
mShuttingDown = true;
}
@@ -9502,7 +9638,7 @@
Parcel out = Parcel.obtain();
writeSummaryToParcel(out, true);
- mLastWriteTime = SystemClock.elapsedRealtime();
+ mLastWriteTime = mClocks.elapsedRealtime();
if (mPendingWrite != null) {
mPendingWrite.recycle();
@@ -9583,8 +9719,8 @@
if (mHistoryBuffer.dataPosition() > 0) {
mRecordingHistory = true;
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
+ final long elapsedRealtime = mClocks.elapsedRealtime();
+ final long uptime = mClocks.uptimeMillis();
if (USE_OLD_HISTORY) {
addHistoryRecordLocked(elapsedRealtime, uptime, HistoryItem.CMD_START, mHistoryCur);
}
@@ -9663,7 +9799,7 @@
// We are just arbitrarily going to insert 1 minute from the sample of
// the last run until samples in this run.
if (mHistoryBaseTime > 0) {
- long oldnow = SystemClock.elapsedRealtime();
+ long oldnow = mClocks.elapsedRealtime();
mHistoryBaseTime = mHistoryBaseTime - oldnow + 1;
if (DEBUG_HISTORY) {
StringBuilder sb = new StringBuilder(128);
@@ -9870,7 +10006,7 @@
}
for (int iu = 0; iu < NU; iu++) {
int uid = in.readInt();
- Uid u = new Uid(uid);
+ Uid u = new Uid(this, uid);
mUidStats.put(uid, u);
u.mWifiRunning = false;
@@ -10083,8 +10219,8 @@
// if we had originally pulled a time before the RTC was set.
long startClockTime = getStartClockTime();
- final long NOW_SYS = SystemClock.uptimeMillis() * 1000;
- final long NOWREAL_SYS = SystemClock.elapsedRealtime() * 1000;
+ final long NOW_SYS = mClocks.uptimeMillis() * 1000;
+ final long NOWREAL_SYS = mClocks.elapsedRealtime() * 1000;
out.writeInt(VERSION);
@@ -10469,29 +10605,34 @@
mOnBatteryScreenOffTimeBase.readFromParcel(in);
mScreenState = Display.STATE_UNKNOWN;
- mScreenOnTimer = new StopwatchTimer(null, -1, null, mOnBatteryTimeBase, in);
+ mScreenOnTimer = new StopwatchTimer(mClocks, null, -1, null, mOnBatteryTimeBase, in);
for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
- mScreenBrightnessTimer[i] = new StopwatchTimer(null, -100-i, null, mOnBatteryTimeBase,
- in);
+ mScreenBrightnessTimer[i] = new StopwatchTimer(mClocks, null, -100-i, null,
+ mOnBatteryTimeBase, in);
}
mInteractive = false;
- mInteractiveTimer = new StopwatchTimer(null, -10, null, mOnBatteryTimeBase, in);
+ mInteractiveTimer = new StopwatchTimer(mClocks, null, -10, null, mOnBatteryTimeBase, in);
mPhoneOn = false;
- mPowerSaveModeEnabledTimer = new StopwatchTimer(null, -2, null, mOnBatteryTimeBase, in);
+ mPowerSaveModeEnabledTimer = new StopwatchTimer(mClocks, null, -2, null,
+ mOnBatteryTimeBase, in);
mLongestLightIdleTime = in.readLong();
mLongestFullIdleTime = in.readLong();
- mDeviceIdleModeLightTimer = new StopwatchTimer(null, -14, null, mOnBatteryTimeBase, in);
- mDeviceIdleModeFullTimer = new StopwatchTimer(null, -11, null, mOnBatteryTimeBase, in);
- mDeviceLightIdlingTimer = new StopwatchTimer(null, -15, null, mOnBatteryTimeBase, in);
- mDeviceIdlingTimer = new StopwatchTimer(null, -12, null, mOnBatteryTimeBase, in);
- mPhoneOnTimer = new StopwatchTimer(null, -3, null, mOnBatteryTimeBase, in);
+ mDeviceIdleModeLightTimer = new StopwatchTimer(mClocks, null, -14, null,
+ mOnBatteryTimeBase, in);
+ mDeviceIdleModeFullTimer = new StopwatchTimer(mClocks, null, -11, null,
+ mOnBatteryTimeBase, in);
+ mDeviceLightIdlingTimer = new StopwatchTimer(mClocks, null, -15, null,
+ mOnBatteryTimeBase, in);
+ mDeviceIdlingTimer = new StopwatchTimer(mClocks, null, -12, null, mOnBatteryTimeBase, in);
+ mPhoneOnTimer = new StopwatchTimer(mClocks, null, -3, null, mOnBatteryTimeBase, in);
for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {
- mPhoneSignalStrengthsTimer[i] = new StopwatchTimer(null, -200-i,
+ mPhoneSignalStrengthsTimer[i] = new StopwatchTimer(mClocks, null, -200-i,
null, mOnBatteryTimeBase, in);
}
- mPhoneSignalScanningTimer = new StopwatchTimer(null, -200+1, null, mOnBatteryTimeBase, in);
+ mPhoneSignalScanningTimer = new StopwatchTimer(mClocks, null, -200+1, null,
+ mOnBatteryTimeBase, in);
for (int i=0; i<NUM_DATA_CONNECTION_TYPES; i++) {
- mPhoneDataConnectionsTimer[i] = new StopwatchTimer(null, -300-i,
+ mPhoneDataConnectionsTimer[i] = new StopwatchTimer(mClocks, null, -300-i,
null, mOnBatteryTimeBase, in);
}
for (int i = 0; i < NUM_NETWORK_ACTIVITY_TYPES; i++) {
@@ -10499,27 +10640,29 @@
mNetworkPacketActivityCounters[i] = new LongSamplingCounter(mOnBatteryTimeBase, in);
}
mMobileRadioPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_LOW;
- mMobileRadioActiveTimer = new StopwatchTimer(null, -400, null, mOnBatteryTimeBase, in);
- mMobileRadioActivePerAppTimer = new StopwatchTimer(null, -401, null, mOnBatteryTimeBase,
- in);
+ mMobileRadioActiveTimer = new StopwatchTimer(mClocks, null, -400, null,
+ mOnBatteryTimeBase, in);
+ mMobileRadioActivePerAppTimer = new StopwatchTimer(mClocks, null, -401, null,
+ mOnBatteryTimeBase, in);
mMobileRadioActiveAdjustedTime = new LongSamplingCounter(mOnBatteryTimeBase, in);
mMobileRadioActiveUnknownTime = new LongSamplingCounter(mOnBatteryTimeBase, in);
mMobileRadioActiveUnknownCount = new LongSamplingCounter(mOnBatteryTimeBase, in);
mWifiRadioPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_LOW;
mWifiOn = false;
- mWifiOnTimer = new StopwatchTimer(null, -4, null, mOnBatteryTimeBase, in);
+ mWifiOnTimer = new StopwatchTimer(mClocks, null, -4, null, mOnBatteryTimeBase, in);
mGlobalWifiRunning = false;
- mGlobalWifiRunningTimer = new StopwatchTimer(null, -5, null, mOnBatteryTimeBase, in);
+ mGlobalWifiRunningTimer = new StopwatchTimer(mClocks, null, -5, null,
+ mOnBatteryTimeBase, in);
for (int i=0; i<NUM_WIFI_STATES; i++) {
- mWifiStateTimer[i] = new StopwatchTimer(null, -600-i,
+ mWifiStateTimer[i] = new StopwatchTimer(mClocks, null, -600-i,
null, mOnBatteryTimeBase, in);
}
for (int i=0; i<NUM_WIFI_SUPPL_STATES; i++) {
- mWifiSupplStateTimer[i] = new StopwatchTimer(null, -700-i,
+ mWifiSupplStateTimer[i] = new StopwatchTimer(mClocks, null, -700-i,
null, mOnBatteryTimeBase, in);
}
for (int i=0; i<NUM_WIFI_SIGNAL_STRENGTH_BINS; i++) {
- mWifiSignalStrengthsTimer[i] = new StopwatchTimer(null, -800-i,
+ mWifiSignalStrengthsTimer[i] = new StopwatchTimer(mClocks, null, -800-i,
null, mOnBatteryTimeBase, in);
}
@@ -10537,15 +10680,15 @@
mLoadedNumConnectivityChange = in.readInt();
mUnpluggedNumConnectivityChange = in.readInt();
mAudioOnNesting = 0;
- mAudioOnTimer = new StopwatchTimer(null, -7, null, mOnBatteryTimeBase);
+ mAudioOnTimer = new StopwatchTimer(mClocks, null, -7, null, mOnBatteryTimeBase);
mVideoOnNesting = 0;
- mVideoOnTimer = new StopwatchTimer(null, -8, null, mOnBatteryTimeBase);
+ mVideoOnTimer = new StopwatchTimer(mClocks, null, -8, null, mOnBatteryTimeBase);
mFlashlightOnNesting = 0;
- mFlashlightOnTimer = new StopwatchTimer(null, -9, null, mOnBatteryTimeBase, in);
+ mFlashlightOnTimer = new StopwatchTimer(mClocks, null, -9, null, mOnBatteryTimeBase, in);
mCameraOnNesting = 0;
- mCameraOnTimer = new StopwatchTimer(null, -13, null, mOnBatteryTimeBase, in);
+ mCameraOnTimer = new StopwatchTimer(mClocks, null, -13, null, mOnBatteryTimeBase, in);
mBluetoothScanNesting = 0;
- mBluetoothScanTimer = new StopwatchTimer(null, -14, null, mOnBatteryTimeBase, in);
+ mBluetoothScanTimer = new StopwatchTimer(mClocks, null, -14, null, mOnBatteryTimeBase, in);
mDischargeUnplugLevel = in.readInt();
mDischargePlugLevel = in.readInt();
mDischargeCurrentLevel = in.readInt();
@@ -10565,7 +10708,7 @@
for (int ikw = 0; ikw < NKW; ikw++) {
if (in.readInt() != 0) {
String wakelockName = in.readString();
- SamplingTimer kwlt = new SamplingTimer(mOnBatteryScreenOffTimeBase, in);
+ SamplingTimer kwlt = new SamplingTimer(mClocks, mOnBatteryScreenOffTimeBase, in);
mKernelWakelockStats.put(wakelockName, kwlt);
}
}
@@ -10575,7 +10718,7 @@
for (int iwr = 0; iwr < NWR; iwr++) {
if (in.readInt() != 0) {
String reasonName = in.readString();
- SamplingTimer timer = new SamplingTimer(mOnBatteryTimeBase, in);
+ SamplingTimer timer = new SamplingTimer(mClocks, mOnBatteryTimeBase, in);
mWakeupReasonStats.put(reasonName, timer);
}
}
@@ -10597,7 +10740,7 @@
mUidStats.clear();
for (int i = 0; i < numUids; i++) {
int uid = in.readInt();
- Uid u = new Uid(uid);
+ Uid u = new Uid(this, uid);
u.readFromParcelLocked(mOnBatteryTimeBase, mOnBatteryScreenOffTimeBase, in);
mUidStats.append(uid, u);
}
@@ -10620,8 +10763,8 @@
// if we had originally pulled a time before the RTC was set.
long startClockTime = getStartClockTime();
- final long uSecUptime = SystemClock.uptimeMillis() * 1000;
- final long uSecRealtime = SystemClock.elapsedRealtime() * 1000;
+ final long uSecUptime = mClocks.uptimeMillis() * 1000;
+ final long uSecRealtime = mClocks.elapsedRealtime() * 1000;
final long batteryRealtime = mOnBatteryTimeBase.getRealtime(uSecRealtime);
final long batteryScreenOffRealtime = mOnBatteryScreenOffTimeBase.getRealtime(uSecRealtime);
diff --git a/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp b/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp
index 14badb7..4b2a72d 100644
--- a/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp
+++ b/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp
@@ -175,13 +175,13 @@
{"nCreatePathPropertyHolder", "!(JIFF)J", (void*)createPathPropertyHolder},
{"nCreateRootAlphaPropertyHolder", "!(JFF)J", (void*)createRootAlphaPropertyHolder},
{"nSetPropertyHolderData", "(J[FI)V", (void*)setPropertyHolderData},
- {"nStart", "(JLandroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimator;I)V", (void*)start},
- {"nReverse", "(JLandroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimator;I)V", (void*)reverse},
+ {"nStart", "(JLandroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimatorRT;I)V", (void*)start},
+ {"nReverse", "(JLandroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimatorRT;I)V", (void*)reverse},
{"nEnd", "!(J)V", (void*)end},
{"nReset", "!(J)V", (void*)reset},
};
-const char* const kClassPathName = "android/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimator";
+const char* const kClassPathName = "android/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimatorRT";
int register_android_graphics_drawable_AnimatedVectorDrawable(JNIEnv* env) {
gVectorDrawableAnimatorClassInfo.clazz = FindClassOrDie(env, kClassPathName);
gVectorDrawableAnimatorClassInfo.clazz = MakeGlobalRefOrDie(env,
@@ -189,7 +189,7 @@
gVectorDrawableAnimatorClassInfo.callOnFinished = GetStaticMethodIDOrDie(
env, gVectorDrawableAnimatorClassInfo.clazz, "callOnFinished",
- "(Landroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimator;I)V");
+ "(Landroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimatorRT;I)V");
return RegisterMethodsOrDie(env, "android/graphics/drawable/AnimatedVectorDrawable",
gMethods, NELEM(gMethods));
}
diff --git a/core/jni/android_view_DisplayListCanvas.cpp b/core/jni/android_view_DisplayListCanvas.cpp
index 03c94a6..c87a770 100644
--- a/core/jni/android_view_DisplayListCanvas.cpp
+++ b/core/jni/android_view_DisplayListCanvas.cpp
@@ -160,7 +160,7 @@
}
// In the emulator this property will be set > 0 when OpenGL ES 2.0 is
// enabled, 0 otherwise. On old emulator versions it will be undefined.
- property_get("ro.kernel.qemu.gles", prop, "0");
+ property_get("qemu.gles", prop, "0");
return atoi(prop) > 0 ? JNI_TRUE : JNI_FALSE;
}
diff --git a/core/res/res/layout/language_picker_item.xml b/core/res/res/layout/language_picker_item.xml
index 22cb514..88012a9 100644
--- a/core/res/res/layout/language_picker_item.xml
+++ b/core/res/res/layout/language_picker_item.xml
@@ -14,37 +14,16 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:layoutDirection="locale"
- android:textDirection="locale"
- android:paddingBottom="8dp"
- android:paddingTop="8dp">
-
- <TextView
- android:id="@+id/locale"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- tools:text="France"
- android:layout_weight="1"
- android:padding="12dp"
- android:paddingStart="18dp"
- android:paddingEnd="18dp"
- android:textAppearance="?android:attr/textAppearanceListItem"/>
-
- <ImageView
- android:id="@+id/l10nWarn"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@android:drawable/stat_sys_warning"
- android:focusableInTouchMode="false"
- android:focusable="false"
- android:paddingStart="12dp"
- android:paddingEnd="12dp"
- android:tint="?android:attr/colorAccent"/>
-
-</LinearLayout>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/locale"
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:textAppearance="?android:attr/textAppearanceListItem"
+ android:layoutDirection="locale"
+ android:textDirection="locale"
+ android:paddingBottom="8dp"
+ android:paddingTop="8dp" />
diff --git a/core/res/res/layout/language_picker_section_header.xml b/core/res/res/layout/language_picker_section_header.xml
index b12ec8c..6cbd7c3 100644
--- a/core/res/res/layout/language_picker_section_header.xml
+++ b/core/res/res/layout/language_picker_section_header.xml
@@ -23,4 +23,5 @@
android:paddingStart="18dp"
android:paddingEnd="18dp"
android:textColor="?android:attr/colorAccent"
+ android:textStyle="bold"
tools:text="@string/language_picker_section_all"/>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 3e9a6ca..70bed2d 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -185,8 +185,6 @@
<!-- Displayed to tell the user that they cannot change the caller ID setting. -->
<string name="CLIRPermanent">You can\'t change the caller ID setting.</string>
- <!-- Notification title to tell the user that restricted state is changed by access control. -->
- <string name="RestrictedChangedTitle">Restricted access changed</string>
<!-- Displayed to tell the user that data service is blocked by access control. -->
<string name="RestrictedOnData">Data service is blocked.</string>
<!-- Displayed to tell the user that emergency service is blocked by access control. -->
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index a7a9292..f791ce6 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -484,7 +484,6 @@
<java-symbol type="string" name="Noon" />
<java-symbol type="string" name="PinMmi" />
<java-symbol type="string" name="PwdMmi" />
- <java-symbol type="string" name="RestrictedChangedTitle" />
<java-symbol type="string" name="RestrictedOnAllVoice" />
<java-symbol type="string" name="RestrictedOnData" />
<java-symbol type="string" name="RestrictedOnEmergency" />
@@ -2486,7 +2485,6 @@
<java-symbol type="string" name="status_bar_clock" />
<!-- Locale picker -->
- <java-symbol type="id" name="l10nWarn" />
<java-symbol type="id" name="locale_search_menu" />
<java-symbol type="layout" name="language_picker_item" />
<java-symbol type="layout" name="language_picker_section_header" />
diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsServTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsServTest.java
new file mode 100644
index 0000000..1c3cd38
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsServTest.java
@@ -0,0 +1,745 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.os;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+
+import android.os.BatteryStats;
+import android.os.Parcel;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Log;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.android.internal.os.BatteryStatsImpl;
+
+/**
+ * Provides test cases for android.os.BatteryStats.
+ */
+public class BatteryStatsServTest extends TestCase {
+ private static final String TAG = "BatteryStatsServTest";
+
+ public static class TestServ extends BatteryStatsImpl.Uid.Pkg.Serv {
+ TestServ(MockBatteryStatsImpl bsi) {
+ super(bsi);
+ }
+
+ void populate() {
+ mStartTime = 1010;
+ mRunningSince = 2021;
+ mRunning = true;
+ mStarts = 4042;
+ mLaunchedTime = 5053;
+ mLaunchedSince = 6064;
+ mLaunched = true;
+ mLaunches = 8085;
+ mLoadedStartTime = 9096;
+ mLoadedStarts = 10017;
+ mLoadedLaunches = 11118;
+ mLastStartTime = 12219;
+ mLastStarts = 13310;
+ mLastLaunches = 14411;
+ mUnpluggedStartTime = 15512;
+ mUnpluggedStarts = 16613;
+ mUnpluggedLaunches = 17714;
+ }
+
+ long getStartTime() {
+ return mStartTime;
+ }
+
+ long getRunningSince() {
+ return mRunningSince;
+ }
+
+ void setRunning(boolean val) {
+ mRunning = val;
+ }
+
+ boolean getRunning() {
+ return mRunning;
+ }
+
+ int getStarts() {
+ return mStarts;
+ }
+
+ long getLaunchedTime() {
+ return mLaunchedTime;
+ }
+
+ long getLaunchedSince() {
+ return mLaunchedSince;
+ }
+
+ void setLaunched(boolean val) {
+ mLaunched = val;
+ }
+
+ boolean getLaunched() {
+ return mLaunched;
+ }
+
+ int getLaunches() {
+ return mLaunches;
+ }
+
+ long getLoadedStartTime() {
+ return mLoadedStartTime;
+ }
+
+ int getLoadedStarts() {
+ return mLoadedStarts;
+ }
+
+ int getLoadedLaunches() {
+ return mLoadedLaunches;
+ }
+
+ long getLastStartTime() {
+ return mLastStartTime;
+ }
+
+ int getLastStarts() {
+ return mLastStarts;
+ }
+
+ int getLastLaunches() {
+ return mLastLaunches;
+ }
+
+ long getUnpluggedStartTime() {
+ return mUnpluggedStartTime;
+ }
+
+ int getUnpluggedStarts() {
+ return mUnpluggedStarts;
+ }
+
+ int getUnpluggedLaunches() {
+ return mUnpluggedLaunches;
+ }
+ }
+
+ /**
+ * Test that the constructor and detach methods touch the time bast observer list.
+ */
+ @SmallTest
+ public void testConstructAndDetach() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl();
+
+ TestServ serv = new TestServ(bsi);
+ Assert.assertTrue(bsi.getOnBatteryTimeBase().hasObserver(serv));
+
+ serv.detach();
+ Assert.assertFalse(bsi.getOnBatteryTimeBase().hasObserver(serv));
+ }
+
+ /**
+ * Test OnTimeStarted
+ */
+ @SmallTest
+ public void testOnTimeStarted() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl();
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setRunning(true);
+ serv.onTimeStarted(111111, 20000, 222222);
+ Assert.assertEquals(18989, serv.getUnpluggedStartTime());
+ Assert.assertEquals(4042, serv.getUnpluggedStarts());
+ Assert.assertEquals(8085, serv.getUnpluggedLaunches());
+
+ serv.populate();
+ serv.setRunning(false);
+ serv.onTimeStarted(111111, 20000, 222222);
+ Assert.assertEquals(1010, serv.getUnpluggedStartTime());
+ Assert.assertEquals(4042, serv.getUnpluggedStarts());
+ Assert.assertEquals(8085, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test parceling and unparceling.
+ */
+ @SmallTest
+ public void testParceling() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl();
+ TestServ orig = new TestServ(bsi);
+ orig.populate();
+
+ Parcel parcel = Parcel.obtain();
+ orig.writeToParcelLocked(parcel);
+
+ parcel.setDataPosition(0);
+
+ TestServ serv = new TestServ(bsi);
+ serv.readFromParcelLocked(parcel);
+
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertTrue(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(0, serv.getLastStartTime());
+ Assert.assertEquals(0, serv.getLastStarts());
+ Assert.assertEquals(0, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test getLaunchTimeToNow()
+ */
+ @SmallTest
+ public void testLaunchTimeToNow() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl();
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setLaunched(true);
+ Assert.assertEquals(8989, serv.getLaunchTimeToNowLocked(10000));
+
+ serv.populate();
+ serv.setLaunched(false);
+ Assert.assertEquals(5053, serv.getLaunchTimeToNowLocked(10000));
+
+ }
+
+ /**
+ * Test getStartTimeToNow()
+ */
+ @SmallTest
+ public void testStartTimeToNow() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl();
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setRunning(true);
+ Assert.assertEquals(18989, serv.getStartTimeToNowLocked(20000));
+
+ serv.populate();
+ serv.setRunning(false);
+ Assert.assertEquals(1010, serv.getStartTimeToNowLocked(20000));
+ }
+
+ /**
+ * Test startLaunchedLocked while not previously launched
+ */
+ @SmallTest
+ public void testStartLaunchedLockedWhileLaunched() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {
+ @Override
+ public long getBatteryUptimeLocked() {
+ return 777777L;
+ }
+ };
+
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setLaunched(true);
+ serv.startLaunchedLocked();
+
+ // No changes
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertTrue(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test startLaunchedLocked while previously launched
+ */
+ @SmallTest
+ public void testStartLaunchedLockedWhileNotLaunched() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {
+ @Override
+ public long getBatteryUptimeLocked() {
+ return 777777L;
+ }
+ };
+
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setLaunched(false);
+ serv.startLaunchedLocked();
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(777777L, serv.getLaunchedSince()); // <-- changed
+ Assert.assertTrue(serv.getLaunched()); // <-- changed
+ Assert.assertEquals(8086, serv.getLaunches()); // <-- changed
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test stopLaunchedLocked when not previously launched.
+ */
+ @SmallTest
+ public void testStopLaunchedLockedWhileNotLaunched() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {
+ @Override
+ public long getBatteryUptimeLocked() {
+ return 777777L;
+ }
+ };
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setLaunched(false);
+
+ serv.stopLaunchedLocked();
+
+ // No changes
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertFalse(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test stopLaunchedLocked when previously launched, with measurable time between
+ * start and stop.
+ */
+ @SmallTest
+ public void testStopLaunchedLockedWhileLaunchedNormal() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {
+ @Override
+ public long getBatteryUptimeLocked() {
+ return 777777L;
+ }
+ };
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setLaunched(true);
+
+ serv.stopLaunchedLocked();
+
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(777777L-6064+5053, serv.getLaunchedTime()); // <-- changed
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertFalse(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test stopLaunchedLocked when previously launched, with no measurable time between
+ * start and stop.
+ */
+ @SmallTest
+ public void testStopLaunchedLockedWhileLaunchedTooQuick() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {
+ @Override
+ public long getBatteryUptimeLocked() {
+ return 6064L;
+ }
+ };
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setLaunched(true);
+
+ serv.stopLaunchedLocked();
+
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertFalse(serv.getLaunched());
+ Assert.assertEquals(8085-1, serv.getLaunches()); // <-- changed
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test startRunningLocked while previously running
+ */
+ @SmallTest
+ public void testStartRunningLockedWhileRunning() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {
+ @Override
+ public long getBatteryUptimeLocked() {
+ return 777777L;
+ }
+ };
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setRunning(true);
+
+ serv.startRunningLocked();
+
+ // no change
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertTrue(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test startRunningLocked while not previously launched
+ */
+ @SmallTest
+ public void testStartRunningLockedWhileNotRunning() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {
+ @Override
+ public long getBatteryUptimeLocked() {
+ return 777777L;
+ }
+ };
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setRunning(false);
+
+ serv.startRunningLocked();
+
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(777777L, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042+1, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertTrue(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test stopRunningLocked when previously launched, with measurable time between
+ * start and stop.
+ */
+ @SmallTest
+ public void testStopRunningLockedWhileRunningNormal() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {
+ @Override
+ public long getBatteryUptimeLocked() {
+ return 777777L;
+ }
+ };
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setRunning(true);
+
+ serv.stopRunningLocked();
+
+ Assert.assertEquals(777777L-2021+1010, serv.getStartTime()); // <-- changed
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertFalse(serv.getRunning()); // <-- changed
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertTrue(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test stopRunningLocked when previously launched, with measurable time between
+ * start and stop.
+ */
+ @SmallTest
+ public void testStopRunningLockedWhileRunningTooQuick() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl() {
+ @Override
+ public long getBatteryUptimeLocked() {
+ return 2021;
+ }
+ };
+ TestServ serv = new TestServ(bsi);
+
+ serv.populate();
+ serv.setRunning(true);
+
+ serv.stopRunningLocked();
+
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertFalse(serv.getRunning()); // <-- changed
+ Assert.assertEquals(4042-1, serv.getStarts()); // <-- changed
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertTrue(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test that getBatteryStats returns the BatteryStatsImpl passed in to the contstructor.
+ */
+ @SmallTest
+ public void testGetBatteryStats() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl();
+ TestServ serv = new TestServ(bsi);
+
+ Assert.assertEquals(bsi, serv.getBatteryStats());
+ }
+
+ /**
+ * Test getLaunches
+ */
+ @SmallTest
+ public void testGetLaunches() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl();
+ TestServ serv = new TestServ(bsi);
+ serv.populate();
+
+ Assert.assertEquals(8085, serv.getLaunches(BatteryStats.STATS_SINCE_CHARGED));
+ Assert.assertEquals(8085-11118, serv.getLaunches(BatteryStats.STATS_CURRENT));
+ Assert.assertEquals(8085-17714, serv.getLaunches(BatteryStats.STATS_SINCE_UNPLUGGED));
+
+ // No change to fields
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertTrue(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test getStartTime while running
+ */
+ @SmallTest
+ public void testGetStartTimeRunning() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl();
+ TestServ serv = new TestServ(bsi);
+ serv.populate();
+ serv.setRunning(true);
+
+ final long startTimeToNow = 1010 + 20000 - 2021;
+
+ Assert.assertEquals(startTimeToNow,
+ serv.getStartTime(20000, BatteryStats.STATS_SINCE_CHARGED));
+ Assert.assertEquals(startTimeToNow-9096,
+ serv.getStartTime(20000, BatteryStats.STATS_CURRENT));
+ Assert.assertEquals(startTimeToNow-15512,
+ serv.getStartTime(20000, BatteryStats.STATS_SINCE_UNPLUGGED));
+
+ // No change to fields
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertTrue(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+ /**
+ * Test getStartTime while not running
+ */
+ @SmallTest
+ public void testGetStartTimeNotRunning() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl();
+ TestServ serv = new TestServ(bsi);
+ serv.populate();
+ serv.setRunning(false);
+
+ final long startTimeToNow = 1010;
+
+ Assert.assertEquals(startTimeToNow,
+ serv.getStartTime(20000, BatteryStats.STATS_SINCE_CHARGED));
+ Assert.assertEquals(startTimeToNow-9096,
+ serv.getStartTime(20000, BatteryStats.STATS_CURRENT));
+ Assert.assertEquals(startTimeToNow-15512,
+ serv.getStartTime(20000, BatteryStats.STATS_SINCE_UNPLUGGED));
+
+ // No change to fields
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertFalse(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertTrue(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+
+ /**
+ * Test getStarts
+ */
+ @SmallTest
+ public void testGetStarts() throws Exception {
+ MockBatteryStatsImpl bsi = new MockBatteryStatsImpl();
+ TestServ serv = new TestServ(bsi);
+ serv.populate();
+
+ Assert.assertEquals(4042, serv.getStarts(BatteryStats.STATS_SINCE_CHARGED));
+ Assert.assertEquals(4042-10017, serv.getStarts(BatteryStats.STATS_CURRENT));
+ Assert.assertEquals(4042-16613, serv.getStarts(BatteryStats.STATS_SINCE_UNPLUGGED));
+
+ // No change to fields
+ Assert.assertEquals(1010, serv.getStartTime());
+ Assert.assertEquals(2021, serv.getRunningSince());
+ Assert.assertTrue(serv.getRunning());
+ Assert.assertEquals(4042, serv.getStarts());
+ Assert.assertEquals(5053, serv.getLaunchedTime());
+ Assert.assertEquals(6064, serv.getLaunchedSince());
+ Assert.assertTrue(serv.getLaunched());
+ Assert.assertEquals(8085, serv.getLaunches());
+ Assert.assertEquals(9096, serv.getLoadedStartTime());
+ Assert.assertEquals(10017, serv.getLoadedStarts());
+ Assert.assertEquals(11118, serv.getLoadedLaunches());
+ Assert.assertEquals(12219, serv.getLastStartTime());
+ Assert.assertEquals(13310, serv.getLastStarts());
+ Assert.assertEquals(14411, serv.getLastLaunches());
+ Assert.assertEquals(15512, serv.getUnpluggedStartTime());
+ Assert.assertEquals(16613, serv.getUnpluggedStarts());
+ Assert.assertEquals(17714, serv.getUnpluggedLaunches());
+ }
+
+}
+
diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
new file mode 100644
index 0000000..05aa53c
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
@@ -0,0 +1,15 @@
+package com.android.internal.os;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ BatteryStatsServTest.class,
+ BatteryStatsTimeBaseTest.class,
+ BatteryStatsTimerTest.class,
+ BatteryStatsUidTest.class,
+ })
+public class BatteryStatsTests {
+}
+
diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimeBaseTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimeBaseTest.java
new file mode 100644
index 0000000..ab92f15
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimeBaseTest.java
@@ -0,0 +1,339 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.os;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+
+import android.os.BatteryStats;
+import android.os.Parcel;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Log;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.mockito.Mockito;
+
+/**
+ * Provides test cases for android.os.BatteryStats.
+ */
+public class BatteryStatsTimeBaseTest extends TestCase {
+ private static final String TAG = "BatteryStatsTimeBaseTest";
+
+ static class TestTimeBase extends BatteryStatsImpl.TimeBase {
+
+ public void populate(long uptime, long realtime, boolean running, long pastUptime,
+ long uptimeStart, long pastRealtime, long realtimeStart,
+ long unpluggedUptime, long unpluggedRealtime) {
+ mUptime = uptime;
+ mRealtime = realtime;
+ mRunning = running;
+ mPastUptime = pastUptime;
+ mUptimeStart = uptimeStart;
+ mPastRealtime = pastRealtime;
+ mRealtimeStart = realtimeStart;
+ mUnpluggedUptime = unpluggedUptime;
+ mUnpluggedRealtime = unpluggedRealtime;
+ }
+
+ public void verify(long uptime, long realtime, boolean running, long pastUptime,
+ long uptimeStart, long pastRealtime, long realtimeStart,
+ long unpluggedUptime, long unpluggedRealtime) {
+ Assert.assertEquals(uptime, mUptime);
+ Assert.assertEquals(realtime, mRealtime);
+ Assert.assertEquals(running, mRunning);
+ Assert.assertEquals(pastUptime, mPastUptime);
+ Assert.assertEquals(uptimeStart, mUptimeStart);
+ Assert.assertEquals(pastRealtime, mPastRealtime);
+ Assert.assertEquals(realtimeStart, mRealtimeStart);
+ Assert.assertEquals(unpluggedUptime, mUnpluggedUptime);
+ Assert.assertEquals(unpluggedRealtime, mUnpluggedRealtime);
+ }
+ }
+
+ /**
+ * Test the observers and the setRunning call.
+ */
+ @SmallTest
+ public void testRunning() throws Exception {
+ TestTimeBase tb = new TestTimeBase();
+
+ // Toggle running once, to accumulate past uptime and past realtime
+ // so the test values aren't 0.
+ tb.setRunning(true, 100, 10000);
+ tb.setRunning(false, 200, 11000);
+ Assert.assertEquals(100, tb.getUptimeStart());
+ Assert.assertEquals(10000, tb.getRealtimeStart());
+
+ // Create some observers
+ BatteryStatsImpl.TimeBaseObs observer1 = Mockito.mock(BatteryStatsImpl.TimeBaseObs.class);
+ BatteryStatsImpl.TimeBaseObs observer2 = Mockito.mock(BatteryStatsImpl.TimeBaseObs.class);
+ BatteryStatsImpl.TimeBaseObs observer3 = Mockito.mock(BatteryStatsImpl.TimeBaseObs.class);
+
+ // Add them
+ tb.add(observer1);
+ tb.add(observer2);
+ tb.add(observer3);
+ Assert.assertTrue(tb.hasObserver(observer1));
+ Assert.assertTrue(tb.hasObserver(observer2));
+ Assert.assertTrue(tb.hasObserver(observer3));
+
+ // Remove one
+ tb.remove(observer3);
+ Assert.assertTrue(tb.hasObserver(observer1));
+ Assert.assertTrue(tb.hasObserver(observer2));
+ Assert.assertFalse(tb.hasObserver(observer3));
+
+ // Start running, make sure we get a started call on the two active observers
+ // and not the third.
+ tb.setRunning(true, 250, 14000);
+
+ Assert.assertTrue(tb.isRunning());
+
+ if (false) {
+ Log.d(TAG, "mUptimeStart=" + tb.getUptimeStart()
+ + " mRealtimeStart=" + tb.getRealtimeStart()
+ + " mUptime=" + tb.getUptime(250)
+ + " mRealtime=" + tb.getRealtime(14000)
+ + " isRunning=" + tb.isRunning());
+ }
+
+ Assert.assertEquals(250, tb.getUptimeStart());
+ Assert.assertEquals(14000, tb.getRealtimeStart());
+ Assert.assertEquals(100, tb.getUptime(250));
+ Assert.assertEquals(1000, tb.getRealtime(14000));
+
+ Mockito.verify(observer1).onTimeStarted(14000, 100, 1000);
+ Mockito.verify(observer1, Mockito.never()).onTimeStopped(-1, -1, -1);
+ Mockito.verifyNoMoreInteractions(observer1);
+ Mockito.verify(observer2).onTimeStarted(14000, 100, 1000);
+ Mockito.verify(observer2, Mockito.never()).onTimeStopped(-1, -1, -1);
+ Mockito.verifyNoMoreInteractions(observer2);
+
+ Mockito.reset(observer1);
+ Mockito.reset(observer2);
+ Mockito.reset(observer3);
+
+ // Advance the "timer" and make sure the getters account for the current time passed in
+ Assert.assertEquals(400, tb.getUptime(550));
+ Assert.assertEquals(1555, tb.getRealtime(14555));
+
+ // Stop running, make sure we get a stopped call on the two active observers
+ // and not the third.
+ tb.setRunning(false, 402, 14002);
+
+ Assert.assertFalse(tb.isRunning());
+
+ if (false) {
+ Log.d(TAG, "mUptimeStart=" + tb.getUptimeStart()
+ + " mRealtimeStart=" + tb.getRealtimeStart()
+ + " mUptime=" + tb.getUptime(250)
+ + " mRealtime=" + tb.getRealtime(14000)
+ + " isRunning=" + tb.isRunning());
+ }
+
+ Assert.assertEquals(252, tb.getUptime(402));
+ Assert.assertEquals(1002, tb.getRealtime(14002));
+
+ Mockito.verify(observer1).onTimeStopped(14002, 252, 1002);
+ Mockito.verify(observer1, Mockito.never()).onTimeStopped(-1, -1, -1);
+ Mockito.verifyNoMoreInteractions(observer1);
+ Mockito.verify(observer2).onTimeStopped(14002, 252, 1002);
+ Mockito.verify(observer2, Mockito.never()).onTimeStopped(-1, -1, -1);
+ Mockito.verifyNoMoreInteractions(observer2);
+
+ // Advance the "timer" and make sure the getters account for the current time passed in
+ // is the same as the time when running went to false.
+ Assert.assertEquals(252, tb.getUptime(600));
+ Assert.assertEquals(1002, tb.getRealtime(17000));
+ }
+
+ /**
+ * Test that reset while running updates the plugged and unplugged times
+ */
+ @SmallTest
+ public void testResetWhileRunning() throws Exception {
+ TestTimeBase tb = new TestTimeBase();
+ tb.populate(100, 200, true, 300, 400, 500, 600, 700, 800);
+
+ tb.reset(666, 6666);
+
+ // Not sure if this is a bug: reset while running does not
+ // reset mPastUptime, but while it is running it does.
+ tb.verify(100, 200, true, 300, 666, 500, 6666, 300, 500);
+ }
+
+ /**
+ * Test that reset while running updates the plugged and unplugged times
+ */
+ @SmallTest
+ public void testResetWhileNotRunning() throws Exception {
+ TestTimeBase tb = new TestTimeBase();
+ tb.populate(100, 200, false, 300, 400, 500, 600, 700, 800);
+
+ tb.reset(666, 6666);
+
+ tb.verify(100, 200, false, 0, 400, 0, 600, 700, 800);
+ }
+
+ /**
+ * Test init
+ */
+ @SmallTest
+ public void testInit() throws Exception {
+ TestTimeBase tb = new TestTimeBase();
+ tb.populate(100, 200, false, 300, 400, 500, 600, 700, 800);
+
+ tb.init(666, 6666);
+
+ tb.verify(0, 0, false, 0, 666, 0, 6666, 0, 0);
+ }
+
+ /**
+ * Test writeToParcel and readFromParcel
+ */
+ @SmallTest
+ public void testParcellingWhileRunning() throws Exception {
+ TestTimeBase tb1 = new TestTimeBase();
+
+ tb1.populate(100, 200, true, 300, 400, 500, 600, 700, 800);
+
+ Parcel parcel = Parcel.obtain();
+ tb1.writeToParcel(parcel, 666, 6666);
+
+ parcel.setDataPosition(0);
+
+ TestTimeBase tb2 = new TestTimeBase();
+ tb2.readFromParcel(parcel);
+
+ // Running is not preserved across parceling
+ tb2.verify(100, 200, false, 300+666-400, 400, 500+6666-600, 600, 700, 800);
+ }
+
+ /**
+ * Test writeToParcel and readFromParcel
+ */
+ @SmallTest
+ public void testParcellingWhileNotRunning() throws Exception {
+ TestTimeBase tb1 = new TestTimeBase();
+
+ tb1.populate(100, 200, false, 300, 400, 500, 600, 700, 800);
+
+ Parcel parcel = Parcel.obtain();
+ tb1.writeToParcel(parcel, 666, 6666);
+
+ parcel.setDataPosition(0);
+
+ TestTimeBase tb2 = new TestTimeBase();
+ tb2.readFromParcel(parcel);
+
+ tb2.verify(100, 200, false, 300, 400, 500, 600, 700, 800);
+ }
+
+ /**
+ * Test writeSummaryToParcel and readSummaryFromParcel
+ */
+ @SmallTest
+ public void testSummary() throws Exception {
+ TestTimeBase tb1 = new TestTimeBase();
+
+ tb1.populate(100, 200, true, 300, 400, 500, 600, 700, 800);
+
+ Parcel parcel = Parcel.obtain();
+ tb1.writeSummaryToParcel(parcel, 666, 6666);
+
+ parcel.setDataPosition(0);
+
+ TestTimeBase tb2 = new TestTimeBase();
+
+ // readSummaryFromParcel doesn't affect the other fields.
+ // Not sure if this is deliberate
+ tb2.populate(1, 2, true, 3, 4, 5, 6, 7, 8);
+
+ tb2.readSummaryFromParcel(parcel);
+
+ tb2.verify(666, 6766, true, 3, 4, 5, 6, 7, 8);
+ }
+
+ /**
+ * Test computeUptime
+ */
+ @SmallTest
+ public void testComputeUptime() throws Exception {
+ TestTimeBase tb = new TestTimeBase();
+
+ tb.populate(100, 200, true, 300, 400, 500, 600, 50, 60);
+
+ Assert.assertEquals(100+300+666-400,
+ tb.computeUptime(666, BatteryStats.STATS_SINCE_CHARGED));
+ Assert.assertEquals(300+666-400,
+ tb.computeUptime(666, BatteryStats.STATS_CURRENT));
+ Assert.assertEquals(300+666-400-50,
+ tb.computeUptime(666, BatteryStats.STATS_SINCE_UNPLUGGED));
+
+ Assert.assertEquals(0, tb.computeUptime(666, 6000));
+ }
+
+ /**
+ * Test computeUptime
+ */
+ @SmallTest
+ public void testComputeRealtime() throws Exception {
+ TestTimeBase tb = new TestTimeBase();
+
+ tb.populate(100, 200, true, 300, 400, 500, 600, 50, 60);
+
+ Assert.assertEquals(200+500+6666-600,
+ tb.computeRealtime(6666, BatteryStats.STATS_SINCE_CHARGED));
+ Assert.assertEquals(500+6666-600,
+ tb.computeRealtime(6666, BatteryStats.STATS_CURRENT));
+ Assert.assertEquals(500+6666-600-60,
+ tb.computeRealtime(6666, BatteryStats.STATS_SINCE_UNPLUGGED));
+
+ Assert.assertEquals(0, tb.computeUptime(666, 6000));
+ }
+
+ /**
+ * Test dump
+ */
+ @SmallTest
+ public void testDump() throws Exception {
+ TestTimeBase tb = new TestTimeBase();
+
+ tb.populate(100, 200, true, 300, 400, 500, 600, 50, 60);
+
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+
+ tb.dump(pw, "+++++ ");
+
+ pw.close();
+
+ // note the spaces at the ends of the lines which come from formatTimeMs.
+ final String CORRECT = "+++++ mRunning=true\n"
+ + "+++++ mUptime=0ms \n"
+ + "+++++ mRealtime=0ms \n"
+ + "+++++ mPastUptime=0ms mUptimeStart=0ms mUnpluggedUptime=0ms \n"
+ + "+++++ mPastRealtime=0ms mRealtimeStart=0ms mUnpluggedRealtime=0ms \n";
+
+ Assert.assertEquals(CORRECT, sw.toString());
+ }
+
+}
+
diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimerTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimerTest.java
new file mode 100644
index 0000000..3e17fcb
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsTimerTest.java
@@ -0,0 +1,487 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.os;
+
+import android.os.BatteryStats;
+import android.os.Parcel;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Log;
+import android.util.StringBuilderPrinter;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.android.internal.os.BatteryStatsImpl.Clocks;
+import com.android.internal.os.BatteryStatsImpl.TimeBase;
+import com.android.internal.os.BatteryStatsImpl.Timer;
+
+/**
+ * Provides test cases for android.os.BatteryStats.
+ */
+public class BatteryStatsTimerTest extends TestCase {
+ private static final String TAG = "BatteryStatsTest";
+
+ class TestTimer extends Timer {
+ long nextComputeRunTime;
+ long lastComputeRunTimeRealtime;
+
+ int nextComputeCurrentCount;
+
+ TestTimer(Clocks clocks, int type, TimeBase timeBase, Parcel in) {
+ super(clocks, type, timeBase, in);
+ }
+
+ TestTimer(Clocks clocks, int type, TimeBase timeBase) {
+ super(clocks, type, timeBase);
+ }
+
+ protected long computeRunTimeLocked(long curBatteryRealtime) {
+ lastComputeRunTimeRealtime = curBatteryRealtime;
+ return nextComputeRunTime;
+ }
+
+ protected int computeCurrentCountLocked() {
+ return nextComputeCurrentCount;
+ }
+
+ public int getCount() {
+ return mCount;
+ }
+
+ public void setCount(int val) {
+ mCount = val;
+ }
+
+ public int getLoadedCount() {
+ return mLoadedCount;
+ }
+
+ public void setLoadedCount(int val) {
+ mLoadedCount = val;
+ }
+
+ public int getLastCount() {
+ return mLastCount;
+ }
+
+ public void setLastCount(int val) {
+ mLastCount = val;
+ }
+
+ public int getUnpluggedCount() {
+ return mUnpluggedCount;
+ }
+
+ public void setUnpluggedCount(int val) {
+ mUnpluggedCount = val;
+ }
+
+ public long getTotalTime() {
+ return mTotalTime;
+ }
+
+ public void setTotalTime(long val) {
+ mTotalTime = val;
+ }
+
+ public long getLoadedTime() {
+ return mLoadedTime;
+ }
+
+ public void setLoadedTime(long val) {
+ mLoadedTime = val;
+ }
+
+ public long getLastTime() {
+ return mLastTime;
+ }
+
+ public void setLastTime(long val) {
+ mLastTime = val;
+ }
+
+ public long getUnpluggedTime() {
+ return mUnpluggedTime;
+ }
+
+ public void setUnpluggedTime(long val) {
+ mUnpluggedTime = val;
+ }
+
+ public long getTimeBeforeMark() {
+ return mTimeBeforeMark;
+ }
+
+ public void setTimeBeforeMark(long val) {
+ mTimeBeforeMark = val;
+ }
+ }
+
+ /**
+ * Tests that the flow through TimeBase.setRunning propagates through
+ * to the timer.
+ */
+ @SmallTest
+ public void testRunning() throws Exception {
+ TimeBase timeBase = new TimeBase();
+ MockClocks clocks = new MockClocks();
+
+ TestTimer timer = new TestTimer(clocks, 0, timeBase);
+ timer.nextComputeCurrentCount = 3000;
+
+ // Test that starting the timer counts the unplugged time and counters
+ timer.nextComputeRunTime = 4;
+ timer.onTimeStarted(10, 20, 50);
+ Assert.assertEquals(50, timer.lastComputeRunTimeRealtime);
+ Assert.assertEquals(4, timer.getUnpluggedTime());
+ Assert.assertEquals(0, timer.getUnpluggedCount());
+
+ // Test that stopping the timer updates mTotalTime and mCount
+ timer.nextComputeRunTime = 17;
+ timer.onTimeStopped(100, 130, 170);
+ Assert.assertEquals(17, timer.getTotalTime());
+ Assert.assertEquals(3000, timer.getCount());
+ }
+
+ /**
+ * Tests that the parcel can be parceled and unparceled without losing anything.
+ */
+ @SmallTest
+ public void testParceling() throws Exception {
+ TimeBase timeBase = new TimeBase();
+ MockClocks clocks = new MockClocks();
+
+ // Test write then read
+ TestTimer timer1 = new TestTimer(clocks, 0, timeBase);
+ timer1.setCount(1);
+ timer1.setLoadedCount(2);
+ timer1.setLastCount(3);
+ timer1.setUnpluggedCount(4);
+ timer1.setTotalTime(9223372036854775807L);
+ timer1.setLoadedTime(9223372036854775806L);
+ timer1.setLastTime(9223372036854775805L);
+ timer1.setUnpluggedTime(9223372036854775804L);
+ timer1.setTimeBeforeMark(9223372036854775803L);
+ timer1.nextComputeRunTime = 201;
+
+ Parcel parcel = Parcel.obtain();
+ Timer.writeTimerToParcel(parcel, timer1, 77);
+
+ parcel.setDataPosition(0);
+ Assert.assertTrue("parcel null object", parcel.readInt() != 0);
+
+ TestTimer timer2 = new TestTimer(clocks, 0, timeBase, parcel);
+ Assert.assertEquals(1, timer2.getCount());
+ Assert.assertEquals(2, timer2.getLoadedCount());
+ Assert.assertEquals(0, timer2.getLastCount()); // NOT saved
+ Assert.assertEquals(4, timer2.getUnpluggedCount());
+ Assert.assertEquals(201, timer2.getTotalTime()); // from computeRunTimeLocked()
+ Assert.assertEquals(9223372036854775806L, timer2.getLoadedTime());
+ Assert.assertEquals(0, timer2.getLastTime()); // NOT saved
+ Assert.assertEquals(9223372036854775804L, timer2.getUnpluggedTime());
+ Assert.assertEquals(9223372036854775803L, timer2.getTimeBeforeMark());
+
+ parcel.recycle();
+ }
+
+ /**
+ * Tests that the parcel can be parceled and unparceled without losing anything.
+ */
+ @SmallTest
+ public void testParcelingNull() throws Exception {
+ // Test writing null
+ Parcel parcel = Parcel.obtain();
+ Timer.writeTimerToParcel(parcel, null, 88);
+
+ parcel.setDataPosition(0);
+ Assert.assertEquals(0, parcel.readInt());
+
+ parcel.recycle();
+ }
+
+ /**
+ * Tests that reset() clears the correct times.
+ */
+ @SmallTest
+ public void testResetNoDetach() throws Exception {
+ TimeBase timeBase = new TimeBase();
+ MockClocks clocks = new MockClocks();
+
+ TestTimer timer = new TestTimer(clocks, 0, timeBase);
+ timer.setCount(1);
+ timer.setLoadedCount(2);
+ timer.setLastCount(3);
+ timer.setUnpluggedCount(4);
+ timer.setTotalTime(9223372036854775807L);
+ timer.setLoadedTime(9223372036854775806L);
+ timer.setLastTime(9223372036854775805L);
+ timer.setUnpluggedTime(9223372036854775804L);
+ timer.setTimeBeforeMark(9223372036854775803L);
+
+ timer.reset(false);
+
+ Assert.assertEquals(0, timer.getCount());
+ Assert.assertEquals(0, timer.getLoadedCount());
+ Assert.assertEquals(0, timer.getLastCount());
+ Assert.assertEquals(4, timer.getUnpluggedCount());
+ Assert.assertEquals(0, timer.getTotalTime());
+ Assert.assertEquals(0, timer.getLoadedTime());
+ Assert.assertEquals(0, timer.getLastTime());
+ Assert.assertEquals(9223372036854775804L, timer.getUnpluggedTime());
+ Assert.assertEquals(0, timer.getTimeBeforeMark());
+
+ // reset(false) shouldn't remove it from the list
+ Assert.assertEquals(true, timeBase.hasObserver(timer));
+ }
+
+ /**
+ * Tests that reset() clears the correct times.
+ */
+ @SmallTest
+ public void testResetDetach() throws Exception {
+ TimeBase timeBase = new TimeBase();
+ MockClocks clocks = new MockClocks();
+
+ TestTimer timer = new TestTimer(clocks, 0, timeBase);
+ timer.setCount(1);
+ timer.setLoadedCount(2);
+ timer.setLastCount(3);
+ timer.setUnpluggedCount(4);
+ timer.setTotalTime(9223372036854775807L);
+ timer.setLoadedTime(9223372036854775806L);
+ timer.setLastTime(9223372036854775805L);
+ timer.setUnpluggedTime(9223372036854775804L);
+ timer.setTimeBeforeMark(9223372036854775803L);
+
+ timer.reset(true);
+
+ Assert.assertEquals(0, timer.getCount());
+ Assert.assertEquals(0, timer.getLoadedCount());
+ Assert.assertEquals(0, timer.getLastCount());
+ Assert.assertEquals(4, timer.getUnpluggedCount());
+ Assert.assertEquals(0, timer.getTotalTime());
+ Assert.assertEquals(0, timer.getLoadedTime());
+ Assert.assertEquals(0, timer.getLastTime());
+ Assert.assertEquals(9223372036854775804L, timer.getUnpluggedTime());
+ Assert.assertEquals(0, timer.getTimeBeforeMark());
+
+ // reset(true) should remove it from the list
+ Assert.assertEquals(false, timeBase.hasObserver(timer));
+ }
+
+ /**
+ * Tests reading and writing the summary to a parcel
+ */
+ @SmallTest
+ public void testSummaryParceling() throws Exception {
+ TimeBase timeBase = new TimeBase();
+ timeBase.setRunning(true, 10, 20);
+ timeBase.setRunning(false, 45, 60);
+ Assert.assertEquals(40, timeBase.getRealtime(200));
+ // the past uptime is 35 and the past runtime is 40
+
+ MockClocks clocks = new MockClocks();
+
+ TestTimer timer1 = new TestTimer(clocks, 0, timeBase);
+ timer1.setCount(1);
+ timer1.setLoadedCount(2);
+ timer1.setLastCount(3);
+ timer1.setUnpluggedCount(4);
+ timer1.setTotalTime(9223372036854775807L);
+ timer1.setLoadedTime(9223372036854775806L);
+ timer1.setLastTime(9223372036854775805L);
+ timer1.setUnpluggedTime(9223372036854775804L);
+ timer1.setTimeBeforeMark(9223372036854775803L);
+
+ Parcel parcel = Parcel.obtain();
+ timer1.nextComputeRunTime = 9223372036854775800L;
+ timer1.writeSummaryFromParcelLocked(parcel, 201);
+ Assert.assertEquals(40, timer1.lastComputeRunTimeRealtime);
+
+ TestTimer timer2 = new TestTimer(clocks, 0, timeBase);
+
+ // Make sure that all the values get touched
+ timer2.setCount(666);
+ timer2.setLoadedCount(666);
+ timer2.setLastCount(666);
+ timer2.setUnpluggedCount(666);
+ timer2.setTotalTime(666);
+ timer2.setLoadedTime(666);
+ timer2.setLastTime(666);
+ timer2.setUnpluggedTime(666);
+ timer2.setTimeBeforeMark(666);
+
+ parcel.setDataPosition(0);
+
+ parcel.setDataPosition(0);
+ timer2.readSummaryFromParcelLocked(parcel);
+
+ Assert.assertEquals(1, timer2.getCount());
+ Assert.assertEquals(1, timer2.getLoadedCount());
+ Assert.assertEquals(0, timer2.getLastCount());
+ Assert.assertEquals(1, timer2.getUnpluggedCount());
+ Assert.assertEquals(9223372036854775800L, timer2.getTotalTime());
+ Assert.assertEquals(9223372036854775800L, timer2.getLoadedTime());
+ Assert.assertEquals(0, timer2.getLastTime());
+ Assert.assertEquals(9223372036854775800L, timer2.getUnpluggedTime());
+ Assert.assertEquals(9223372036854775800L, timer2.getTimeBeforeMark());
+
+ parcel.recycle();
+ }
+
+ /**
+ * Tests getTotalTimeLocked
+ */
+ @SmallTest
+ public void testGetTotalTimeLocked() throws Exception {
+ TimeBase timeBase = new TimeBase();
+ timeBase.setRunning(true, 10, 20);
+ timeBase.setRunning(false, 45, 60);
+ Assert.assertEquals(40, timeBase.getRealtime(200));
+
+ MockClocks clocks = new MockClocks();
+
+ TestTimer timer = new TestTimer(clocks, 0, timeBase);
+ timer.setCount(1);
+ timer.setLoadedCount(2);
+ timer.setLastCount(3);
+ timer.setUnpluggedCount(4);
+ timer.setTotalTime(100);
+ timer.setLoadedTime(200);
+ timer.setLastTime(300);
+ timer.setUnpluggedTime(400);
+ timer.setTimeBeforeMark(500);
+
+ timer.nextComputeRunTime = 10000;
+
+ // Timer.getTotalTimeLocked(STATS_SINCE_CHARGED)
+ timer.lastComputeRunTimeRealtime = -1;
+ Assert.assertEquals(10000,
+ timer.getTotalTimeLocked(66, BatteryStats.STATS_SINCE_CHARGED));
+ Assert.assertEquals(40, timer.lastComputeRunTimeRealtime);
+
+ // Timer.getTotalTimeLocked(STATS_CURRENT)
+ timer.lastComputeRunTimeRealtime = -1;
+ Assert.assertEquals(9800, timer.getTotalTimeLocked(66, BatteryStats.STATS_CURRENT));
+ Assert.assertEquals(40, timer.lastComputeRunTimeRealtime);
+
+ // Timer.getTotalTimeLocked(STATS_SINCE_UNPLUGGED)
+ timer.lastComputeRunTimeRealtime = -1;
+ Assert.assertEquals(9600, timer.getTotalTimeLocked(66, BatteryStats.STATS_SINCE_UNPLUGGED));
+ Assert.assertEquals(40, timer.lastComputeRunTimeRealtime);
+ }
+
+ /**
+ * Tests getCountLocked
+ */
+ @SmallTest
+ public void testGetCountLocked() throws Exception {
+ TimeBase timeBase = new TimeBase();
+ timeBase.setRunning(true, 10, 20);
+ timeBase.setRunning(false, 45, 60);
+ Assert.assertEquals(40, timeBase.getRealtime(200));
+
+ MockClocks clocks = new MockClocks();
+
+ TestTimer timer = new TestTimer(clocks, 0, timeBase);
+ timer.setCount(1);
+ timer.setLoadedCount(2);
+ timer.setLastCount(3);
+ timer.setUnpluggedCount(4);
+ timer.setTotalTime(100);
+ timer.setLoadedTime(200);
+ timer.setLastTime(300);
+ timer.setUnpluggedTime(400);
+ timer.setTimeBeforeMark(500);
+
+ // Timer.getCountLocked(STATS_SINCE_CHARGED)
+ timer.nextComputeCurrentCount = 10000;
+ Assert.assertEquals(10000, timer.getCountLocked(BatteryStats.STATS_SINCE_CHARGED));
+
+ // Timer.getCountLocked(STATS_CURRENT)
+ timer.nextComputeCurrentCount = 10000;
+ Assert.assertEquals(9998, timer.getCountLocked(BatteryStats.STATS_CURRENT));
+
+ // Timer.getCountLocked(STATS_SINCE_UNPLUGGED)
+ timer.nextComputeCurrentCount = 10000;
+ Assert.assertEquals(9996, timer.getCountLocked(BatteryStats.STATS_SINCE_UNPLUGGED));
+ }
+
+ /**
+ * Tests getTimeSinceMarkLocked
+ */
+ @SmallTest
+ public void testGetTimeSinceMarked() throws Exception {
+ TimeBase timeBase = new TimeBase();
+ timeBase.setRunning(true, 10, 20);
+ timeBase.setRunning(false, 45, 60);
+ Assert.assertEquals(40, timeBase.getRealtime(200));
+
+ MockClocks clocks = new MockClocks();
+
+ TestTimer timer = new TestTimer(clocks, 0, timeBase);
+ timer.setCount(1);
+ timer.setLoadedCount(2);
+ timer.setLastCount(3);
+ timer.setUnpluggedCount(4);
+ timer.setTotalTime(100);
+ timer.setLoadedTime(200);
+ timer.setLastTime(300);
+ timer.setUnpluggedTime(400);
+ timer.setTimeBeforeMark(500);
+
+ timer.nextComputeRunTime = 10000;
+ Assert.assertEquals(9500, timer.getTimeSinceMarkLocked(666));
+ }
+
+ /**
+ * Tests logState
+ */
+ @SmallTest
+ public void testLogState() throws Exception {
+ TimeBase timeBase = new TimeBase();
+ MockClocks clocks = new MockClocks();
+
+ TestTimer timer = new TestTimer(clocks, 0, timeBase);
+ timer.setTotalTime(100);
+ timer.setLoadedTime(200);
+ timer.setLastTime(300);
+ timer.setUnpluggedTime(400);
+ timer.setTimeBeforeMark(500);
+ timer.setCount(1);
+ timer.setLoadedCount(2);
+ timer.setLastCount(3);
+ timer.setUnpluggedCount(4);
+ timer.setTotalTime(9223372036854775807L);
+ timer.setLoadedTime(9223372036854775806L);
+ timer.setLastTime(9223372036854775805L);
+ timer.setUnpluggedTime(9223372036854775804L);
+ timer.setTimeBeforeMark(9223372036854775803L);
+
+ StringBuilder sb = new StringBuilder();
+ StringBuilderPrinter pw = new StringBuilderPrinter(sb);
+
+ timer.logState(pw, " ");
+
+ Assert.assertEquals(
+ " mCount=1 mLoadedCount=2 mLastCount=3 mUnpluggedCount=4\n"
+ + " mTotalTime=9223372036854775807 mLoadedTime=9223372036854775806\n"
+ + " mLastTime=9223372036854775805 mUnpluggedTime=9223372036854775804\n",
+ sb.toString());
+ }
+}
+
diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsUidTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsUidTest.java
new file mode 100644
index 0000000..a7e75a2
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsUidTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.os;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+
+import android.os.BatteryStats;
+import android.os.Parcel;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Log;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.android.internal.os.BatteryStatsImpl;
+
+import org.mockito.Mockito;
+
+/**
+ * Provides test cases for android.os.BatteryStats.
+ */
+public class BatteryStatsUidTest extends TestCase {
+ private static final String TAG = "BatteryStatsTimeBaseTest";
+
+ static class TestBsi extends BatteryStatsImpl {
+ TestBsi(MockClocks clocks) {
+ super(clocks);
+ }
+ }
+
+ /**
+ * Test the observers and the setRunning call.
+ */
+ @SmallTest
+ public void testParceling() throws Exception {
+ }
+}
+
diff --git a/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java b/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java
new file mode 100644
index 0000000..3924489
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.os;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+
+import android.os.BatteryStats;
+import android.os.Parcel;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Log;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.android.internal.os.BatteryStatsImpl;
+
+import org.mockito.Mockito;
+
+/**
+ * Mocks a BatteryStatsImpl object.
+ */
+public class MockBatteryStatsImpl extends BatteryStatsImpl {
+ public BatteryStatsImpl.Clocks clocks;
+
+ MockBatteryStatsImpl() {
+ super(new MockClocks());
+ this.clocks = mClocks;
+ }
+
+ public TimeBase getOnBatteryTimeBase() {
+ return mOnBatteryTimeBase;
+ }
+
+}
+
diff --git a/core/tests/coretests/src/com/android/internal/os/MockClocks.java b/core/tests/coretests/src/com/android/internal/os/MockClocks.java
new file mode 100644
index 0000000..f750c37
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/os/MockClocks.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.os;
+
+public class MockClocks implements BatteryStatsImpl.Clocks {
+ public long realtime;
+ public long uptime;
+
+ @Override
+ public long elapsedRealtime() {
+ return realtime;
+ }
+
+ @Override
+ public long uptimeMillis() {
+ return uptime;
+ }
+}
diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
index c486c1f..3901af3 100644
--- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
@@ -154,7 +154,7 @@
private static final boolean DBG_ANIMATION_VECTOR_DRAWABLE = false;
/** Local, mutable animator set. */
- private final VectorDrawableAnimator mAnimatorSet = new VectorDrawableAnimator(this);
+ private VectorDrawableAnimator mAnimatorSet = new VectorDrawableAnimatorRT(this);
/**
* The resources against which this drawable was created. Used to attempt
@@ -164,8 +164,8 @@
private AnimatedVectorDrawableState mAnimatedVectorState;
- /** Whether the animator set has been prepared. */
- private boolean mHasAnimatorSet;
+ /** The animator set that is parsed from the xml. */
+ private AnimatorSet mAnimatorSetFromXml = null;
private boolean mMutated;
@@ -234,9 +234,7 @@
@Override
public void draw(Canvas canvas) {
- if (canvas.isHardwareAccelerated()) {
- mAnimatorSet.recordLastSeenTarget((DisplayListCanvas) canvas);
- }
+ mAnimatorSet.onDraw(canvas);
mAnimatedVectorState.mVectorDrawable.draw(canvas);
}
@@ -392,6 +390,24 @@
mRes = state.mPendingAnims == null ? null : res;
}
+ /**
+ * Force to animate on UI thread.
+ * @hide
+ */
+ public void forceAnimationOnUI() {
+ if (mAnimatorSet instanceof VectorDrawableAnimatorRT) {
+ VectorDrawableAnimatorRT animator = (VectorDrawableAnimatorRT) mAnimatorSet;
+ if (animator.isRunning()) {
+ throw new UnsupportedOperationException("Cannot force Animated Vector Drawable to" +
+ " run on UI thread when the animation has started on RenderThread.");
+ }
+ mAnimatorSet = new VectorDrawableAnimatorUI(this);
+ if (mAnimatorSetFromXml != null) {
+ mAnimatorSet.init(mAnimatorSetFromXml);
+ }
+ }
+ }
+
@Override
public boolean canApplyTheme() {
return (mAnimatedVectorState != null && mAnimatedVectorState.canApplyTheme())
@@ -612,6 +628,7 @@
* Resets the AnimatedVectorDrawable to the start state as specified in the animators.
*/
public void reset() {
+ ensureAnimatorSet();
mAnimatorSet.reset();
}
@@ -623,13 +640,12 @@
@NonNull
private void ensureAnimatorSet() {
- if (!mHasAnimatorSet) {
+ if (mAnimatorSetFromXml == null) {
// TODO: Skip the AnimatorSet creation and init the VectorDrawableAnimator directly
// with a list of LocalAnimators.
- AnimatorSet set = new AnimatorSet();
- mAnimatedVectorState.prepareLocalAnimators(set, mRes);
- mHasAnimatorSet = true;
- mAnimatorSet.initWithAnimatorSet(set);
+ mAnimatorSetFromXml = new AnimatorSet();
+ mAnimatedVectorState.prepareLocalAnimators(mAnimatorSetFromXml, mRes);
+ mAnimatorSet.init(mAnimatorSetFromXml);
mRes = null;
}
}
@@ -724,7 +740,7 @@
// A helper function to clean up the animator listener in the mAnimatorSet.
private void removeAnimatorSetListener() {
if (mAnimatorListener != null) {
- mAnimatorSet.removeListener();
+ mAnimatorSet.removeListener(mAnimatorListener);
mAnimatorListener = null;
}
}
@@ -754,10 +770,100 @@
mAnimationCallbacks.clear();
}
+ private interface VectorDrawableAnimator {
+ void init(AnimatorSet set);
+ void start();
+ void end();
+ void reset();
+ void reverse();
+ boolean canReverse();
+ void setListener(AnimatorListener listener);
+ void removeListener(AnimatorListener listener);
+ void onDraw(Canvas canvas);
+ boolean isStarted();
+ boolean isRunning();
+ }
+
+ private static class VectorDrawableAnimatorUI implements VectorDrawableAnimator {
+ private AnimatorSet mSet = new AnimatorSet();
+ private final Drawable mDrawable;
+
+ VectorDrawableAnimatorUI(AnimatedVectorDrawable drawable) {
+ mDrawable = drawable;
+ }
+
+ @Override
+ public void init(AnimatorSet set) {
+ mSet = set;
+ }
+
+ @Override
+ public void start() {
+ if (mSet.isStarted()) {
+ return;
+ }
+ mSet.start();
+ invalidateOwningView();
+ }
+
+ @Override
+ public void end() {
+ mSet.end();
+ }
+
+ @Override
+ public void reset() {
+ start();
+ mSet.cancel();
+ }
+
+ @Override
+ public void reverse() {
+ mSet.reverse();
+ invalidateOwningView();
+ }
+
+ @Override
+ public boolean canReverse() {
+ return mSet.canReverse();
+ }
+
+ @Override
+ public void setListener(AnimatorListener listener) {
+ mSet.addListener(listener);
+ }
+
+ @Override
+ public void removeListener(AnimatorListener listener) {
+ mSet.removeListener(listener);
+ }
+
+ @Override
+ public void onDraw(Canvas canvas) {
+ if (mSet.isStarted()) {
+ invalidateOwningView();
+ }
+ }
+
+ @Override
+ public boolean isStarted() {
+ return mSet.isStarted();
+ }
+
+ @Override
+ public boolean isRunning() {
+ return mSet.isRunning();
+ }
+
+ private void invalidateOwningView() {
+ mDrawable.invalidateSelf();
+ }
+ }
+
/**
* @hide
*/
- public static class VectorDrawableAnimator {
+ public static class VectorDrawableAnimatorRT implements VectorDrawableAnimator {
private static final int NONE = 0;
private static final int START_ANIMATION = 1;
private static final int REVERSE_ANIMATION = 2;
@@ -779,7 +885,7 @@
private int mPendingAnimationAction = NONE;
private final Drawable mDrawable;
- VectorDrawableAnimator(AnimatedVectorDrawable drawable) {
+ VectorDrawableAnimatorRT(AnimatedVectorDrawable drawable) {
mDrawable = drawable;
mSetPtr = nCreateAnimatorSet();
// Increment ref count on native AnimatorSet, so it doesn't get released before Java
@@ -787,7 +893,8 @@
mSetRefBasePtr = new VirtualRefBasePtr(mSetPtr);
}
- private void initWithAnimatorSet(AnimatorSet set) {
+ @Override
+ public void init(AnimatorSet set) {
if (mInitialized) {
// Already initialized
throw new UnsupportedOperationException("VectorDrawableAnimator cannot be " +
@@ -816,7 +923,7 @@
ArrayList<Animator> animators = set.getChildAnimations();
boolean playTogether = set.shouldPlayTogether();
- // Convert AnimatorSet to VectorDrawableAnimator
+ // Convert AnimatorSet to VectorDrawableAnimatorRT
for (int i = 0; i < animators.size(); i++) {
Animator animator = animators.get(i);
// Here we only support ObjectAnimator
@@ -1060,6 +1167,7 @@
mDrawable.invalidateSelf();
}
+ @Override
public void start() {
if (!mInitialized) {
return;
@@ -1083,6 +1191,7 @@
}
}
+ @Override
public void end() {
if (mInitialized && useLastSeenTarget()) {
// If no target has ever been set, no-op
@@ -1091,6 +1200,7 @@
}
}
+ @Override
public void reset() {
if (mInitialized && useLastSeenTarget()) {
// If no target has ever been set, no-op
@@ -1101,7 +1211,8 @@
// Current (imperfect) Java AnimatorSet cannot be reversed when the set contains sequential
// animators or when the animator set has a start delay
- void reverse() {
+ @Override
+ public void reverse() {
if (!mIsReversible || !mInitialized) {
return;
}
@@ -1125,29 +1236,41 @@
return mSetPtr;
}
- boolean canReverse() {
+ @Override
+ public boolean canReverse() {
return mIsReversible;
}
- boolean isStarted() {
+ @Override
+ public boolean isStarted() {
return mStarted;
}
- boolean isRunning() {
+ @Override
+ public boolean isRunning() {
if (!mInitialized) {
return false;
}
return mStarted;
}
- void setListener(AnimatorListener listener) {
+ @Override
+ public void setListener(AnimatorListener listener) {
mListener = listener;
}
- void removeListener() {
+ @Override
+ public void removeListener(AnimatorListener listener) {
mListener = null;
}
+ @Override
+ public void onDraw(Canvas canvas) {
+ if (canvas.isHardwareAccelerated()) {
+ recordLastSeenTarget((DisplayListCanvas) canvas);
+ }
+ }
+
private void onAnimationEnd(int listenerId) {
if (listenerId != mLastListenerId) {
return;
@@ -1162,7 +1285,7 @@
}
// onFinished: should be called from native
- private static void callOnFinished(VectorDrawableAnimator set, int id) {
+ private static void callOnFinished(VectorDrawableAnimatorRT set, int id) {
set.onAnimationEnd(id);
}
}
@@ -1183,8 +1306,8 @@
private static native long nCreateRootAlphaPropertyHolder(long nativePtr, float startValue,
float endValue);
private static native void nSetPropertyHolderData(long nativePtr, float[] data, int length);
- private static native void nStart(long animatorSetPtr, VectorDrawableAnimator set, int id);
- private static native void nReverse(long animatorSetPtr, VectorDrawableAnimator set, int id);
+ private static native void nStart(long animatorSetPtr, VectorDrawableAnimatorRT set, int id);
+ private static native void nReverse(long animatorSetPtr, VectorDrawableAnimatorRT set, int id);
private static native void nEnd(long animatorSetPtr);
private static native void nReset(long animatorSetPtr);
}
diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp
index 78a0b13..31de305 100644
--- a/libs/hwui/RecordingCanvas.cpp
+++ b/libs/hwui/RecordingCanvas.cpp
@@ -241,10 +241,13 @@
}
void RecordingCanvas::drawPaint(const SkPaint& paint) {
+ const ClipBase* clip = getRecordedClip();
+ // if there's no current clip, draw a big rect and hope we cover the eventual clip bounds
+ Rect bounds = clip ? clip->rect : Rect(-10000, -10000, 10000, 10000);
addOp(alloc().create_trivial<RectOp>(
- mState.getRenderTargetClipBounds(), // OK, since we've not passed transform
+ bounds,
Matrix4::identity(),
- getRecordedClip(),
+ clip,
refPaint(&paint)));
}
diff --git a/libs/hwui/tests/unit/RecordingCanvasTests.cpp b/libs/hwui/tests/unit/RecordingCanvasTests.cpp
index cd9ffc5..f988da3 100644
--- a/libs/hwui/tests/unit/RecordingCanvasTests.cpp
+++ b/libs/hwui/tests/unit/RecordingCanvasTests.cpp
@@ -19,6 +19,7 @@
#include <RecordedOp.h>
#include <RecordingCanvas.h>
#include <tests/common/TestUtils.h>
+#include <utils/Color.h>
namespace android {
namespace uirenderer {
@@ -185,6 +186,19 @@
ASSERT_EQ(3, count);
}
+TEST(RecordingCanvas, drawColor) {
+ auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
+ canvas.drawColor(Color::Black, SkXfermode::kSrcOver_Mode);
+ });
+
+ ASSERT_EQ(1u, dl->getOps().size()) << "Must be exactly one op";
+ auto op = *(dl->getOps()[0]);
+ EXPECT_EQ(RecordedOpId::RectOp, op.opId);
+ EXPECT_EQ(nullptr, op.localClip);
+ EXPECT_TRUE(op.unmappedBounds.contains(Rect(-1000, -1000, 1000, 1000)))
+ << "no clip, unmappedBounds should resolve to be much larger than DL bounds";
+}
+
TEST(RecordingCanvas, backgroundAndImage) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(100, 200, [](RecordingCanvas& canvas) {
SkBitmap bitmap;
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 26e466e..adf8551 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -57,6 +57,7 @@
import android.media.SyncParams;
import com.android.internal.app.IAppOpsService;
+import com.android.internal.util.Preconditions;
import libcore.io.IoBridge;
import libcore.io.Libcore;
@@ -964,8 +965,8 @@
* @param uri the Content URI of the data you want to play
* @throws IllegalStateException if it is called in an invalid state
*/
- public void setDataSource(Context context, Uri uri)
- throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+ public void setDataSource(@NonNull Context context, @NonNull Uri uri)
+ throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
setDataSource(context, uri, null);
}
@@ -981,47 +982,46 @@
* to disallow or allow cross domain redirection.
* @throws IllegalStateException if it is called in an invalid state
*/
- public void setDataSource(Context context, Uri uri, Map<String, String> headers)
- throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+ public void setDataSource(@NonNull Context context, @NonNull Uri uri,
+ @Nullable Map<String, String> headers) throws IOException, IllegalArgumentException,
+ SecurityException, IllegalStateException {
+ final ContentResolver resolver = context.getContentResolver();
final String scheme = uri.getScheme();
if (ContentResolver.SCHEME_FILE.equals(scheme)) {
setDataSource(uri.getPath());
return;
} else if (ContentResolver.SCHEME_CONTENT.equals(scheme)
&& Settings.AUTHORITY.equals(uri.getAuthority())) {
- // Redirect ringtones to go directly to underlying provider
- uri = RingtoneManager.getActualDefaultRingtoneUri(context,
- RingtoneManager.getDefaultType(uri));
- if (uri == null) {
- throw new FileNotFoundException("Failed to resolve default ringtone");
- }
- }
-
- AssetFileDescriptor fd = null;
- try {
- ContentResolver resolver = context.getContentResolver();
- fd = resolver.openAssetFileDescriptor(uri, "r");
- if (fd == null) {
+ // Try cached ringtone first since the actual provider may not be
+ // encryption aware, or it may be stored on CE media storage
+ final int type = RingtoneManager.getDefaultType(uri);
+ final Uri cacheUri = RingtoneManager.getCacheForType(type);
+ final Uri actualUri = RingtoneManager.getActualDefaultRingtoneUri(context, type);
+ if (attemptDataSource(resolver, cacheUri)) {
return;
- }
- // Note: using getDeclaredLength so that our behavior is the same
- // as previous versions when the content provider is returning
- // a full file.
- if (fd.getDeclaredLength() < 0) {
- setDataSource(fd.getFileDescriptor());
+ } else if (attemptDataSource(resolver, actualUri)) {
+ return;
} else {
- setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getDeclaredLength());
+ setDataSource(uri.toString(), headers);
}
- return;
- } catch (SecurityException | IOException ex) {
- Log.w(TAG, "Couldn't open file on client side; trying server side: " + ex);
- } finally {
- if (fd != null) {
- fd.close();
+ } else {
+ // Try requested Uri locally first, or fallback to media server
+ if (attemptDataSource(resolver, uri)) {
+ return;
+ } else {
+ setDataSource(uri.toString(), headers);
}
}
+ }
- setDataSource(uri.toString(), headers);
+ private boolean attemptDataSource(ContentResolver resolver, Uri uri) {
+ try (AssetFileDescriptor afd = resolver.openAssetFileDescriptor(uri, "r")) {
+ setDataSource(afd);
+ return true;
+ } catch (NullPointerException | SecurityException | IOException ex) {
+ Log.w(TAG, "Couldn't open " + uri + ": " + ex);
+ return false;
+ }
}
/**
@@ -1102,6 +1102,26 @@
throws IOException, IllegalArgumentException, SecurityException, IllegalStateException;
/**
+ * Sets the data source (AssetFileDescriptor) to use. It is the caller's
+ * responsibility to close the file descriptor. It is safe to do so as soon
+ * as this call returns.
+ *
+ * @param afd the AssetFileDescriptor for the file you want to play
+ */
+ public void setDataSource(@NonNull AssetFileDescriptor afd)
+ throws IOException, IllegalArgumentException, IllegalStateException {
+ Preconditions.checkNotNull(afd);
+ // Note: using getDeclaredLength so that our behavior is the same
+ // as previous versions when the content provider is returning
+ // a full file.
+ if (afd.getDeclaredLength() < 0) {
+ setDataSource(afd.getFileDescriptor());
+ } else {
+ setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getDeclaredLength());
+ }
+ }
+
+ /**
* Sets the data source (FileDescriptor) to use. It is the caller's responsibility
* to close the file descriptor. It is safe to do so as soon as this call returns.
*
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index 025029e..06ac11b 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -18,9 +18,12 @@
import com.android.internal.database.SortCursor;
+import libcore.io.Streams;
+
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
import android.app.Activity;
+import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -33,6 +36,9 @@
import android.provider.Settings.System;
import android.util.Log;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
@@ -654,8 +660,19 @@
if (setting == null) return;
Settings.System.putString(context.getContentResolver(), setting,
ringtoneUri != null ? ringtoneUri.toString() : null);
+
+ // Stream selected ringtone into cache so it's available for playback
+ // when CE storage is still locked
+ final ContentResolver cr = context.getContentResolver();
+ final Uri cacheUri = getCacheForType(type);
+ try (InputStream in = cr.openInputStream(ringtoneUri);
+ OutputStream out = cr.openOutputStream(cacheUri)) {
+ Streams.copy(in, out);
+ } catch (IOException e) {
+ Log.w(TAG, "Failed to cache ringtone: " + e);
+ }
}
-
+
private static String getSettingForType(int type) {
if ((type & TYPE_RINGTONE) != 0) {
return Settings.System.RINGTONE;
@@ -667,7 +684,20 @@
return null;
}
}
-
+
+ /** {@hide} */
+ public static Uri getCacheForType(int type) {
+ if ((type & TYPE_RINGTONE) != 0) {
+ return Settings.System.RINGTONE_CACHE_URI;
+ } else if ((type & TYPE_NOTIFICATION) != 0) {
+ return Settings.System.NOTIFICATION_SOUND_CACHE_URI;
+ } else if ((type & TYPE_ALARM) != 0) {
+ return Settings.System.ALARM_ALERT_CACHE_URI;
+ } else {
+ return null;
+ }
+ }
+
/**
* Returns whether the given {@link Uri} is one of the default ringtones.
*
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 57d495f..9842e28 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -49,6 +49,7 @@
import android.os.ParcelFileDescriptor;
import android.os.Process;
import android.os.RemoteException;
+import android.os.SELinux;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
@@ -457,8 +458,28 @@
@Override
public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
- throw new FileNotFoundException("Direct file access no longer supported; "
- + "ringtone playback is available through android.media.Ringtone");
+ final String cacheName;
+ if (Settings.System.RINGTONE_CACHE_URI.equals(uri)) {
+ cacheName = Settings.System.RINGTONE_CACHE;
+ } else if (Settings.System.NOTIFICATION_SOUND_CACHE_URI.equals(uri)) {
+ cacheName = Settings.System.NOTIFICATION_SOUND_CACHE;
+ } else if (Settings.System.ALARM_ALERT_CACHE_URI.equals(uri)) {
+ cacheName = Settings.System.ALARM_ALERT_CACHE;
+ } else {
+ throw new FileNotFoundException("Direct file access no longer supported; "
+ + "ringtone playback is available through android.media.Ringtone");
+ }
+
+ final File cacheFile = new File(
+ getRingtoneCacheDir(UserHandle.getCallingUserId()), cacheName);
+ return ParcelFileDescriptor.open(cacheFile, ParcelFileDescriptor.parseMode(mode));
+ }
+
+ private File getRingtoneCacheDir(int userId) {
+ final File cacheDir = new File(Environment.getDataSystemDeDirectory(userId), "ringtones");
+ cacheDir.mkdir();
+ SELinux.restorecon(cacheDir);
+ return cacheDir;
}
@Override
@@ -901,6 +922,21 @@
return false;
}
+ // Invalidate any relevant cache files
+ String cacheName = null;
+ if (Settings.System.RINGTONE.equals(name)) {
+ cacheName = Settings.System.RINGTONE_CACHE;
+ } else if (Settings.System.NOTIFICATION_SOUND.equals(name)) {
+ cacheName = Settings.System.NOTIFICATION_SOUND_CACHE;
+ } else if (Settings.System.ALARM_ALERT.equals(name)) {
+ cacheName = Settings.System.ALARM_ALERT_CACHE;
+ }
+ if (cacheName != null) {
+ final File cacheFile = new File(
+ getRingtoneCacheDir(UserHandle.getCallingUserId()), cacheName);
+ cacheFile.delete();
+ }
+
// Mutate the value.
synchronized (mLock) {
switch (operation) {
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index ee61e00..52fcae1 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -528,6 +528,13 @@
<dimen name="battery_margin_bottom">0dp</dimen>
+ <!-- Padding at the end of the view that displays the mobile signal icons. If the view is
+ empty, then this padding will not be added to that view. -->
+ <dimen name="mobile_signal_group_end_padding">0dp</dimen>
+
+ <!-- Padding between the mobile data type and the strength indicator. -->
+ <dimen name="mobile_data_icon_start_padding">0dp</dimen>
+
<!-- Extra padding between the mobile data type icon and the strength indicator when the data
type icon is wide. -->
<dimen name="wide_type_icon_start_padding">2dp</dimen>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
index 9aa5ea0..444916a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
@@ -90,6 +90,8 @@
View mWifiSignalSpacer;
LinearLayout mMobileSignalGroup;
+ private final int mMobileSignalGroupEndPadding;
+ private final int mMobileDataIconStartPadding;
private final int mWideTypeIconStartPadding;
private final int mSecondaryTelephonyPadding;
private final int mEndPadding;
@@ -113,6 +115,10 @@
super(context, attrs, defStyle);
Resources res = getResources();
+ mMobileSignalGroupEndPadding =
+ res.getDimensionPixelSize(R.dimen.mobile_signal_group_end_padding);
+ mMobileDataIconStartPadding =
+ res.getDimensionPixelSize(R.dimen.mobile_data_icon_start_padding);
mWideTypeIconStartPadding = res.getDimensionPixelSize(R.dimen.wide_type_icon_start_padding);
mSecondaryTelephonyPadding = res.getDimensionPixelSize(R.dimen.secondary_telephony_padding);
mEndPadding = res.getDimensionPixelSize(R.dimen.signal_cluster_battery_padding);
@@ -206,6 +212,10 @@
for (PhoneState state : mPhoneStates) {
mMobileSignalGroup.addView(state.mMobileGroup);
}
+
+ int endPadding = mMobileSignalGroup.getChildCount() > 0 ? mMobileSignalGroupEndPadding : 0;
+ mMobileSignalGroup.setPaddingRelative(0, 0, endPadding, 0);
+
TunerService.get(mContext).addTunable(this, StatusBarIconController.ICON_BLACKLIST);
apply();
@@ -577,9 +587,11 @@
// When this isn't next to wifi, give it some extra padding between the signals.
mMobileGroup.setPaddingRelative(isSecondaryIcon ? mSecondaryTelephonyPadding : 0,
0, 0, 0);
- mMobile.setPaddingRelative(mIsMobileTypeIconWide ? mWideTypeIconStartPadding : 0,
+ mMobile.setPaddingRelative(
+ mIsMobileTypeIconWide ? mWideTypeIconStartPadding : mMobileDataIconStartPadding,
0, 0, 0);
- mMobileDark.setPaddingRelative(mIsMobileTypeIconWide ? mWideTypeIconStartPadding : 0,
+ mMobileDark.setPaddingRelative(
+ mIsMobileTypeIconWide ? mWideTypeIconStartPadding : mMobileDataIconStartPadding,
0, 0, 0);
if (DEBUG) Log.d(TAG, String.format("mobile: %s sig=%d typ=%d",
@@ -592,12 +604,19 @@
private void updateAnimatableIcon(ImageView view, int resId) {
maybeStopAnimatableDrawable(view);
- view.setImageResource(resId);
+ setIconForView(view, resId);
maybeStartAnimatableDrawable(view);
}
private void maybeStopAnimatableDrawable(ImageView view) {
Drawable drawable = view.getDrawable();
+
+ // Check if the icon has been scaled. If it has retrieve the actual drawable out of the
+ // wrapper.
+ if (drawable instanceof ScalingDrawableWrapper) {
+ drawable = ((ScalingDrawableWrapper) drawable).getDrawable();
+ }
+
if (drawable instanceof Animatable) {
Animatable ad = (Animatable) drawable;
if (ad.isRunning()) {
@@ -608,6 +627,13 @@
private void maybeStartAnimatableDrawable(ImageView view) {
Drawable drawable = view.getDrawable();
+
+ // Check if the icon has been scaled. If it has retrieve the actual drawable out of the
+ // wrapper.
+ if (drawable instanceof ScalingDrawableWrapper) {
+ drawable = ((ScalingDrawableWrapper) drawable).getDrawable();
+ }
+
if (drawable instanceof Animatable) {
Animatable ad = (Animatable) drawable;
if (!ad.isRunning()) {
diff --git a/preloaded-classes b/preloaded-classes
index 9535cc2..be645d2 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -907,7 +907,7 @@
android.graphics.drawable.AnimatedVectorDrawable$1
android.graphics.drawable.AnimatedVectorDrawable$AnimatedVectorDrawableState
android.graphics.drawable.AnimatedVectorDrawable$AnimatedVectorDrawableState$PendingAnimator
-android.graphics.drawable.AnimatedVectorDrawable$VectorDrawableAnimator
+android.graphics.drawable.AnimatedVectorDrawable$VectorDrawableAnimatorRT
android.graphics.drawable.AnimationDrawable
android.graphics.drawable.AnimationDrawable$AnimationState
android.graphics.drawable.BitmapDrawable
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 37f2425..d14364d 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -315,15 +315,15 @@
IntentFilter userFilter = new IntentFilter();
userFilter.addAction(Intent.ACTION_USER_REMOVED);
- userFilter.addAction(Intent.ACTION_USER_STARTED);
+ userFilter.addAction(Intent.ACTION_USER_UNLOCKED);
mContext.registerReceiverAsUser(new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
if (Intent.ACTION_USER_REMOVED.equals(action)) {
onUserRemoved(intent);
- } else if (Intent.ACTION_USER_STARTED.equals(action)) {
- onUserStarted(intent);
+ } else if (Intent.ACTION_USER_UNLOCKED.equals(action)) {
+ onUserUnlocked(intent);
}
}
}, UserHandle.ALL, userFilter, null, null);
@@ -513,7 +513,7 @@
}
}
- private void onUserStarted(Intent intent) {
+ private void onUserUnlocked(Intent intent) {
int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1);
if (userId < 1) return;
@@ -991,13 +991,9 @@
for (UserInfo user : users) {
if (user.isRestricted() && (parentUserId == user.restrictedProfileParentId)) {
addSharedAccountAsUser(account, user.id);
- try {
- if (ActivityManagerNative.getDefault().isUserRunning(user.id, 0)) {
- mMessageHandler.sendMessage(mMessageHandler.obtainMessage(
- MESSAGE_COPY_SHARED_ACCOUNT, parentUserId, user.id, account));
- }
- } catch (RemoteException re) {
- // Shouldn't happen
+ if (mUserManager.isUserUnlocked(user.id)) {
+ mMessageHandler.sendMessage(mMessageHandler.obtainMessage(
+ MESSAGE_COPY_SHARED_ACCOUNT, parentUserId, user.id, account));
}
}
}
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index 7fb1783..ed68abe 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -508,18 +508,18 @@
};
private void subscriptionOrSimChanged(Context context) {
- Log.d(TAG, "received SIM related action: ");
+ if (DEBUG) Log.d(TAG, "received SIM related action: ");
TelephonyManager phone = (TelephonyManager)
mContext.getSystemService(Context.TELEPHONY_SERVICE);
String mccMnc = phone.getSimOperator();
if (!TextUtils.isEmpty(mccMnc)) {
- Log.d(TAG, "SIM MCC/MNC is available: " + mccMnc);
+ if (DEBUG) Log.d(TAG, "SIM MCC/MNC is available: " + mccMnc);
synchronized (mLock) {
reloadGpsProperties(context, mProperties);
mNIHandler.setSuplEsEnabled(mSuplEsEnabled);
}
} else {
- Log.d(TAG, "SIM MCC/MNC is still not available");
+ if (DEBUG) Log.d(TAG, "SIM MCC/MNC is still not available");
}
}
@@ -569,7 +569,7 @@
}
private void reloadGpsProperties(Context context, Properties properties) {
- Log.d(TAG, "Reset GPS properties, previous size = " + properties.size());
+ if (DEBUG) Log.d(TAG, "Reset GPS properties, previous size = " + properties.size());
loadPropertiesFromResource(context, properties);
boolean isPropertiesLoadedFromFile = false;
final String gpsHardware = SystemProperties.get("ro.hardware.gps");
@@ -582,7 +582,7 @@
if (!isPropertiesLoadedFromFile) {
loadPropertiesFromFile(DEFAULT_PROPERTIES_FILE, properties);
}
- Log.d(TAG, "GPS properties reloaded, size = " + properties.size());
+ if (DEBUG) Log.d(TAG, "GPS properties reloaded, size = " + properties.size());
// TODO: we should get rid of C2K specific setting.
setSuplHostPort(properties.getProperty("SUPL_HOST"),
@@ -603,7 +603,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
properties.store(baos, null);
native_configuration_update(baos.toString());
- Log.d(TAG, "final config = " + baos.toString());
+ if (DEBUG) Log.d(TAG, "final config = " + baos.toString());
} catch (IOException ex) {
Log.e(TAG, "failed to dump properties contents");
}
@@ -628,7 +628,7 @@
String[] configValues = context.getResources().getStringArray(
com.android.internal.R.array.config_gpsParameters);
for (String item : configValues) {
- Log.d(TAG, "GpsParamsResource: " + item);
+ if (DEBUG) Log.d(TAG, "GpsParamsResource: " + item);
// We need to support "KEY =", but not "=VALUE".
String[] split = item.split("=");
if (split.length == 2) {
@@ -917,11 +917,13 @@
long certainty = mNtpTime.getCacheCertainty();
long now = System.currentTimeMillis();
- Log.d(TAG, "NTP server returned: "
- + time + " (" + new Date(time)
- + ") reference: " + timeReference
- + " certainty: " + certainty
- + " system time offset: " + (time - now));
+ if (DEBUG) {
+ Log.d(TAG, "NTP server returned: "
+ + time + " (" + new Date(time)
+ + ") reference: " + timeReference
+ + " certainty: " + certainty
+ + " system time offset: " + (time - now));
+ }
native_inject_time(time, timeReference, (int) certainty);
delay = NTP_INTERVAL;
@@ -1633,7 +1635,7 @@
if (DEBUG) Log.d(TAG, "GPS_AGPS_DATA_CONN_FAILED");
break;
default:
- Log.d(TAG, "Received Unknown AGPS status: " + status);
+ if (DEBUG) Log.d(TAG, "Received Unknown AGPS status: " + status);
}
}
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 7378bde..77db275 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -104,7 +104,7 @@
public class WallpaperManagerService extends IWallpaperManager.Stub {
static final String TAG = "WallpaperManagerService";
- static final boolean DEBUG = true;
+ static final boolean DEBUG = false;
final Object mLock = new Object();
diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java
index 25de75a..a589f89 100644
--- a/services/core/java/com/android/server/wm/Session.java
+++ b/services/core/java/com/android/server/wm/Session.java
@@ -369,7 +369,12 @@
if (DEBUG_TASK_POSITIONING) Slog.d(
TAG_WM, "startMovingTask: {" + startX + "," + startY + "}");
- return mService.startMovingTask(window, startX, startY);
+ long ident = Binder.clearCallingIdentity();
+ try {
+ return mService.startMovingTask(window, startX, startY);
+ } finally {
+ Binder.restoreCallingIdentity(ident);
+ }
}
public void reportDropResult(IWindow window, boolean consumed) {
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index fa7a59d..4547c6a 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -297,6 +297,24 @@
*/
public static final String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
+ /**
+ * Connection event used to inform Telecom that it should play the on hold tone. This is used
+ * to play a tone when the peer puts the current call on hold. Sent to Telecom via
+ * {@link #sendConnectionEvent(String)}.
+ * @hide
+ */
+ public static final String EVENT_ON_HOLD_TONE_START =
+ "android.telecom.event.ON_HOLD_TONE_START";
+
+ /**
+ * Connection event used to inform Telecom that it should stop the on hold tone. This is used
+ * to stop a tone when the peer puts the current call on hold. Sent to Telecom via
+ * {@link #sendConnectionEvent(String)}.
+ * @hide
+ */
+ public static final String EVENT_ON_HOLD_TONE_END =
+ "android.telecom.event.ON_HOLD_TONE_END";
+
// Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
@@ -447,6 +465,8 @@
public void onConferenceStarted() {}
public void onConferenceMergeFailed(Connection c) {}
public void onExtrasChanged(Connection c, Bundle extras) {}
+ /** @hide */
+ public void onConnectionEvent(Connection c, String event) {}
}
/**
@@ -1986,4 +2006,16 @@
l.onConferenceStarted();
}
}
+
+ /**
+ * Sends a connection event to Telecom.
+ *
+ * @param event The connection event.
+ * @hide
+ */
+ protected void sendConnectionEvent(String event) {
+ for (Listener l : mListeners) {
+ l.onConnectionEvent(this, event);
+ }
+ }
}
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index b4a7ce0..56d9491 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -613,6 +613,14 @@
mAdapter.setExtras(id, extras);
}
}
+
+ @Override
+ public void onConnectionEvent(Connection connection, String event) {
+ String id = mIdByConnection.get(connection);
+ if (id != null) {
+ mAdapter.onConnectionEvent(id, event);
+ }
+ }
};
/** {@inheritDoc} */
diff --git a/telecomm/java/android/telecom/ConnectionServiceAdapter.java b/telecomm/java/android/telecom/ConnectionServiceAdapter.java
index 4562514..30fc5ad 100644
--- a/telecomm/java/android/telecom/ConnectionServiceAdapter.java
+++ b/telecomm/java/android/telecom/ConnectionServiceAdapter.java
@@ -412,4 +412,20 @@
}
}
}
+
+ /**
+ * Informs Telecom of a connection level event.
+ *
+ * @param callId The unique ID of the call.
+ * @param event The event.
+ */
+ void onConnectionEvent(String callId, String event) {
+ Log.v(this, "onConnectionEvent: %s", event);
+ for (IConnectionServiceAdapter adapter : mAdapters) {
+ try {
+ adapter.onConnectionEvent(callId, event);
+ } catch (RemoteException ignored) {
+ }
+ }
+ }
}
diff --git a/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
index 293dc11..a790914 100644
--- a/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
+++ b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
@@ -62,6 +62,7 @@
private static final int MSG_ON_POST_DIAL_CHAR = 22;
private static final int MSG_SET_CONFERENCE_MERGE_FAILED = 23;
private static final int MSG_SET_EXTRAS = 24;
+ private static final int MSG_ON_CONNECTION_EVENT = 25;
private final IConnectionServiceAdapter mDelegate;
@@ -240,6 +241,15 @@
args.recycle();
}
}
+
+ case MSG_ON_CONNECTION_EVENT: {
+ SomeArgs args = (SomeArgs) msg.obj;
+ try {
+ mDelegate.onConnectionEvent((String) args.arg1, (String) args.arg2);
+ } finally {
+ args.recycle();
+ }
+ }
}
}
};
@@ -419,6 +429,14 @@
args.arg2 = extras;
mHandler.obtainMessage(MSG_SET_EXTRAS, args).sendToTarget();
}
+
+ @Override
+ public final void onConnectionEvent(String connectionId, String event) {
+ SomeArgs args = SomeArgs.obtain();
+ args.arg1 = connectionId;
+ args.arg2 = event;
+ mHandler.obtainMessage(MSG_ON_CONNECTION_EVENT, args).sendToTarget();
+ }
};
public ConnectionServiceAdapterServant(IConnectionServiceAdapter delegate) {
diff --git a/telecomm/java/android/telecom/RemoteConnection.java b/telecomm/java/android/telecom/RemoteConnection.java
index f960959..0185808 100644
--- a/telecomm/java/android/telecom/RemoteConnection.java
+++ b/telecomm/java/android/telecom/RemoteConnection.java
@@ -209,6 +209,15 @@
* @param extras The extras containing other information associated with the connection.
*/
public void onExtrasChanged(RemoteConnection connection, @Nullable Bundle extras) {}
+
+ /**
+ * Handles a connection event propagated to this {@link RemoteConnection}.
+ *
+ * @param connection The {@code RemoteConnection} invoking this method.
+ * @param event The connection event.
+ * @hide
+ */
+ public void onConnectionEvent(RemoteConnection connection, String event) {}
}
/**
@@ -1291,6 +1300,20 @@
}
}
+ /** @hide */
+ void onConnectionEvent(final String event) {
+ for (CallbackRecord record : mCallbackRecords) {
+ final RemoteConnection connection = this;
+ final Callback callback = record.getCallback();
+ record.getHandler().post(new Runnable() {
+ @Override
+ public void run() {
+ callback.onConnectionEvent(connection, event);
+ }
+ });
+ }
+ }
+
/**
* Create a RemoteConnection represents a failure, and which will be in
* {@link Connection#STATE_DISCONNECTED}. Attempting to use it for anything will almost
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java
index dc0de0c..b85382f 100644
--- a/telecomm/java/android/telecom/RemoteConnectionService.java
+++ b/telecomm/java/android/telecom/RemoteConnectionService.java
@@ -330,6 +330,13 @@
.setExtras(extras);
}
}
+
+ @Override
+ public void onConnectionEvent(String callId, String event) {
+ if (mConnectionById.containsKey(callId)) {
+ findConnectionForAction(callId, "onConnectionEvent").onConnectionEvent(event);
+ }
+ }
};
private final ConnectionServiceAdapterServant mServant =
diff --git a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
index 7647444..569c244 100644
--- a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
@@ -86,4 +86,6 @@
void addExistingConnection(String callId, in ParcelableConnection connection);
void setExtras(String callId, in Bundle extras);
+
+ void onConnectionEvent(String callId, String event);
}