Snap for 8350640 from 23d65f1d38ae0e5fcb0beb4e38f451c908b55019 to sc-qpr3-release (45508a0b) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/infra/ServiceConnector.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -507,10 +507,21 @@ public interface ServiceConnector<I extends IInterface> {
		void unbindJobThread() {
		cancelTimeout();
		I service = mService;
		// TODO(b/224695239): This is actually checking wasConnected. Rename and/or fix
		// implementation based on what this should actually be checking. At least the first
		// check for calling unbind is the correct behavior, though.
		boolean wasBound = service != null;
		if (wasBound \|\| mBinding) {
		try {
		mContext.unbindService(mServiceConnection);
		} catch (IllegalArgumentException e) { // TODO(b/224697137): Fix the race condition
		// that requires catching this (crashes if
		// service isn't currently bound).
		Log.e(LOG_TAG, "Failed to unbind: " + e);
		}
		}
		if (wasBound) {
		onServiceConnectionStatusChanged(service, false);
		mContext.unbindService(mServiceConnection);
		service.asBinder().unlinkToDeath(this, 0);
		mService = null;
		}

core/java/com/android/internal/os/BatteryStatsImpl.java

+17 −8

Original line number	Diff line number	Diff line
		@@ -4664,7 +4664,6 @@ public class BatteryStatsImpl extends BatteryStats {

		public void noteLongPartialWakelockStart(String name, String historyName, int uid,
		long elapsedRealtimeMs, long uptimeMs) {
		uid = mapUid(uid);
		noteLongPartialWakeLockStartInternal(name, historyName, uid, elapsedRealtimeMs, uptimeMs);
		}

		@@ -4696,15 +4695,21 @@ public class BatteryStatsImpl extends BatteryStats {

		private void noteLongPartialWakeLockStartInternal(String name, String historyName, int uid,
		long elapsedRealtimeMs, long uptimeMs) {
		final int mappedUid = mapUid(uid);
		if (historyName == null) {
		historyName = name;
		}
		if (!mActiveEvents.updateState(HistoryItem.EVENT_LONG_WAKE_LOCK_START, historyName, uid,
		0)) {
		if (!mActiveEvents.updateState(HistoryItem.EVENT_LONG_WAKE_LOCK_START, historyName,
		mappedUid, 0)) {
		return;
		}
		addHistoryEventLocked(elapsedRealtimeMs, uptimeMs, HistoryItem.EVENT_LONG_WAKE_LOCK_START,
		historyName, uid);
		historyName, mappedUid);
		if (mappedUid != uid) {
		// Prevent the isolated uid mapping from being removed while the wakelock is
		// being held.
		incrementIsolatedUidRefCount(uid);
		}
		}

		public void noteLongPartialWakelockFinish(String name, String historyName, int uid) {
		@@ -4714,7 +4719,6 @@ public class BatteryStatsImpl extends BatteryStats {

		public void noteLongPartialWakelockFinish(String name, String historyName, int uid,
		long elapsedRealtimeMs, long uptimeMs) {
		uid = mapUid(uid);
		noteLongPartialWakeLockFinishInternal(name, historyName, uid, elapsedRealtimeMs, uptimeMs);
		}

		@@ -4746,15 +4750,20 @@ public class BatteryStatsImpl extends BatteryStats {

		private void noteLongPartialWakeLockFinishInternal(String name, String historyName, int uid,
		long elapsedRealtimeMs, long uptimeMs) {
		final int mappedUid = mapUid(uid);
		if (historyName == null) {
		historyName = name;
		}
		if (!mActiveEvents.updateState(HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH, historyName, uid,
		0)) {
		if (!mActiveEvents.updateState(HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH, historyName,
		mappedUid, 0)) {
		return;
		}
		addHistoryEventLocked(elapsedRealtimeMs, uptimeMs, HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH,
		historyName, uid);
		historyName, mappedUid);
		if (mappedUid != uid) {
		// Decrement the ref count for the isolated uid and delete the mapping if uneeded.
		maybeRemoveIsolatedUidLocked(uid, elapsedRealtimeMs, uptimeMs);
		}
		}

		void aggregateLastWakeupUptimeLocked(long elapsedRealtimeMs, long uptimeMs) {

core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java

+112 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@ import static android.os.BatteryStats.WAKE_TYPE_PARTIAL;
		import static com.android.internal.os.BatteryStatsImpl.ExternalStatsSync.UPDATE_CPU;
		import static com.android.internal.os.BatteryStatsImpl.ExternalStatsSync.UPDATE_DISPLAY;

		import static com.google.common.truth.Truth.assertThat;

		import android.app.ActivityManager;
		import android.os.BatteryStats;
		import android.os.BatteryStats.HistoryItem;
		@@ -206,6 +208,116 @@ public class BatteryStatsNoteTest extends TestCase {
		assertEquals(120_000, bgTime);
		}

		/**
		* Test BatteryStatsImpl.Uid.noteLongPartialWakelockStart for an isolated uid.
		*/
		@SmallTest
		public void testNoteLongPartialWakelockStart_isolatedUid() throws Exception {
		final MockClocks clocks = new MockClocks(); // holds realtime and uptime in ms
		MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks);


		bi.setRecordAllHistoryLocked(true);
		bi.forceRecordAllHistory();

		int pid = 10;
		String name = "name";
		String historyName = "historyName";

		WorkSource.WorkChain isolatedWorkChain = new WorkSource.WorkChain();
		isolatedWorkChain.addNode(ISOLATED_UID, name);

		// Map ISOLATED_UID to UID.
		bi.addIsolatedUidLocked(ISOLATED_UID, UID);

		bi.updateTimeBasesLocked(true, Display.STATE_OFF, 0, 0);
		bi.noteUidProcessStateLocked(UID, ActivityManager.PROCESS_STATE_TOP);
		bi.noteLongPartialWakelockStart(name, historyName, ISOLATED_UID);

		clocks.realtime = clocks.uptime = 100;
		bi.noteUidProcessStateLocked(UID, ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND);

		clocks.realtime = clocks.uptime = 220;
		bi.noteLongPartialWakelockFinish(name, historyName, ISOLATED_UID);

		final BatteryStatsHistoryIterator iterator =
		bi.createBatteryStatsHistoryIterator();

		BatteryStats.HistoryItem item = new BatteryStats.HistoryItem();

		while (iterator.next(item)) {
		if (item.eventCode == HistoryItem.EVENT_LONG_WAKE_LOCK_START) break;
		}
		assertThat(item.eventCode).isEqualTo(HistoryItem.EVENT_LONG_WAKE_LOCK_START);
		assertThat(item.eventTag).isNotNull();
		assertThat(item.eventTag.string).isEqualTo(historyName);
		assertThat(item.eventTag.uid).isEqualTo(UID);

		while (iterator.next(item)) {
		if (item.eventCode == HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH) break;
		}
		assertThat(item.eventCode).isEqualTo(HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH);
		assertThat(item.eventTag).isNotNull();
		assertThat(item.eventTag.string).isEqualTo(historyName);
		assertThat(item.eventTag.uid).isEqualTo(UID);
		}

		/**
		* Test BatteryStatsImpl.Uid.noteLongPartialWakelockStart for an isolated uid.
		*/
		@SmallTest
		public void testNoteLongPartialWakelockStart_isolatedUidRace() throws Exception {
		final MockClocks clocks = new MockClocks(); // holds realtime and uptime in ms
		MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks);


		bi.setRecordAllHistoryLocked(true);
		bi.forceRecordAllHistory();

		int pid = 10;
		String name = "name";
		String historyName = "historyName";

		WorkSource.WorkChain isolatedWorkChain = new WorkSource.WorkChain();
		isolatedWorkChain.addNode(ISOLATED_UID, name);

		// Map ISOLATED_UID to UID.
		bi.addIsolatedUidLocked(ISOLATED_UID, UID);

		bi.updateTimeBasesLocked(true, Display.STATE_OFF, 0, 0);
		bi.noteUidProcessStateLocked(UID, ActivityManager.PROCESS_STATE_TOP);
		bi.noteLongPartialWakelockStart(name, historyName, ISOLATED_UID);

		clocks.realtime = clocks.uptime = 100;
		bi.noteUidProcessStateLocked(UID, ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND);

		clocks.realtime = clocks.uptime = 150;
		bi.maybeRemoveIsolatedUidLocked(ISOLATED_UID, clocks.realtime, clocks.uptime);

		clocks.realtime = clocks.uptime = 220;
		bi.noteLongPartialWakelockFinish(name, historyName, ISOLATED_UID);

		final BatteryStatsHistoryIterator iterator =
		bi.createBatteryStatsHistoryIterator();

		BatteryStats.HistoryItem item = new BatteryStats.HistoryItem();

		while (iterator.next(item)) {
		if (item.eventCode == HistoryItem.EVENT_LONG_WAKE_LOCK_START) break;
		}
		assertThat(item.eventCode).isEqualTo(HistoryItem.EVENT_LONG_WAKE_LOCK_START);
		assertThat(item.eventTag).isNotNull();
		assertThat(item.eventTag.string).isEqualTo(historyName);
		assertThat(item.eventTag.uid).isEqualTo(UID);

		while (iterator.next(item)) {
		if (item.eventCode == HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH) break;
		}
		assertThat(item.eventCode).isEqualTo(HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH);
		assertThat(item.eventTag).isNotNull();
		assertThat(item.eventTag.string).isEqualTo(historyName);
		assertThat(item.eventTag.uid).isEqualTo(UID);
		}

		/**
		* Test BatteryStatsImpl.noteUidProcessStateLocked.

data/etc/car/com.android.car.shell.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,6 +37,6 @@
		<permission name="android.car.permission.USE_CAR_WATCHDOG" />
		<permission name="android.car.permission.COLLECT_CAR_WATCHDOG_METRICS" />
		<permission name="android.car.permission.CONTROL_CAR_WATCHDOG_CONFIG" />
		<permission name="android.car.permission.USE_CAR_TELEMETRY_SERVICE"/>
		<permission name="com.android.car.permission.USE_CAR_TELEMETRY_SERVICE"/>
		</privapp-permissions>
		</permissions>

data/etc/car/com.google.android.car.kitchensink.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,6 +95,6 @@
		<permission name="android.car.permission.CONTROL_CAR_EVS_ACTIVITY" />
		<permission name="android.car.permission.USE_CAR_EVS_CAMERA" />
		<permission name="android.car.permission.MONITOR_CAR_EVS_STATUS" />
		<permission name="android.car.permission.USE_CAR_TELEMETRY_SERVICE" />
		<permission name="com.android.car.permission.USE_CAR_TELEMETRY_SERVICE" />
		</privapp-permissions>
		</permissions>