Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat (2ff7c9f9) · Commits · e / os / android_frameworks_base

core/java/android/os/Binder.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -574,6 +574,8 @@ public class Binder implements IBinder {
		Log.w(TAG, "Caught a RuntimeException from the binder stub implementation.", e);
		}
		} else {
		// Clear the parcel before writing the exception
		reply.setDataSize(0);
		reply.setDataPosition(0);
		reply.writeException(e);
		}

+6 −3

Original line number	Diff line number	Diff line
		@@ -919,6 +919,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);
		}
		@@ -1014,8 +1017,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
		@@ -1050,7 +1053,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
		@@ -121,7 +121,7 @@ public final 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) {