Snap for 5691606 from 386f09235d650ae586ee3c5b681b98fc5c2a4ce9 to qt-release (b10b3bc9) · Commits · e / os / android_frameworks_base

core/java/android/text/Layout.java

+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;
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,11 @@ public final class SystemUiDeviceConfigFlags {
		public static final String ASSIST_HANDLES_SUPPRESS_ON_APPS =
		"assist_handles_suppress_on_apps";

		/**
		* (bool) Whether to show handles when taught.
		*/
		public static final String ASSIST_HANDLES_SHOW_WHEN_TAUGHT = "assist_handles_show_when_taught";

		/**
		* (bool) Whether to use the new BrightLineFalsingManager.
		*/

+2 −2

Original line number	Diff line number	Diff line
		@@ -458,7 +458,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
		}

		private String getFuncTypeAsString() {
		if (isRecycled()) throw new IllegalStateException();
		if (isRecycled()) return "<recycled>";
		if (isConstSupplier()) return "supplier";
		String name = LambdaType.toString(getFlags(MASK_EXPOSED_AS));
		if (name.endsWith("Consumer")) return "consumer";
		@@ -466,7 +466,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
		if (name.endsWith("Predicate")) return "predicate";
		if (name.endsWith("Supplier")) return "supplier";
		if (name.endsWith("Runnable")) return "runnable";
		throw new IllegalStateException("Don't know the string representation of " + name);
		return name;
		}

		/**

+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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -2544,7 +2544,7 @@
		<!-- @SystemApi @TestApi @hide Allows an application to modify config settings.
		<p>Not for use by third-party applications. -->
		<permission android:name="android.permission.WRITE_DEVICE_CONFIG"
		android:protectionLevel="signature\|configurator"/>
		android:protectionLevel="signature\|verifier\|configurator"/>

		<!-- @SystemApi @hide Allows an application to read config settings.
		<p>Not for use by third-party applications. -->