Snap for 8681172 from fda91f95789c9407c57884ea9e04e31e58a71780 to tm-release (1fe2e7d3) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/DisplayManagerInternal.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -569,8 +569,19 @@ public abstract class DisplayManagerInternal {
		void onProximityNegative();
		void onDisplayStateChange(boolean allInactive, boolean allOff);

		void acquireSuspendBlocker();
		void releaseSuspendBlocker();
		/**
		* Acquires a suspend blocker with a specified label.
		*
		* @param id A logging label for the acquisition.
		*/
		void acquireSuspendBlocker(String id);

		/**
		* Releases a suspend blocker with a specified label.
		*
		* @param id A logging label for the release.
		*/
		void releaseSuspendBlocker(String id);
		}

		/**

+6 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,12 @@ public class VpnManager {
		/**
		* Action sent in {@link android.content.Intent}s to VpnManager clients when an event occurred.
		*
		* <p>If the provisioning application declares a service handling this intent action, but is not
		* already running, it will be started. Upon starting, the application is granted a short grace
		* period to run in the background even while the device is idle to handle any potential
		* failures. Applications requiring long-running actions triggered by one of these events should
		* declare a foreground service to prevent being killed once the grace period expires.
		*
		* This action will have a category of either {@link #CATEGORY_EVENT_IKE_ERROR},
		* {@link #CATEGORY_EVENT_NETWORK_ERROR}, or {@link #CATEGORY_EVENT_DEACTIVATED_BY_USER},
		* that the app can use to filter events it's interested in reacting to.

+10 −12

Original line number	Diff line number	Diff line
		@@ -1130,18 +1130,16 @@ public class DreamService extends Service implements Window.Callback {

		final PackageManager pm = context.getPackageManager();

		final TypedArray rawMetadata = readMetadata(pm, serviceInfo);
		try (TypedArray rawMetadata = readMetadata(pm, serviceInfo)) {
		if (rawMetadata == null) return null;

		final DreamMetadata metadata = new DreamMetadata(
		return new DreamMetadata(
		convertToComponentName(rawMetadata.getString(
		com.android.internal.R.styleable.Dream_settingsActivity), serviceInfo),
		rawMetadata.getDrawable(
		com.android.internal.R.styleable.Dream_previewImage),
		rawMetadata.getBoolean(R.styleable.Dream_showClockAndComplications,
		DEFAULT_SHOW_COMPLICATIONS));
		rawMetadata.recycle();
		return metadata;
		}
		}

		/**

+2 −1

Original line number	Diff line number	Diff line
		@@ -765,10 +765,11 @@ public final class Choreographer {
		startNanos = System.nanoTime();
		final long jitterNanos = startNanos - frameTimeNanos;
		if (jitterNanos >= frameIntervalNanos) {
		final long lastFrameOffset = jitterNanos % frameIntervalNanos;
		long lastFrameOffset = 0;
		if (frameIntervalNanos == 0) {
		Log.i(TAG, "Vsync data empty due to timeout");
		} else {
		lastFrameOffset = jitterNanos % frameIntervalNanos;
		final long skippedFrames = jitterNanos / frameIntervalNanos;
		if (skippedFrames >= SKIPPED_FRAME_WARNING_LIMIT) {
		Log.i(TAG, "Skipped " + skippedFrames + " frames! "

+2 −1

Original line number	Diff line number	Diff line
		@@ -242,7 +242,8 @@ oneway interface IStatusBar
		* Displays a text toast.
		*/
		void showToast(int uid, String packageName, IBinder token, CharSequence text,
		IBinder windowToken, int duration, @nullable ITransientNotificationCallback callback);
		IBinder windowToken, int duration, @nullable ITransientNotificationCallback callback,
		int displayId);

		/**
		* Cancels toast with token {@code token} in {@code packageName}.