Merge "BatteryStats: Remove dead code." (2884b9f7) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/IBatteryStats.aidl

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -123,8 +123,6 @@ interface IBatteryStats {
	void noteWifiScanStoppedFromSource(in WorkSource ws);		void noteWifiScanStoppedFromSource(in WorkSource ws);
	void noteWifiBatchedScanStartedFromSource(in WorkSource ws, int csph);		void noteWifiBatchedScanStartedFromSource(in WorkSource ws, int csph);
	void noteWifiBatchedScanStoppedFromSource(in WorkSource ws);		void noteWifiBatchedScanStoppedFromSource(in WorkSource ws);
	void noteWifiMulticastEnabledFromSource(in WorkSource ws);
	void noteWifiMulticastDisabledFromSource(in WorkSource ws);
	void noteWifiRadioPowerState(int powerState, long timestampNs, int uid);		void noteWifiRadioPowerState(int powerState, long timestampNs, int uid);
	void noteNetworkInterfaceType(String iface, int type);		void noteNetworkInterfaceType(String iface, int type);
	void noteNetworkStatsEnabled();		void noteNetworkStatsEnabled();

+0 −28

Original line number	Original line	Diff line number	Diff line
	@@ -6001,34 +6001,6 @@ public class BatteryStatsImpl extends BatteryStats {
	}		}
	}		}

	public void noteWifiMulticastEnabledFromSourceLocked(WorkSource ws) {
	int N = ws.size();
	for (int i=0; i<N; i++) {
	noteWifiMulticastEnabledLocked(ws.get(i));
	}

	final List<WorkChain> workChains = ws.getWorkChains();
	if (workChains != null) {
	for (int i = 0; i < workChains.size(); ++i) {
	noteWifiMulticastEnabledLocked(workChains.get(i).getAttributionUid());
	}
	}
	}

	public void noteWifiMulticastDisabledFromSourceLocked(WorkSource ws) {
	int N = ws.size();
	for (int i=0; i<N; i++) {
	noteWifiMulticastDisabledLocked(ws.get(i));
	}

	final List<WorkChain> workChains = ws.getWorkChains();
	if (workChains != null) {
	for (int i = 0; i < workChains.size(); ++i) {
	noteWifiMulticastDisabledLocked(workChains.get(i).getAttributionUid());
	}
	}
	}

	private static String[] includeInStringArray(String[] array, String str) {		private static String[] includeInStringArray(String[] array, String str) {
	if (ArrayUtils.indexOf(array, str) >= 0) {		if (ArrayUtils.indexOf(array, str) >= 0) {
	return array;		return array;

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -933,21 +933,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
	}		}
	}		}

	public void noteWifiMulticastEnabledFromSource(WorkSource ws) {
	enforceCallingPermission();
	synchronized (mStats) {
	mStats.noteWifiMulticastEnabledFromSourceLocked(ws);
	}
	}

	@Override
	public void noteWifiMulticastDisabledFromSource(WorkSource ws) {
	enforceCallingPermission();
	synchronized (mStats) {
	mStats.noteWifiMulticastDisabledFromSourceLocked(ws);
	}
	}

	@Override		@Override
	public void noteNetworkInterfaceType(String iface, int networkType) {		public void noteNetworkInterfaceType(String iface, int networkType) {
	enforceCallingPermission();		enforceCallingPermission();