Merge "UsageStats: Trunk flag clean up." into main (92b95d68) · Commits · e / os / android_frameworks_base

core/java/android/app/usage/flags.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -58,13 +58,3 @@ flag {
		}
		}

		flag {
		name: "disable_idle_check"
		namespace: "backstage_power"
		description: "disable idle check for USER_SYSTEM during boot up"
		is_fixed_read_only: true
		bug: "337864590"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

+2 −7

Original line number	Diff line number	Diff line
		@@ -670,15 +670,12 @@ public class UsageStatsService extends SystemService implements
		mHandler.obtainMessage(MSG_REMOVE_USER, userId, 0).sendToTarget();
		}
		} else if (Intent.ACTION_USER_STARTED.equals(action)) {
		if (userId >= 0) {
		if (!Flags.disableIdleCheck() \|\| userId > 0) {
		// Don't check idle state for USER_SYSTEM during the boot up.
		if (userId > 0) {
		mHandler.obtainMessage(MSG_USER_STARTED, userId, 0).sendToTarget();
		}
		}
		}
		}
		}

		private class UidRemovedReceiver extends BroadcastReceiver {
		@Override
		@@ -2061,8 +2058,6 @@ public class UsageStatsService extends SystemService implements
		+ ": " + Flags.useParceledList());
		pw.println(" " + Flags.FLAG_FILTER_BASED_EVENT_QUERY_API
		+ ": " + Flags.filterBasedEventQueryApi());
		pw.println(" " + Flags.FLAG_DISABLE_IDLE_CHECK
		+ ": " + Flags.disableIdleCheck());

		final int[] userIds;
		synchronized (mLock) {