Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie (9730c71e) · Commits · e / os / android_frameworks_base

core/java/android/text/Layout.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -1099,6 +1099,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);
		}
		@@ -1194,8 +1197,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
		@@ -1230,7 +1233,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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ public class HidProfile implements LocalBluetoothProfile {

		public boolean isPreferred(BluetoothDevice device) {
		if (mService == null) return false;
		return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
		return mService.getPriority(device) != BluetoothProfile.PRIORITY_OFF;
		}

		public int getPreferred(BluetoothDevice device) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -390,7 +390,7 @@ public class SliceManagerService extends ISliceManager.Stub {
		}

		protected int checkAccess(String pkg, Uri uri, int uid, int pid) {
		return checkSlicePermission(uri, pkg, uid, pid, null);
		return checkSlicePermission(uri, pkg, pid, uid, null);
		}

		private String getProviderPkg(Uri uri, int user) {