Snap for 6383721 from 0be1de4f612620950abd1660673f70dd57ece5a2 to mainline-release (7390c01f) · Commits · e / os / android_frameworks_base

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -1364,6 +1364,19 @@ public class AppStandbyController implements AppStandbyInternal {
		if (DEBUG) {
		Slog.d(TAG, " Keeping at WORKING_SET due to min timeout");
		}
		} else if (newBucket == STANDBY_BUCKET_RARE
		&& getBucketForLocked(packageName, userId, elapsedRealtime)
		== STANDBY_BUCKET_RESTRICTED) {
		// Prediction doesn't think the app will be used anytime soon and
		// it's been long enough that it could just time out into restricted,
		// so time it out there instead. Using TIMEOUT will allow prediction
		// to raise the bucket when it needs to.
		newBucket = STANDBY_BUCKET_RESTRICTED;
		reason = REASON_MAIN_TIMEOUT;
		if (DEBUG) {
		Slog.d(TAG,
		"Prediction to RARE overridden by timeout into RESTRICTED");
		}
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ stubs_defaults {
		// TODO(b/135922046) remove this
		include_dirs: ["frameworks/base/core/java"],
		},
		sdk_version: "system_current",
		}

		droidstubs {

+0 −5

Original line number	Diff line number	Diff line
		@@ -46,12 +46,10 @@ stubs_defaults {
		name: "framework-permission-stubs-defaults",
		srcs: [ ":framework-permission-sources" ],
		libs: [ "framework-annotations-lib" ],
		sdk_version: "system_current",
		}

		droidstubs {
		name: "framework-permission-stubs-srcs-publicapi",
		sdk_version: "system_current",
		defaults: [
		"framework-module-stubs-defaults-publicapi",
		"framework-permission-stubs-defaults",
		@@ -60,7 +58,6 @@ droidstubs {

		droidstubs {
		name: "framework-permission-stubs-srcs-systemapi",
		sdk_version: "system_current",
		defaults: [
		"framework-module-stubs-defaults-systemapi",
		"framework-permission-stubs-defaults",
		@@ -69,7 +66,6 @@ droidstubs {

		droidstubs {
		name: "framework-permission-api-module_libs_api",
		sdk_version: "system_current",
		defaults: [
		"framework-module-api-defaults-module_libs_api",
		"framework-permission-stubs-defaults",
		@@ -78,7 +74,6 @@ droidstubs {

		droidstubs {
		name: "framework-permission-stubs-srcs-module_libs_api",
		sdk_version: "system_current",
		defaults: [
		"framework-module-stubs-defaults-module_libs_api",
		"framework-permission-stubs-defaults",

+0 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ stubs_defaults {
		name: "framework-sdkextensions-stubs-defaults",
		srcs: [ ":framework-sdkextensions-sources" ],
		libs: [ "framework-annotations-lib" ],
		sdk_version: "system_current",
		}

		droidstubs {

+0 −3

Original line number	Diff line number	Diff line
		@@ -59,9 +59,6 @@ interface IStatsCompanionService {
		/** Cancel any alarm for the purpose of subscriber triggering. */
		oneway void cancelAlarmForSubscriberTriggering();

		/** Tells StatsCompaionService to grab the uid map snapshot and send it to statsd. */
		oneway void triggerUidSnapshot();

		/**
		* Ask StatsCompanionService if the given permission is allowed for a particular process
		* and user ID. statsd is incapable of doing this check itself because checkCallingPermission