Snap for 6492189 from c6712d444932bcfefc3ae46c2384fdf80ee53f8e to mainline-release (14207832) · Commits · e / os / android_frameworks_base

core/java/android/os/incremental/IncrementalFileStorages.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -92,10 +92,7 @@ public final class IncrementalFileStorages {
		}
		}

		if (!result.mDefaultStorage.startLoading()) {
		// TODO(b/146080380): add incremental-specific error code
		throw new IOException("Failed to start loading data for Incremental installation.");
		}
		result.startLoading();

		return result;
		}
		@@ -143,6 +140,15 @@ public final class IncrementalFileStorages {
		}
		}

		/**
		* Starts or re-starts loading of data.
		*/
		public void startLoading() throws IOException {
		if (!mDefaultStorage.startLoading()) {
		throw new IOException("Failed to start loading data for Incremental installation.");
		}
		}

		/**
		* Resets the states and unbinds storage instances for an installation session.
		* TODO(b/136132412): make sure unnecessary binds are removed but useful storages are kept

core/java/android/webkit/WebChromeClient.java

+20 −5

Original line number	Diff line number	Diff line
		@@ -189,14 +189,29 @@ public class WebChromeClient {
		public void onCloseWindow(WebView window) {}

		/**
		* Tell the client to display a javascript alert dialog. If the client
		* returns {@code true}, WebView will assume that the client will handle the
		* dialog. If the client returns {@code false}, it will continue execution.
		* Notify the host application that the web page wants to display a
		* JavaScript {@code alert()} dialog.
		* <p>The default behavior if this method returns {@code false} or is not
		* overridden is to show a dialog containing the alert message and suspend
		* JavaScript execution until the dialog is dismissed.
		* <p>To show a custom dialog, the app should return {@code true} from this
		* method, in which case the default dialog will not be shown and JavaScript
		* execution will be suspended. The app should call
		* {@code JsResult.confirm()} when the custom dialog is dismissed such that
		* JavaScript execution can be resumed.
		* <p>To suppress the dialog and allow JavaScript execution to
		* continue, call {@code JsResult.confirm()} immediately and then return
		* {@code true}.
		* <p>Note that if the {@link WebChromeClient} is {@code null}, the default
		* dialog will be suppressed and Javascript execution will continue
		* immediately.
		*
		* @param view The WebView that initiated the callback.
		* @param url The url of the page requesting the dialog.
		* @param message Message to be displayed in the window.
		* @param result A JsResult to confirm that the user hit enter.
		* @return boolean Whether the client will handle the alert dialog.
		* @param result A JsResult to confirm that the user closed the window.
		* @return boolean {@code true} if the request is handled or ignored.
		* {@code false} if WebView needs to show the default dialog.
		*/
		public boolean onJsAlert(WebView view, String url, String message,
		JsResult result) {

core/java/com/android/internal/app/ResolverActivity.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -358,6 +358,7 @@ public class ResolverActivity extends Activity implements
		: isHttpSchemeAndViewAction(getTargetIntent());

		mSupportsAlwaysUseOption = supportsAlwaysUseOption;
		mWorkProfileUserHandle = fetchWorkProfileUserProfile();

		// The last argument of createResolverListAdapter is whether to do special handling
		// of the last used choice to highlight it in the list. We need to always
		@@ -366,7 +367,6 @@ public class ResolverActivity extends Activity implements
		// to handle. We also turn it off when the work tab is shown to simplify the UX.
		boolean filterLastUsed = mSupportsAlwaysUseOption && !isVoiceInteraction()
		&& !shouldShowTabs();
		mWorkProfileUserHandle = fetchWorkProfileUserProfile();
		mMultiProfilePagerAdapter = createMultiProfilePagerAdapter(initialIntents, rList, filterLastUsed);
		if (configureContentView()) {
		return;
		@@ -1612,6 +1612,7 @@ public class ResolverActivity extends Activity implements
		}

		private void setupProfileTabs() {
		maybeHideDivider();
		TabHost tabHost = findViewById(R.id.profile_tabhost);
		tabHost.setup();
		ViewPager viewPager = findViewById(R.id.profile_pager);
		@@ -1660,6 +1661,17 @@ public class ResolverActivity extends Activity implements
		findViewById(R.id.resolver_tab_divider).setVisibility(View.VISIBLE);
		}

		private void maybeHideDivider() {
		if (!isIntentPicker()) {
		return;
		}
		final View divider = findViewById(R.id.divider);
		if (divider == null) {
		return;
		}
		divider.setVisibility(View.GONE);
		}

		/**
		* Callback called when user changes the profile tab.
		* <p>This method is intended to be overridden by subclasses.

core/java/com/android/internal/util/ScreenshotHelper.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -132,6 +132,7 @@ public class ScreenshotHelper {
		}
		};
		}

		private static final String TAG = "ScreenshotHelper";

		// Time until we give up on the screenshot & show an error instead.
		@@ -146,8 +147,6 @@ public class ScreenshotHelper {
		mContext = context;
		}



		/**
		* Request a screenshot be taken.
		*
		@@ -284,8 +283,8 @@ public class ScreenshotHelper {
		break;
		case SCREENSHOT_MSG_PROCESS_COMPLETE:
		synchronized (mScreenshotLock) {
		if (mScreenshotConnection == myConn) {
		mContext.unbindService(mScreenshotConnection);
		if (myConn != null && mScreenshotConnection == myConn) {
		mContext.unbindService(myConn);
		mScreenshotConnection = null;
		mScreenshotService = null;
		}

core/res/res/values/strings.xml

+12 −6

Original line number	Diff line number	Diff line
		@@ -3595,31 +3595,37 @@

		<!-- Notification body when new external media is detected [CHAR LIMIT=30] -->
		<string name="ext_media_new_notification_title">New <xliff:g id="name" example="SD card">%s</xliff:g></string>
		<!-- Automotive specific notification body when new external media is detected [CHAR LIMIT=30] -->
		<string name="ext_media_new_notification_title" product="automotive"><xliff:g id="name" example="SD card">%s</xliff:g> isn\u2019t working</string>
		<!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
		<string name="ext_media_new_notification_message">Tap to set up</string>
		<!-- Automotive specific notification body when new external media is detected. Empty because there is no fix action (b/151671685) [CHAR LIMIT=NONE] -->
		<string name="ext_media_new_notification_message" product="automotive"></string>
		<!-- Automotive specific notification body when new external media is detected. [CHAR LIMIT=NONE] -->
		<string name="ext_media_new_notification_message" product="automotive">You may need to reformat the device. Tap to eject.</string>

		<!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
		<string name="ext_media_ready_notification_message">For transferring photos and media</string>

		<!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
		<string name="ext_media_unmountable_notification_title">Issue with <xliff:g id="name" example="SD card">%s</xliff:g></string>
		<!-- Automotive specific notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
		<string name="ext_media_unmountable_notification_title" product="automotive"><xliff:g id="name" example="SD card">%s</xliff:g> isn\u2019t working</string>
		<!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
		<string name="ext_media_unmountable_notification_message">Tap to fix</string>
		<!-- TV-specific notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
		<string name="ext_media_unmountable_notification_message" product="tv"><xliff:g id="name" example="SD card">%s</xliff:g> is corrupt. Select to fix.</string>
		<!-- Automotive specific notification body when external media is unmountable (corrupt). Empty because there is no fix action (b/151671685) [CHAR LIMIT=NONE] -->
		<string name="ext_media_unmountable_notification_message" product="automotive"></string>
		<!-- Automotive specific notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
		<string name="ext_media_unmountable_notification_message" product="automotive">You may need to reformat the device. Tap to eject.</string>

		<!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
		<string name="ext_media_unsupported_notification_title">Unsupported <xliff:g id="name" example="SD card">%s</xliff:g></string>
		<!-- Automotive specific notification title when external media is unsupported [CHAR LIMIT=30] -->
		<string name="ext_media_unsupported_notification_title" product="automotive"><xliff:g id="name" example="SD card">%s</xliff:g> isn\u2019t working</string>
		<!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
		<string name="ext_media_unsupported_notification_message">This device doesn\u2019t support this <xliff:g id="name" example="SD card">%s</xliff:g>. Tap to set up in a supported format.</string>
		<!-- TV-specific notification body when external media is unsupported [CHAR LIMIT=NONE] -->
		<string name="ext_media_unsupported_notification_message" product="tv">This device doesn\u2019t support this <xliff:g id="name" example="SD card">%s</xliff:g>. Select to set up in a supported format.</string>
		<!-- Automotive specific notification body when external media is unsupported. No action is specified to fix (b/151671685) [CHAR LIMIT=NONE] -->
		<string name="ext_media_unsupported_notification_message" product="automotive">This device doesn\u2019t support this <xliff:g id="name" example="SD card">%s</xliff:g>.</string>
		<!-- Automotive specific notification body when external media is unsupported [CHAR LIMIT=NONE] -->
		<string name="ext_media_unsupported_notification_message" product="automotive">You may need to reformat the device</string>

		<!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
		<string name="ext_media_badremoval_notification_title"><xliff:g id="name" example="SD card">%s</xliff:g> unexpectedly removed</string>