Snap for 10037196 from 0076e44193475ccdf62aaa247f80a6307e3fdfb1 to udc-qpr1-release (e558d1aa) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+53 −36

Original line number	Diff line number	Diff line
		@@ -319,6 +319,8 @@ public class DeviceIdleController extends SystemService
		private SensorManager mSensorManager;
		private final boolean mUseMotionSensor;
		private Sensor mMotionSensor;
		private final boolean mIsLocationPrefetchEnabled;
		@Nullable
		private LocationRequest mLocationRequest;
		private Intent mIdleIntent;
		private Bundle mIdleIntentOptions;
		@@ -2460,6 +2462,11 @@ public class DeviceIdleController extends SystemService
		return null;
		}

		boolean isLocationPrefetchEnabled() {
		return mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_autoPowerModePrefetchLocation);
		}

		boolean useMotionSensor() {
		return mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_autoPowerModeUseMotionSensor);
		@@ -2489,6 +2496,7 @@ public class DeviceIdleController extends SystemService
		mAppStateTracker = mInjector.getAppStateTracker(context,
		AppSchedulingModuleThread.get().getLooper());
		LocalServices.addService(AppStateTracker.class, mAppStateTracker);
		mIsLocationPrefetchEnabled = mInjector.isLocationPrefetchEnabled();
		mUseMotionSensor = mInjector.useMotionSensor();
		}

		@@ -2602,8 +2610,7 @@ public class DeviceIdleController extends SystemService
		mMotionSensor = mInjector.getMotionSensor();
		}

		if (getContext().getResources().getBoolean(
		com.android.internal.R.bool.config_autoPowerModePrefetchLocation)) {
		if (mIsLocationPrefetchEnabled) {
		mLocationRequest = new LocationRequest.Builder(/intervalMillis=/ 0)
		.setQuality(LocationRequest.QUALITY_HIGH_ACCURACY)
		.setMaxUpdates(1)
		@@ -3779,10 +3786,12 @@ public class DeviceIdleController extends SystemService
		case STATE_SENSING:
		cancelSensingTimeoutAlarmLocked();
		moveToStateLocked(STATE_LOCATING, reason);
		if (mIsLocationPrefetchEnabled) {
		scheduleAlarmLocked(mConstants.LOCATING_TIMEOUT);
		LocationManager locationManager = mInjector.getLocationManager();
		if (locationManager != null
		&& locationManager.getProvider(LocationManager.FUSED_PROVIDER) != null) {
		&& locationManager.getProvider(LocationManager.FUSED_PROVIDER)
		!= null) {
		locationManager.requestLocationUpdates(LocationManager.FUSED_PROVIDER,
		mLocationRequest,
		AppSchedulingModuleThread.getExecutor(),
		@@ -3794,8 +3803,8 @@ public class DeviceIdleController extends SystemService
		if (locationManager != null
		&& locationManager.getProvider(LocationManager.GPS_PROVIDER) != null) {
		mHasGps = true;
		locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 5,
		mGpsLocationListener, mHandler.getLooper());
		locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
		1000, 5, mGpsLocationListener, mHandler.getLooper());
		mLocating = true;
		} else {
		mHasGps = false;
		@@ -3805,8 +3814,12 @@ public class DeviceIdleController extends SystemService
		if (mLocating) {
		break;
		}

		// Otherwise, we have to move from locating into idle maintenance.
		} else {
		mLocating = false;
		}

		// We're not doing any locating work, so move on to the next state.
		case STATE_LOCATING:
		cancelAlarmLocked();
		cancelLocatingLocked();
		@@ -5303,6 +5316,7 @@ public class DeviceIdleController extends SystemService
		pw.print(" "); pw.print(mStationaryListeners.size());
		pw.println(" stationary listeners registered");
		}
		if (mIsLocationPrefetchEnabled) {
		pw.print(" mLocating="); pw.print(mLocating);
		pw.print(" mHasGps="); pw.print(mHasGps);
		pw.print(" mHasFused="); pw.print(mHasFusedLocation);
		@@ -5313,6 +5327,9 @@ public class DeviceIdleController extends SystemService
		if (mLastGpsLocation != null) {
		pw.print(" mLastGpsLocation="); pw.println(mLastGpsLocation);
		}
		} else {
		pw.println(" Location prefetching disabled");
		}
		pw.print(" mState="); pw.print(stateToString(mState));
		pw.print(" mLightState=");
		pw.println(lightStateToString(mLightState));

config/dirty-image-objects

+164 −253

File changed.

Preview size limit exceeded, changes collapsed.

core/api/test-current.txt

+0 −11

Original line number	Diff line number	Diff line
		@@ -3632,18 +3632,12 @@ package android.view.autofill {
		}

		public final class AutofillManager {
		method public void clearAutofillRequestCallback();
		method @RequiresPermission(android.Manifest.permission.PROVIDE_OWN_AUTOFILL_SUGGESTIONS) public void setAutofillRequestCallback(@NonNull java.util.concurrent.Executor, @NonNull android.view.autofill.AutofillRequestCallback);
		field public static final String ANY_HINT = "any";
		field public static final int FLAG_SMART_SUGGESTION_OFF = 0; // 0x0
		field public static final int FLAG_SMART_SUGGESTION_SYSTEM = 1; // 0x1
		field public static final int MAX_TEMP_AUGMENTED_SERVICE_DURATION_MS = 120000; // 0x1d4c0
		}

		public interface AutofillRequestCallback {
		method public void onFillRequest(@Nullable android.view.inputmethod.InlineSuggestionsRequest, @NonNull android.os.CancellationSignal, @NonNull android.service.autofill.FillCallback);
		}

		}

		package android.view.contentcapture {
		@@ -3767,11 +3761,6 @@ package android.view.inputmethod {
		method @NonNull public static android.view.inputmethod.InlineSuggestionInfo newInlineSuggestionInfo(@NonNull android.widget.inline.InlinePresentationSpec, @NonNull String, @Nullable String[], @NonNull String, boolean);
		}

		public static final class InlineSuggestionsRequest.Builder {
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setClientSupported(boolean);
		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setServiceSupported(boolean);
		}

		public final class InlineSuggestionsResponse implements android.os.Parcelable {
		method @NonNull public static android.view.inputmethod.InlineSuggestionsResponse newInlineSuggestionsResponse(@NonNull java.util.List<android.view.inputmethod.InlineSuggestion>);
		}

core/java/android/app/ActivityOptions.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -403,8 +403,11 @@ public class ActivityOptions extends ComponentOptions {
		private static final String KEY_SPLASH_SCREEN_STYLE =
		"android.activity.splashScreenStyle";

		/** See {@link #setTransientLaunch()}. */
		private static final String KEY_TRANSIENT_LAUNCH = "android.activity.transientLaunch";
		/**
		* See {@link #setTransientLaunch()}.
		* @hide
		*/
		public static final String KEY_TRANSIENT_LAUNCH = "android.activity.transientLaunch";

		/** see {@link #makeLaunchIntoPip(PictureInPictureParams)}. */
		private static final String KEY_LAUNCH_INTO_PIP_PARAMS =

core/java/android/app/ITaskStackListener.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ oneway interface ITaskStackListener {
		* activities inside it belong to a managed profile user, and that user has just
		* been locked.
		*/
		void onTaskProfileLocked(in ActivityManager.RunningTaskInfo taskInfo);
		void onTaskProfileLocked(in ActivityManager.RunningTaskInfo taskInfo, int userId);

		/**
		* Called when a task snapshot got updated.