Snap for 5807722 from 1ac726e71857a01edbfcc3be2349c56fa44b5187 to qt-c2f2-release (5b372bf8) · Commits · e / os / android_frameworks_base

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -1756,6 +1756,7 @@ droidstubs {
		last_released: {
		api_file: ":last-released-public-api",
		removed_api_file: "api/removed.txt",
		baseline_file: ":public-api-incompatibilities-with-last-released",
		},
		},
		jdiff_enabled: true,
		@@ -1781,6 +1782,7 @@ droidstubs {
		last_released: {
		api_file: ":last-released-system-api",
		removed_api_file: "api/system-removed.txt",
		baseline_file: ":system-api-incompatibilities-with-last-released"
		},
		},
		jdiff_enabled: true,

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,8 +39,8 @@ class ZigZagClassifier extends FalsingClassifier {
		// most swipes will follow somewhat of a 'C' or 'S' shape, we allow more deviance along the
		// `SECONDARY` axis.
		private static final float MAX_X_PRIMARY_DEVIANCE = .05f;
		private static final float MAX_Y_PRIMARY_DEVIANCE = .05f;
		private static final float MAX_X_SECONDARY_DEVIANCE = .3f;
		private static final float MAX_Y_PRIMARY_DEVIANCE = .1f;
		private static final float MAX_X_SECONDARY_DEVIANCE = .6f;
		private static final float MAX_Y_SECONDARY_DEVIANCE = .3f;

		private final float mMaxXPrimaryDeviance;

+2 −2

Original line number	Diff line number	Diff line
		@@ -133,8 +133,8 @@ public class ZigZagClassifierTest extends ClassifierTest {
		// This test looks just like testPass_horizontalZigZagVerticalStraight but with
		// a shorter y range, making it look more crooked.
		appendMoveEvent(0, 0);
		appendMoveEvent(5, 10);
		appendMoveEvent(-5, 20);
		appendMoveEvent(6, 10);
		appendMoveEvent(-6, 20);
		assertThat(mClassifier.isFalseTouch(), is(true));
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -21,13 +21,11 @@ package android.net.dhcp;
		* @hide
		*/
		public abstract class DhcpServerCallbacks extends IDhcpServerCallbacks.Stub {
		// TODO: add @Override here once the API is versioned

		/**
		* Get the version of the aidl interface implemented by the callbacks.
		*/
		@Override
		public int getInterfaceVersion() {
		// TODO: return IDhcpServerCallbacks.VERSION;
		return 0;
		return IDhcpServerCallbacks.VERSION;
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ public class DataServiceCallback {

		private static final String TAG = DataServiceCallback.class.getSimpleName();

		private static final boolean DBG = true;

		/**
		* Result of data requests
		* @hide
		@@ -81,6 +83,7 @@ public class DataServiceCallback {
		IDataServiceCallback callback = mCallback.get();
		if (callback != null) {
		try {
		if (DBG) Rlog.d(TAG, "onSetupDataCallComplete");
		callback.onSetupDataCallComplete(result, response);
		} catch (RemoteException e) {
		Rlog.e(TAG, "Failed to onSetupDataCallComplete on the remote");
		@@ -98,6 +101,7 @@ public class DataServiceCallback {
		IDataServiceCallback callback = mCallback.get();
		if (callback != null) {
		try {
		if (DBG) Rlog.d(TAG, "onDeactivateDataCallComplete");
		callback.onDeactivateDataCallComplete(result);
		} catch (RemoteException e) {
		Rlog.e(TAG, "Failed to onDeactivateDataCallComplete on the remote");
		@@ -169,6 +173,7 @@ public class DataServiceCallback {
		IDataServiceCallback callback = mCallback.get();
		if (callback != null) {
		try {
		if (DBG) Rlog.d(TAG, "onDataCallListChanged");
		callback.onDataCallListChanged(dataCallList);
		} catch (RemoteException e) {
		Rlog.e(TAG, "Failed to onDataCallListChanged on the remote");