Snap for 9752887 from 64fd05ae53851a66714355e209c1404964ebaecf to tm-qpr3-release (adeb1840) · Commits · e / os / android_frameworks_base

core/java/android/appwidget/AppWidgetHostView.java

+29 −10

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.content.pm.LauncherActivityInfo;
		import android.content.pm.LauncherApps;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.res.Resources;
		import android.graphics.Canvas;
		import android.graphics.Color;
		import android.graphics.PointF;
		import android.graphics.Rect;
		@@ -311,6 +312,14 @@ public class AppWidgetHostView extends FrameLayout implements AppWidgetHost.AppW
		super.onLayout(changed, left, top, right, bottom);
		} catch (final RuntimeException e) {
		Log.e(TAG, "Remote provider threw runtime exception, using error view instead.", e);
		handleViewError();
		}
		}

		/**
		* Remove bad view and replace with error message view
		*/
		private void handleViewError() {
		removeViewInLayout(mView);
		View child = getErrorView();
		prepareView(child);
		@@ -322,7 +331,6 @@ public class AppWidgetHostView extends FrameLayout implements AppWidgetHost.AppW
		mView = child;
		mViewMode = VIEW_MODE_ERROR;
		}
		}

		/**
		* Provide guidance about the size of this widget to the AppWidgetManager. The widths and
		@@ -953,4 +961,15 @@ public class AppWidgetHostView extends FrameLayout implements AppWidgetHost.AppW
		reapplyLastRemoteViews();
		}
		}

		@Override
		protected void dispatchDraw(@NonNull Canvas canvas) {
		try {
		super.dispatchDraw(canvas);
		} catch (Exception e) {
		// Catch draw exceptions that may be caused by RemoteViews
		Log.e(TAG, "Drawing view failed: " + e);
		post(this::handleViewError);
		}
		}
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -9209,6 +9209,14 @@ public final class Settings {
		public static final String SCREENSAVER_COMPLICATIONS_ENABLED =
		"screensaver_complications_enabled";

		/**
		* Whether home controls are enabled to be shown over the screensaver by the user.
		*
		* @hide
		*/
		public static final String SCREENSAVER_HOME_CONTROLS_ENABLED =
		"screensaver_home_controls_enabled";


		/**
		* Default, indicates that the user has not yet started the dock setup flow.

+5 −0

Original line number	Diff line number	Diff line
		@@ -1362,6 +1362,11 @@ public class DreamService extends Service implements Window.Callback {
		if (!ActivityTaskManager.getService().startDreamActivity(i)) {
		detach();
		}
		} catch (SecurityException e) {
		Log.w(mTag,
		"Received SecurityException trying to start DreamActivity. "
		+ "Aborting dream start.");
		detach();
		} catch (RemoteException e) {
		Log.w(mTag, "Could not connect to activity task manager to start dream activity");
		e.rethrowFromSystemServer();

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		android:paddingTop="16dp"
		android:layout_below="@id/icon"
		android:layout_centerHorizontal="true"
		android:fontFamily="@string/config_headlineFontFamily"
		android:textSize="24sp"
		android:lineHeight="32sp"
		android:gravity="center"

+4 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,10 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,

		@GuardedBy("mLock")
		private int getCurrentStatus() {
		if (mRearDisplayState == INVALID_DEVICE_STATE) {
		return WindowAreaComponent.STATUS_UNSUPPORTED;
		}

		if (mRearDisplaySessionStatus == WindowAreaComponent.SESSION_STATE_ACTIVE
		\|\| isRearDisplayActive()) {
		return WindowAreaComponent.STATUS_UNAVAILABLE;