Merge "Cleanup FLAG_ADJUST_DEFAULT_BUCKET_ELEVATION_PARAMS" into main (c58ab4e0) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ java_library {
		"modules-utils-fastxmlserializer",
		"service-jobscheduler-alarm.flags-aconfig-java",
		"service-jobscheduler-job.flags-aconfig-java",
		"service-jobscheduler-appidle.flags-aconfig-java",
		],

		// Rename classes shared with the framework

apex/jobscheduler/service/aconfig/Android.bp

+0 −13

Original line number	Diff line number	Diff line
		@@ -42,16 +42,3 @@ java_aconfig_library {
		name: "service-jobscheduler-alarm.flags-aconfig-java",
		aconfig_declarations: "alarm_flags",
		}

		// App Idle
		aconfig_declarations {
		name: "app_idle_flags",
		package: "com.android.server.usage",
		container: "system",
		srcs: ["app_idle.aconfig"],
		}

		java_aconfig_library {
		name: "service-jobscheduler-appidle.flags-aconfig-java",
		aconfig_declarations: "app_idle_flags",
		}

apex/jobscheduler/service/aconfig/app_idle.aconfig

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		package: "com.android.server.usage"
		container: "system"

		flag {
		name: "adjust_default_bucket_elevation_params"
		namespace: "backstage_power"
		description: "Adjust the default bucket evaluation parameters"
		bug: "379909479"
		}

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+13 −43

Original line number	Diff line number	Diff line
		@@ -341,11 +341,11 @@ public class AppStandbyController
		*/
		long[] mAppStandbyElapsedThresholds = DEFAULT_ELAPSED_TIME_THRESHOLDS;
		/** Minimum time a strong usage event should keep the bucket elevated. */
		long mStrongUsageTimeoutMillis = ConstantsObserver.DEFAULT_LEGACY_STRONG_USAGE_TIMEOUT;
		long mStrongUsageTimeoutMillis = ConstantsObserver.DEFAULT_STRONG_USAGE_TIMEOUT;
		/** Minimum time a notification seen event should keep the bucket elevated. */
		long mNotificationSeenTimeoutMillis = ConstantsObserver.DEFAULT_NOTIFICATION_TIMEOUT;
		/** Minimum time a slice pinned event should keep the bucket elevated. */
		long mSlicePinnedTimeoutMillis = ConstantsObserver.DEFAULT_LEGACY_SLICE_PINNED_TIMEOUT;
		long mSlicePinnedTimeoutMillis = ConstantsObserver.DEFAULT_SLICE_PINNED_TIMEOUT;
		/** The standby bucket that an app will be promoted on a notification-seen event */
		int mNotificationSeenPromotedBucket =
		ConstantsObserver.DEFAULT_NOTIFICATION_SEEN_PROMOTED_BUCKET;
		@@ -366,9 +366,9 @@ public class AppStandbyController
		/** Maximum time to wait for a prediction before using simple timeouts to downgrade buckets. */
		long mPredictionTimeoutMillis = DEFAULT_PREDICTION_TIMEOUT;
		/** Maximum time a sync adapter associated with a CP should keep the buckets elevated. */
		long mSyncAdapterTimeoutMillis = ConstantsObserver.DEFAULT_LEGACY_SYNC_ADAPTER_TIMEOUT;
		long mSyncAdapterTimeoutMillis = ConstantsObserver.DEFAULT_SYNC_ADAPTER_TIMEOUT;
		/** The bucket that an app will be promoted on a sync adapter associated with a CP */
		int mSyncAdapaterPromotedBucket = STANDBY_BUCKET_ACTIVE;
		int mSyncAdapterPromotedBucket = STANDBY_BUCKET_WORKING_SET;
		/**
		* Maximum time an exempted sync should keep the buckets elevated, when sync is scheduled in
		* non-doze
		@@ -755,7 +755,7 @@ public class AppStandbyController
		userId);
		synchronized (mAppIdleLock) {
		reportNoninteractiveUsageCrossUserLocked(packageName, userId,
		mSyncAdapaterPromotedBucket, REASON_SUB_USAGE_SYNC_ADAPTER,
		mSyncAdapterPromotedBucket, REASON_SUB_USAGE_SYNC_ADAPTER,
		elapsedRealtime, mSyncAdapterTimeoutMillis, linkedProfiles);
		}
		}
		@@ -2456,11 +2456,6 @@ public class AppStandbyController

		@Override
		public void dumpState(String[] args, PrintWriter pw) {
		pw.println("Flags: ");
		pw.println(" " + Flags.FLAG_ADJUST_DEFAULT_BUCKET_ELEVATION_PARAMS
		+ ": " + Flags.adjustDefaultBucketElevationParams());
		pw.println();

		synchronized (mCarrierPrivilegedLock) {
		pw.println("Carrier privileged apps (have=" + mHaveCarrierPrivilegedApps
		+ "): " + mCarrierPrivilegedApps);
		@@ -2494,8 +2489,8 @@ public class AppStandbyController
		pw.print(" mSyncAdapterTimeoutMillis=");
		TimeUtils.formatDuration(mSyncAdapterTimeoutMillis, pw);
		pw.println();
		pw.print(" mSyncAdapaterPromotedBucket=");
		pw.print(standbyBucketToString(mSyncAdapaterPromotedBucket));
		pw.print(" mSyncAdapterPromotedBucket=");
		pw.print(standbyBucketToString(mSyncAdapterPromotedBucket));
		pw.println();
		pw.print(" mSystemInteractionTimeoutMillis=");
		TimeUtils.formatDuration(mSystemInteractionTimeoutMillis, pw);
		@@ -3081,17 +3076,13 @@ public class AppStandbyController

		public static final long DEFAULT_CHECK_IDLE_INTERVAL_MS =
		COMPRESS_TIME ? ONE_MINUTE : 4 * ONE_HOUR;
		public static final long DEFAULT_LEGACY_STRONG_USAGE_TIMEOUT =
		COMPRESS_TIME ? ONE_MINUTE : 1 * ONE_HOUR;

		public static final long DEFAULT_CURRENT_STRONG_USAGE_TIMEOUT =
		public static final long DEFAULT_STRONG_USAGE_TIMEOUT =
		COMPRESS_TIME ? ONE_MINUTE : 5 * ONE_MINUTE;
		public static final long DEFAULT_NOTIFICATION_TIMEOUT =
		COMPRESS_TIME ? 12 * ONE_MINUTE : 12 * ONE_HOUR;
		public static final long DEFAULT_LEGACY_SLICE_PINNED_TIMEOUT =
		COMPRESS_TIME ? 12 * ONE_MINUTE : 12 * ONE_HOUR;

		public static final long DEFAULT_CURRENT_SLICE_PINNED_TIMEOUT =
		public static final long DEFAULT_SLICE_PINNED_TIMEOUT =
		COMPRESS_TIME ? 12 * ONE_MINUTE : 2 * ONE_HOUR;
		public static final int DEFAULT_NOTIFICATION_SEEN_PROMOTED_BUCKET =
		STANDBY_BUCKET_WORKING_SET;
		@@ -3101,10 +3092,8 @@ public class AppStandbyController
		COMPRESS_TIME ? 2 * ONE_MINUTE : 2 * ONE_HOUR;
		public static final long DEFAULT_SYSTEM_INTERACTION_TIMEOUT =
		COMPRESS_TIME ? ONE_MINUTE : 10 * ONE_MINUTE;
		public static final long DEFAULT_LEGACY_SYNC_ADAPTER_TIMEOUT =
		COMPRESS_TIME ? ONE_MINUTE : 10 * ONE_MINUTE;

		public static final long DEFAULT_CURRENT_SYNC_ADAPTER_TIMEOUT =
		public static final long DEFAULT_SYNC_ADAPTER_TIMEOUT =
		COMPRESS_TIME ? ONE_MINUTE : 2 * ONE_HOUR;
		public static final long DEFAULT_EXEMPTED_SYNC_SCHEDULED_NON_DOZE_TIMEOUT =
		COMPRESS_TIME ? (ONE_MINUTE / 2) : 10 * ONE_MINUTE;
		@@ -3149,8 +3138,6 @@ public class AppStandbyController
		false, this);
		mInjector.registerDeviceConfigPropertiesChangedListener(this);

		processDefaultConstants();

		// Load all the constants.
		// postOneTimeCheckIdleStates() doesn't need to be called on boot.
		processProperties(mInjector.getDeviceConfigProperties());
		@@ -3169,17 +3156,6 @@ public class AppStandbyController
		postOneTimeCheckIdleStates();
		}

		private void processDefaultConstants() {
		if (!Flags.adjustDefaultBucketElevationParams()) {
		return;
		}

		mSlicePinnedTimeoutMillis = DEFAULT_CURRENT_SLICE_PINNED_TIMEOUT;
		mSyncAdapterTimeoutMillis = DEFAULT_CURRENT_SYNC_ADAPTER_TIMEOUT;
		mSyncAdapaterPromotedBucket = STANDBY_BUCKET_WORKING_SET;
		mStrongUsageTimeoutMillis = DEFAULT_CURRENT_STRONG_USAGE_TIMEOUT;
		}

		private void processProperties(DeviceConfig.Properties properties) {
		boolean timeThresholdsUpdated = false;
		synchronized (mAppIdleLock) {
		@@ -3227,16 +3203,12 @@ public class AppStandbyController
		case KEY_SLICE_PINNED_HOLD_DURATION:
		mSlicePinnedTimeoutMillis = properties.getLong(
		KEY_SLICE_PINNED_HOLD_DURATION,
		Flags.adjustDefaultBucketElevationParams()
		? DEFAULT_CURRENT_SLICE_PINNED_TIMEOUT
		: DEFAULT_LEGACY_SLICE_PINNED_TIMEOUT);
		DEFAULT_SLICE_PINNED_TIMEOUT);
		break;
		case KEY_STRONG_USAGE_HOLD_DURATION:
		mStrongUsageTimeoutMillis = properties.getLong(
		KEY_STRONG_USAGE_HOLD_DURATION,
		Flags.adjustDefaultBucketElevationParams()
		? DEFAULT_CURRENT_STRONG_USAGE_TIMEOUT
		: DEFAULT_LEGACY_STRONG_USAGE_TIMEOUT);
		DEFAULT_STRONG_USAGE_TIMEOUT);
		break;
		case KEY_PREDICTION_TIMEOUT:
		mPredictionTimeoutMillis = properties.getLong(
		@@ -3254,9 +3226,7 @@ public class AppStandbyController
		case KEY_SYNC_ADAPTER_HOLD_DURATION:
		mSyncAdapterTimeoutMillis = properties.getLong(
		KEY_SYNC_ADAPTER_HOLD_DURATION,
		Flags.adjustDefaultBucketElevationParams()
		? DEFAULT_CURRENT_SYNC_ADAPTER_TIMEOUT
		: DEFAULT_LEGACY_SYNC_ADAPTER_TIMEOUT);
		DEFAULT_SYNC_ADAPTER_TIMEOUT);
		break;
		case KEY_EXEMPTED_SYNC_SCHEDULED_DOZE_HOLD_DURATION:
		mExemptedSyncScheduledDozeTimeoutMillis = properties.getLong(