Snap for 5876498 from c7800c59b99924d4c14899f5c996476b2eb7a286 to qt-qpr1-release (64e371f7) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -944,6 +944,10 @@ public class Activity extends ContextThemeWrapper
	/** @hide */		/** @hide */
	boolean mEnterAnimationComplete;		boolean mEnterAnimationComplete;

			/ Track last dispatched multi-window and PiP mode to client, internal debug purpose /
			private Boolean mLastDispatchedIsInMultiWindowMode;
			private Boolean mLastDispatchedIsInPictureInPictureMode;

	private static native String getDlWarning();		private static native String getDlWarning();

	/** Return the intent that started this activity. */		/** Return the intent that started this activity. */
	@@ -6999,6 +7003,10 @@ public class Activity extends ContextThemeWrapper
	writer.print(mResumed); writer.print(" mStopped=");		writer.print(mResumed); writer.print(" mStopped=");
	writer.print(mStopped); writer.print(" mFinished=");		writer.print(mStopped); writer.print(" mFinished=");
	writer.println(mFinished);		writer.println(mFinished);
			writer.print(innerPrefix); writer.print("mLastDispatchedIsInMultiWindowMode=");
			writer.print(mLastDispatchedIsInMultiWindowMode);
			writer.print(" mLastDispatchedIsInPictureInPictureMode=");
			writer.println(mLastDispatchedIsInPictureInPictureMode);
	writer.print(innerPrefix); writer.print("mChangingConfigurations=");		writer.print(innerPrefix); writer.print("mChangingConfigurations=");
	writer.println(mChangingConfigurations);		writer.println(mChangingConfigurations);
	writer.print(innerPrefix); writer.print("mCurrentConfig=");		writer.print(innerPrefix); writer.print("mCurrentConfig=");
	@@ -8078,6 +8086,7 @@ public class Activity extends ContextThemeWrapper
	if (mWindow != null) {		if (mWindow != null) {
	mWindow.onMultiWindowModeChanged();		mWindow.onMultiWindowModeChanged();
	}		}
			mLastDispatchedIsInMultiWindowMode = isInMultiWindowMode;
	onMultiWindowModeChanged(isInMultiWindowMode, newConfig);		onMultiWindowModeChanged(isInMultiWindowMode, newConfig);
	}		}

	@@ -8090,6 +8099,7 @@ public class Activity extends ContextThemeWrapper
	if (mWindow != null) {		if (mWindow != null) {
	mWindow.onPictureInPictureModeChanged(isInPictureInPictureMode);		mWindow.onPictureInPictureModeChanged(isInPictureInPictureMode);
	}		}
			mLastDispatchedIsInPictureInPictureMode = isInPictureInPictureMode;
	onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);		onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
	}		}

core/java/android/app/DownloadManager.java

+22 −20

Original line number	Original line	Diff line number	Diff line
	@@ -132,6 +132,9 @@ public class DownloadManager {
	*/		*/
	public final static String COLUMN_STATUS = Downloads.Impl.COLUMN_STATUS;		public final static String COLUMN_STATUS = Downloads.Impl.COLUMN_STATUS;

			/** {@hide} */
			public static final String COLUMN_FILE_NAME_HINT = Downloads.Impl.COLUMN_FILE_NAME_HINT;

	/**		/**
	* Provides more detail on the status of the download. Its meaning depends on the value of		* Provides more detail on the status of the download. Its meaning depends on the value of
	* {@link #COLUMN_STATUS}.		* {@link #COLUMN_STATUS}.
	@@ -173,6 +176,9 @@ public class DownloadManager {
	@TestApi		@TestApi
	public static final String COLUMN_MEDIASTORE_URI = Downloads.Impl.COLUMN_MEDIASTORE_URI;		public static final String COLUMN_MEDIASTORE_URI = Downloads.Impl.COLUMN_MEDIASTORE_URI;

			/** {@hide} */
			public static final String COLUMN_DESTINATION = Downloads.Impl.COLUMN_DESTINATION;

	/**		/**
	* @hide		* @hide
	*/		*/
	@@ -340,26 +346,22 @@ public class DownloadManager {
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static final String[] UNDERLYING_COLUMNS = new String[] {		public static final String[] UNDERLYING_COLUMNS = new String[] {
	Downloads.Impl._ID,		DownloadManager.COLUMN_ID,
	Downloads.Impl._DATA + " AS " + COLUMN_LOCAL_FILENAME,		DownloadManager.COLUMN_LOCAL_FILENAME,
	Downloads.Impl.COLUMN_MEDIAPROVIDER_URI,		DownloadManager.COLUMN_MEDIAPROVIDER_URI,
	Downloads.Impl.COLUMN_DESTINATION,		DownloadManager.COLUMN_DESTINATION,
	Downloads.Impl.COLUMN_TITLE,		DownloadManager.COLUMN_TITLE,
	Downloads.Impl.COLUMN_DESCRIPTION,		DownloadManager.COLUMN_DESCRIPTION,
	Downloads.Impl.COLUMN_URI,		DownloadManager.COLUMN_URI,
	Downloads.Impl.COLUMN_STATUS,		DownloadManager.COLUMN_STATUS,
	Downloads.Impl.COLUMN_FILE_NAME_HINT,		DownloadManager.COLUMN_FILE_NAME_HINT,
	Downloads.Impl.COLUMN_MIME_TYPE + " AS " + COLUMN_MEDIA_TYPE,		DownloadManager.COLUMN_MEDIA_TYPE,
	Downloads.Impl.COLUMN_TOTAL_BYTES + " AS " + COLUMN_TOTAL_SIZE_BYTES,		DownloadManager.COLUMN_TOTAL_SIZE_BYTES,
	Downloads.Impl.COLUMN_LAST_MODIFICATION + " AS " + COLUMN_LAST_MODIFIED_TIMESTAMP,		DownloadManager.COLUMN_LAST_MODIFIED_TIMESTAMP,
	Downloads.Impl.COLUMN_CURRENT_BYTES + " AS " + COLUMN_BYTES_DOWNLOADED_SO_FAR,		DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR,
	Downloads.Impl.COLUMN_ALLOW_WRITE,		DownloadManager.COLUMN_ALLOW_WRITE,
	/* add the following 'computed' columns to the cursor.		DownloadManager.COLUMN_LOCAL_URI,
	* they are not 'returned' by the database, but their inclusion		DownloadManager.COLUMN_REASON
	* eliminates need to have lot of methods in CursorTranslator
	*/
	"'placeholder' AS " + COLUMN_LOCAL_URI,
	"'placeholder' AS " + COLUMN_REASON
	};		};

	/**		/**

core/java/android/database/sqlite/SQLiteQueryBuilder.java

+327 −78

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/database/sqlite/SQLiteTokenizer.java

0 → 100644

+297 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+32 −24

File changed.

Preview size limit exceeded, changes collapsed.