Snap for 5691478 from 8668e91463bed0335140dae34634ee6ca559753d to qt-qpr1-release (cb8988b5) · Commits · e / os / android_frameworks_base

core/java/android/app/ITaskStackListener.aidl

+8 −0

Original line number	Diff line number	Diff line
		@@ -177,4 +177,12 @@ oneway interface ITaskStackListener {
		* @param displayId the id of the display on which contents are drawn.
		*/
		void onSingleTaskDisplayDrawn(int displayId);

		/**
		* Called when a task is reparented to a stack on a different display.
		*
		* @param taskId id of the task which was moved to a different display.
		* @param newDisplayId id of the new display.
		*/
		void onTaskDisplayChanged(int taskId, int newDisplayId);
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.os.RemoteException;
		/**
		* Classes interested in observing only a subset of changes using ITaskStackListener can extend
		* this class to avoid having to implement all the methods.
		*
		* @hide
		*/
		public abstract class TaskStackListener extends ITaskStackListener.Stub {
		@@ -177,4 +178,8 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub {
		@Override
		public void onSingleTaskDisplayDrawn(int displayId) throws RemoteException {
		}

		@Override
		public void onTaskDisplayChanged(int taskId, int newDisplayId) throws RemoteException {
		}
		}

+6 −3

Original line number	Diff line number	Diff line
		@@ -1122,6 +1122,9 @@ public abstract class Layout {
		if (limit > lineEnd) {
		limit = lineEnd;
		}
		if (limit == start) {
		continue;
		}
		level[limit - lineStart - 1] =
		(byte) ((runs[i + 1] >>> RUN_LEVEL_SHIFT) & RUN_LEVEL_MASK);
		}
		@@ -1220,8 +1223,8 @@ public abstract class Layout {
		}

		/**
		* Computes in linear time the results of calling
		* #getHorizontal for all offsets on a line.
		* Computes in linear time the results of calling #getHorizontal for all offsets on a line.
		*
		* @param line The line giving the offsets we compute information for
		* @param clamped Whether to clamp the results to the width of the layout
		* @param primary Whether the results should be the primary or the secondary horizontal
		@@ -1257,7 +1260,7 @@ public abstract class Layout {
		TextLine.recycle(tl);

		if (clamped) {
		for (int offset = 0; offset <= wid.length; ++offset) {
		for (int offset = 0; offset < wid.length; ++offset) {
		if (wid[offset] > mWidth) {
		wid[offset] = mWidth;
		}

+0 −7

Original line number	Diff line number	Diff line
		@@ -106,13 +106,6 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String HASH_SALT_MAX_DAYS = "hash_salt_max_days";

		// Flag related to Privacy Indicators

		/**
		* Whether the Permissions Hub is showing.
		*/
		public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled";

		// Flags related to Assistant

		/**

+2 −0

Original line number	Diff line number	Diff line
		@@ -1160,6 +1160,7 @@ static jlong CalculateCapabilities(JNIEnv* env, jint uid, jint gid, jintArray gi
		/*
		* Grant the following capabilities to the Bluetooth user:
		* - CAP_WAKE_ALARM
		* - CAP_NET_ADMIN
		* - CAP_NET_RAW
		* - CAP_NET_BIND_SERVICE (for DHCP client functionality)
		* - CAP_SYS_NICE (for setting RT priority for audio-related threads)
		@@ -1167,6 +1168,7 @@ static jlong CalculateCapabilities(JNIEnv* env, jint uid, jint gid, jintArray gi

		if (multiuser_get_app_id(uid) == AID_BLUETOOTH) {
		capabilities \|= (1LL << CAP_WAKE_ALARM);
		capabilities \|= (1LL << CAP_NET_ADMIN);
		capabilities \|= (1LL << CAP_NET_RAW);
		capabilities \|= (1LL << CAP_NET_BIND_SERVICE);
		capabilities \|= (1LL << CAP_SYS_NICE);