Snap for 10213992 from 5e8725a1ac8a7e6d70bea05e179ad6a37e65d22d to udc-qpr1-release (53270541) · Commits · e / os / android_frameworks_base

core/java/android/app/ServiceStartArgs.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ public class ServiceStartArgs implements Parcelable {
		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(taskRemoved ? 1 : 0);
		out.writeInt(startId);
		out.writeInt(flags);
		out.writeInt(this.flags);
		if (args != null) {
		out.writeInt(1);
		args.writeToParcel(out, 0);

core/java/android/app/WallpaperInfo.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -292,12 +292,12 @@ public final class WallpaperInfo implements Parcelable {
		packageName = mService.serviceInfo.packageName;
		applicationInfo = mService.serviceInfo.applicationInfo;
		}
		String contextUriString = pm.getText(
		packageName, mContextUriResource, applicationInfo).toString();
		if (contextUriString == null) {
		CharSequence contextUriCharSequence = pm.getText(
		packageName, mContextUriResource, applicationInfo);
		if (contextUriCharSequence == null) {
		return null;
		}
		return Uri.parse(contextUriString);
		return Uri.parse(contextUriCharSequence.toString());
		}

		/**

core/java/android/content/pm/PackageInstaller.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -444,6 +444,10 @@ public class PackageInstaller {
		* exist, it may be missing native code for the ABIs supported by the
		* device, or it requires a newer SDK version, etc.
		*
		* Starting in {@link Build.VERSION_CODES#UPSIDE_DOWN_CAKE}, an app with only 32-bit native
		* code can still be installed on a device that supports both 64-bit and 32-bit ABIs.
		* However, a warning dialog will be displayed when the app is launched.
		*
		* @see #EXTRA_STATUS_MESSAGE
		*/
		public static final int STATUS_FAILURE_INCOMPATIBLE = 7;

core/java/android/hardware/input/InputSettings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -266,7 +266,7 @@ public class InputSettings {
		*/
		public static boolean useTouchpadTapToClick(@NonNull Context context) {
		return Settings.System.getIntForUser(context.getContentResolver(),
		Settings.System.TOUCHPAD_TAP_TO_CLICK, 0, UserHandle.USER_CURRENT) == 1;
		Settings.System.TOUCHPAD_TAP_TO_CLICK, 1, UserHandle.USER_CURRENT) == 1;
		}

		/**

core/java/android/view/MotionEvent.java

+22 −2

Original line number	Diff line number	Diff line
		@@ -1285,6 +1285,8 @@ public final class MotionEvent extends InputEvent implements Parcelable {
		* </ul>
		* These values are relative to the state from the last event, not accumulated, so developers
		* should make sure to process this axis value for all batched historical events.
		* <p>
		* This axis is only set on the first pointer in a motion event.
		*/
		public static final int AXIS_GESTURE_X_OFFSET = 48;

		@@ -1304,6 +1306,8 @@ public final class MotionEvent extends InputEvent implements Parcelable {
		* </ul>
		* These values are relative to the state from the last event, not accumulated, so developers
		* should make sure to process this axis value for all batched historical events.
		* <p>
		* This axis is only set on the first pointer in a motion event.
		*/
		public static final int AXIS_GESTURE_SCROLL_X_DISTANCE = 50;

		@@ -1324,14 +1328,29 @@ public final class MotionEvent extends InputEvent implements Parcelable {
		* </ul>
		* These values are relative to the state from the last event, not accumulated, so developers
		* should make sure to process this axis value for all batched historical events.
		* <p>
		* This axis is only set on the first pointer in a motion event.
		*/
		public static final int AXIS_GESTURE_PINCH_SCALE_FACTOR = 52;

		/**
		* Axis constant: the number of fingers being used in a multi-finger swipe gesture.
		* <p>
		* <ul>
		* <li>For a touch pad, reports the number of fingers being used in a multi-finger swipe gesture
		* (with CLASSIFICATION_MULTI_FINGER_SWIPE).
		* </ul>
		* <p>
		* Since CLASSIFICATION_MULTI_FINGER_SWIPE is a hidden API, so is this axis. It is only set on
		* the first pointer in a motion event.
		* @hide
		*/
		public static final int AXIS_GESTURE_SWIPE_FINGER_COUNT = 53;

		// NOTE: If you add a new axis here you must also add it to:
		// frameworks/native/include/android/input.h
		// frameworks/native/libs/input/InputEventLabels.cpp
		// platform/cts/tests/tests/view/src/android/view/cts/MotionEventTest.java
		// (testAxisFromToString)
		// cts/tests/tests/view/src/android/view/cts/MotionEventTest.java (testAxisFromToString)

		// Symbolic names of all axes.
		private static final SparseArray<String> AXIS_SYMBOLIC_NAMES = new SparseArray<String>();
		@@ -1387,6 +1406,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
		names.append(AXIS_GESTURE_SCROLL_X_DISTANCE, "AXIS_GESTURE_SCROLL_X_DISTANCE");
		names.append(AXIS_GESTURE_SCROLL_Y_DISTANCE, "AXIS_GESTURE_SCROLL_Y_DISTANCE");
		names.append(AXIS_GESTURE_PINCH_SCALE_FACTOR, "AXIS_GESTURE_PINCH_SCALE_FACTOR");
		names.append(AXIS_GESTURE_SWIPE_FINGER_COUNT, "AXIS_GESTURE_SWIPE_FINGER_COUNT");
		}

		/**