Snap for 9000567 from 8dfef1a9e57a765f0618be8b1c4c88f7f7b69f2b to tm-qpr1-release (a4c15a43) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -1906,7 +1906,6 @@ public class AppOpsManager {
		OP_USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER,
		OP_SCHEDULE_EXACT_ALARM,
		OP_MANAGE_MEDIA,
		OP_GET_USAGE_STATS,
		};

		/**

core/java/android/appwidget/AppWidgetHost.java

+88 −36

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ public class AppWidgetHost {
		private final Handler mHandler;
		private final int mHostId;
		private final Callbacks mCallbacks;
		private final SparseArray<AppWidgetHostView> mViews = new SparseArray<>();
		private final SparseArray<AppWidgetHostListener> mListeners = new SparseArray<>();
		private InteractionHandler mInteractionHandler;

		static class Callbacks extends IAppWidgetHost.Stub {
		@@ -171,6 +171,15 @@ public class AppWidgetHost {
		this(context, hostId, null, context.getMainLooper());
		}

		@Nullable
		private AppWidgetHostListener getListener(final int appWidgetId) {
		AppWidgetHostListener tempListener = null;
		synchronized (mListeners) {
		tempListener = mListeners.get(appWidgetId);
		}
		return tempListener;
		}

		/**
		* @hide
		*/
		@@ -210,11 +219,11 @@ public class AppWidgetHost {
		return;
		}
		final int[] idsToUpdate;
		synchronized (mViews) {
		int N = mViews.size();
		idsToUpdate = new int[N];
		for (int i = 0; i < N; i++) {
		idsToUpdate[i] = mViews.keyAt(i);
		synchronized (mListeners) {
		int n = mListeners.size();
		idsToUpdate = new int[n];
		for (int i = 0; i < n; i++) {
		idsToUpdate[i] = mListeners.keyAt(i);
		}
		}
		List<PendingHostUpdate> updates;
		@@ -349,16 +358,13 @@ public class AppWidgetHost {
		if (sService == null) {
		return;
		}
		synchronized (mViews) {
		mViews.remove(appWidgetId);
		removeListener(appWidgetId);
		try {
		sService.deleteAppWidgetId(mContextOpPackageName, appWidgetId);
		}
		catch (RemoteException e) {
		} catch (RemoteException e) {
		throw new RuntimeException("system server dead?", e);
		}
		}
		}

		/**
		* Remove all records about this host from the AppWidget manager.
		@@ -412,9 +418,7 @@ public class AppWidgetHost {
		AppWidgetHostView view = onCreateView(context, appWidgetId, appWidget);
		view.setInteractionHandler(mInteractionHandler);
		view.setAppWidget(appWidgetId, appWidget);
		synchronized (mViews) {
		mViews.put(appWidgetId, view);
		}
		addListener(appWidgetId, view);
		RemoteViews views;
		try {
		views = sService.getAppWidgetViews(mContextOpPackageName, appWidgetId);
		@@ -439,24 +443,52 @@ public class AppWidgetHost {
		* Called when the AppWidget provider for a AppWidget has been upgraded to a new apk.
		*/
		protected void onProviderChanged(int appWidgetId, AppWidgetProviderInfo appWidget) {
		AppWidgetHostView v;
		AppWidgetHostListener v = getListener(appWidgetId);

		// Convert complex to dp -- we are getting the AppWidgetProviderInfo from the
		// AppWidgetService, which doesn't have our context, hence we need to do the
		// conversion here.
		appWidget.updateDimensions(mDisplayMetrics);
		synchronized (mViews) {
		v = mViews.get(appWidgetId);
		}
		if (v != null) {
		v.resetAppWidget(appWidget);
		v.onUpdateProviderInfo(appWidget);
		}
		}

		void dispatchOnAppWidgetRemoved(int appWidgetId) {
		synchronized (mViews) {
		mViews.remove(appWidgetId);
		/**
		* This interface specifies the actions to be performed on the app widget based on the calls
		* from the service
		*
		* @hide
		*/
		public interface AppWidgetHostListener {

		/**
		* This function is called when the service want to reset the app widget provider info
		* @param appWidget The new app widget provider info
		*
		* @hide
		*/
		void onUpdateProviderInfo(@Nullable AppWidgetProviderInfo appWidget);

		/**
		* This function is called when the RemoteViews of the app widget is updated
		* @param views The new RemoteViews to be set for the app widget
		*
		* @hide
		*/
		void updateAppWidget(@Nullable RemoteViews views);

		/**
		* This function is called when the view ID is changed for the app widget
		* @param viewId The new view ID to be be set for the widget
		*
		* @hide
		*/
		void onViewDataChanged(int viewId);
		}

		void dispatchOnAppWidgetRemoved(int appWidgetId) {
		removeListener(appWidgetId);
		onAppWidgetRemoved(appWidgetId);
		}

		@@ -476,23 +508,43 @@ public class AppWidgetHost {
		// Does nothing
		}

		void updateAppWidgetView(int appWidgetId, RemoteViews views) {
		AppWidgetHostView v;
		synchronized (mViews) {
		v = mViews.get(appWidgetId);
		/**
		* Create an AppWidgetHostListener for the given widget.
		* The AppWidgetHost retains a pointer to the newly-created listener.
		* @param appWidgetId The ID of the app widget for which to add the listener
		* @param listener The listener interface that deals with actions towards the widget view
		*
		* @hide
		*/
		public void addListener(int appWidgetId, @NonNull AppWidgetHostListener listener) {
		synchronized (mListeners) {
		mListeners.put(appWidgetId, listener);
		}
		}

		/**
		* Delete the listener for the given widget
		* @param appWidgetId The ID of the app widget for which the listener is to be deleted

		* @hide
		*/
		public void removeListener(int appWidgetId) {
		synchronized (mListeners) {
		mListeners.remove(appWidgetId);
		}
		}

		void updateAppWidgetView(int appWidgetId, RemoteViews views) {
		AppWidgetHostListener v = getListener(appWidgetId);
		if (v != null) {
		v.updateAppWidget(views);
		}
		}

		void viewDataChanged(int appWidgetId, int viewId) {
		AppWidgetHostView v;
		synchronized (mViews) {
		v = mViews.get(appWidgetId);
		}
		AppWidgetHostListener v = getListener(appWidgetId);
		if (v != null) {
		v.viewDataChanged(viewId);
		v.onViewDataChanged(viewId);
		}
		}

		@@ -500,8 +552,8 @@ public class AppWidgetHost {
		* Clear the list of Views that have been created by this AppWidgetHost.
		*/
		protected void clearViews() {
		synchronized (mViews) {
		mViews.clear();
		synchronized (mListeners) {
		mListeners.clear();
		}
		}
		}

core/java/android/appwidget/AppWidgetHostView.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ import java.util.concurrent.Executor;
		* between updates, and will try recycling old views for each incoming
		* {@link RemoteViews}.
		*/
		public class AppWidgetHostView extends FrameLayout {
		public class AppWidgetHostView extends FrameLayout implements AppWidgetHost.AppWidgetHostListener {

		static final String TAG = "AppWidgetHostView";
		private static final String KEY_JAILED_ARRAY = "jail";
		@@ -492,8 +492,11 @@ public class AppWidgetHostView extends FrameLayout {
		/**
		* Update the AppWidgetProviderInfo for this view, and reset it to the
		* initial layout.
		*
		* @hide
		*/
		void resetAppWidget(AppWidgetProviderInfo info) {
		@Override
		public void onUpdateProviderInfo(@Nullable AppWidgetProviderInfo info) {
		setAppWidget(mAppWidgetId, info);
		mViewMode = VIEW_MODE_NOINIT;
		updateAppWidget(null);
		@@ -503,6 +506,7 @@ public class AppWidgetHostView extends FrameLayout {
		* Process a set of {@link RemoteViews} coming in as an update from the
		* AppWidget provider. Will animate into these new views as needed
		*/
		@Override
		public void updateAppWidget(RemoteViews remoteViews) {
		mLastInflatedRemoteViews = remoteViews;
		applyRemoteViews(remoteViews, true);
		@@ -693,8 +697,11 @@ public class AppWidgetHostView extends FrameLayout {
		/**
		* Process data-changed notifications for the specified view in the specified
		* set of {@link RemoteViews} views.
		*
		* @hide
		*/
		void viewDataChanged(int viewId) {
		@Override
		public void onViewDataChanged(int viewId) {
		View v = findViewById(viewId);
		if ((v != null) && (v instanceof AdapterView<?>)) {
		AdapterView<?> adapterView = (AdapterView<?>) v;

core/java/android/view/ViewRootImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ public final class ViewRootImpl implements ViewParent,
		* @hide
		*/
		public static final boolean LOCAL_LAYOUT =
		SystemProperties.getBoolean("persist.debug.local_layout", false);
		SystemProperties.getBoolean("persist.debug.local_layout", true);

		/**
		* Set this system property to true to force the view hierarchy to render

core/java/android/widget/TextView.java

+38 −25

Original line number	Diff line number	Diff line
		@@ -4877,20 +4877,28 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		/**
		* Set the line break style for text wrapping.
		* Sets the line-break style for text wrapping.
		*
		* The line break style to indicates the line break strategies can be used when
		* calculating the text wrapping. The line break style affects rule-based breaking. It
		* specifies the strictness of line-breaking rules.
		* There are several types for the line break style:
		* {@link LineBreakConfig#LINE_BREAK_STYLE_LOOSE},
		* {@link LineBreakConfig#LINE_BREAK_STYLE_NORMAL} and
		* {@link LineBreakConfig#LINE_BREAK_STYLE_STRICT}. The default values of the line break style
		* is {@link LineBreakConfig#LINE_BREAK_STYLE_NONE}, indicating no breaking rule is specified.
		* See <a href="https://www.w3.org/TR/css-text-3/#line-break-property">
		* the line-break property</a>
		* <p>Line-break style specifies the line-break strategies that can be used
		* for text wrapping. The line-break style affects rule-based line breaking
		* by specifying the strictness of line-breaking rules.
		*
		* @param lineBreakStyle the line break style for the text.
		* <p>The following are types of line-break styles:
		* <ul>
		* <li>{@link LineBreakConfig#LINE_BREAK_STYLE_LOOSE}
		* <li>{@link LineBreakConfig#LINE_BREAK_STYLE_NORMAL}
		* <li>{@link LineBreakConfig#LINE_BREAK_STYLE_STRICT}
		* </ul>
		*
		* <p>The default line-break style is
		* {@link LineBreakConfig#LINE_BREAK_STYLE_NONE}, which specifies that no
		* line-breaking rules are used.
		*
		* <p>See the
		* <a href="https://www.w3.org/TR/css-text-3/#line-break-property" class="external">
		* line-break property</a> for more information.
		*
		* @param lineBreakStyle The line-break style for the text.
		*/
		public void setLineBreakStyle(@LineBreakConfig.LineBreakStyle int lineBreakStyle) {
		if (mLineBreakStyle != lineBreakStyle) {
		@@ -4904,17 +4912,22 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		/**
		* Set the line break word style for text wrapping.
		* Sets the line-break word style for text wrapping.
		*
		* <p>The line-break word style affects dictionary-based line breaking by
		* providing phrase-based line-breaking opportunities. Use
		* {@link LineBreakConfig#LINE_BREAK_WORD_STYLE_PHRASE} to specify
		* phrase-based line breaking.
		*
		* <p>The default line-break word style is
		* {@link LineBreakConfig#LINE_BREAK_WORD_STYLE_NONE}, which specifies that
		* no line-breaking word style is used.
		*
		* The line break word style affects dictionary-based breaking and provide phrase-based
		* breaking opportunities. The type for the line break word style is
		* {@link LineBreakConfig#LINE_BREAK_WORD_STYLE_PHRASE}. The default values of the line break
		* word style is {@link LineBreakConfig#LINE_BREAK_WORD_STYLE_NONE}, indicating no breaking rule
		* is specified.
		* See <a href="https://www.w3.org/TR/css-text-3/#word-break-property">
		* the word-break property</a>
		* <p>See the
		* <a href="https://www.w3.org/TR/css-text-3/#word-break-property" class="external">
		* word-break property</a> for more information.
		*
		* @param lineBreakWordStyle the line break word style for the tet
		* @param lineBreakWordStyle The line-break word style for the text.
		*/
		public void setLineBreakWordStyle(@LineBreakConfig.LineBreakWordStyle int lineBreakWordStyle) {
		if (mLineBreakWordStyle != lineBreakWordStyle) {
		@@ -4928,18 +4941,18 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		/**
		* Get the current line break style for text wrapping.
		* Gets the current line-break style for text wrapping.
		*
		* @return the current line break style to be used for text wrapping.
		* @return The line-break style to be used for text wrapping.
		*/
		public @LineBreakConfig.LineBreakStyle int getLineBreakStyle() {
		return mLineBreakStyle;
		}

		/**
		* Get the current line word break style for text wrapping.
		* Gets the current line-break word style for text wrapping.
		*
		* @return the current line break word style to be used for text wrapping.
		* @return The line-break word style to be used for text wrapping.
		*/
		public @LineBreakConfig.LineBreakWordStyle int getLineBreakWordStyle() {
		return mLineBreakWordStyle;