Snap for 5317763 from 5372e83cac5c56b618494640a2a37f0df63e040f to qt-release (40f76ebe) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+32 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,7 @@ message Atom {
		AssistGestureStageReported assist_gesture_stage_reported = 174;
		AssistGestureFeedbackReported assist_gesture_feedback_reported = 175;
		AssistGestureProgressReported assist_gesture_progress_reported = 176;
		TouchGestureClassified touch_gesture_classified = 177;
		}

		// Pulled events will start at field 10000.
		@@ -2408,6 +2409,37 @@ message TouchEventReported {
		optional float latency_stdev_micros = 4;
		}

		/**
		* Logs gesture classification and timing information for touch events.
		*
		* Logged from:
		* frameworks/base/core/java/android/view/GestureDetector.java
		* frameworks/base/core/java/android/view/View.java
		*/
		message TouchGestureClassified {
		// The source of the classification (e.g. Java class name).
		optional string source = 1;

		enum Classification {
		UNKNOWN_CLASSIFICATION = 0;
		SINGLE_TAP = 1;
		DOUBLE_TAP = 2;
		LONG_PRESS = 3;
		DEEP_PRESS = 4;
		SCROLL = 5;
		}
		// The classification of the gesture.
		optional Classification classification = 2;

		// The interval from the start of a touch event stream until the
		// classification was made.
		optional int32 latency_millis = 3;

		// The distance from the location of the first touch event to the
		// location of the touch event when the classification was made.
		optional float displacement_px = 4;
		}

		/**
		* Logs that a setting was updated.
		* Logged from:

data/etc/privapp-permissions-platform.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ applications that come with the platform
		<permission name="android.permission.USE_RESERVED_DISK"/>
		</privapp-permissions>

		<privapp-permissions package="com.android.mainline.networkstack">
		<privapp-permissions package="com.android.networkstack">
		<permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>
		<permission name="android.permission.CONNECTIVITY_INTERNAL"/>
		<permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>

packages/NetworkStack/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		*/
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.mainline.networkstack"
		package="com.android.networkstack"
		android:sharedUserId="android.uid.networkstack">
		<uses-permission android:name="android.permission.INTERNET" />
		<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

packages/NetworkStackPermissionStub/AndroidManifest.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,8 @@
		*/
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.mainline.networkstack.permissionstub">
		package="com.android.networkstack.permissionstub"
		android:sharedUserId="android.uid.networkstack">
		<!--
		This package only exists to define the below permissions, and enforce that they are only
		granted to apps sharing the same signature.

services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java

+23 −4

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.server.wm;
		import static android.view.InsetsState.TYPE_IME;
		import static android.view.InsetsState.TYPE_NAVIGATION_BAR;
		import static android.view.InsetsState.TYPE_TOP_BAR;
		import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL;
		import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;

		import static org.junit.Assert.assertEquals;
		@@ -28,15 +29,33 @@ import static org.junit.Assert.assertNull;
		import android.platform.test.annotations.Presubmit;
		import android.view.InsetsSourceControl;
		import android.view.InsetsState;
		import android.view.ViewRootImpl;

		import androidx.test.filters.FlakyTest;
		import androidx.test.filters.SmallTest;

		import org.junit.AfterClass;
		import org.junit.BeforeClass;
		import org.junit.Test;

		@SmallTest
		@Presubmit
		public class InsetsStateControllerTest extends WindowTestsBase {
		private static int sPreviousNewInsetsMode;

		@BeforeClass
		public static void setUpOnce() {
		// TODO: Make use of SettingsSession when it becomes feasible for this.
		sPreviousNewInsetsMode = ViewRootImpl.sNewInsetsMode;
		// To let the insets provider control the insets visibility, the insets mode has to be
		// NEW_INSETS_MODE_FULL.
		ViewRootImpl.sNewInsetsMode = NEW_INSETS_MODE_FULL;
		}

		@AfterClass
		public static void tearDownOnce() {
		ViewRootImpl.sNewInsetsMode = sPreviousNewInsetsMode;
		}

		@Test
		public void testStripForDispatch_notOwn() {
		@@ -47,7 +66,7 @@ public class InsetsStateControllerTest extends WindowTestsBase {
		assertNotNull(getController().getInsetsForDispatch(app).getSource(TYPE_TOP_BAR));
		}

		@FlakyTest(bugId = 69229402)
		@FlakyTest(detail = "Promote to pre-submit once confirmed stable.")
		@Test
		public void testStripForDispatch_own() {
		final WindowState topBar = createWindow(null, TYPE_APPLICATION, "parentWindow");
		@@ -57,7 +76,7 @@ public class InsetsStateControllerTest extends WindowTestsBase {
		assertEquals(new InsetsState(), getController().getInsetsForDispatch(topBar));
		}

		@FlakyTest(bugId = 124088319)
		@FlakyTest(detail = "Promote to pre-submit once confirmed stable.")
		@Test
		public void testStripForDispatch_navBar() {
		final WindowState navBar = createWindow(null, TYPE_APPLICATION, "parentWindow");
		@@ -69,7 +88,7 @@ public class InsetsStateControllerTest extends WindowTestsBase {
		assertEquals(new InsetsState(), getController().getInsetsForDispatch(navBar));
		}

		@FlakyTest(bugId = 124088319)
		@FlakyTest(detail = "Promote to pre-submit once confirmed stable.")
		@Test
		public void testBarControllingWinChanged() {
		final WindowState navBar = createWindow(null, TYPE_APPLICATION, "parentWindow");
		@@ -82,7 +101,7 @@ public class InsetsStateControllerTest extends WindowTestsBase {
		assertEquals(2, controls.length);
		}

		@FlakyTest(bugId = 124088319)
		@FlakyTest(detail = "Promote to pre-submit once confirmed stable.")
		@Test
		public void testControlRevoked() {
		final WindowState topBar = createWindow(null, TYPE_APPLICATION, "parentWindow");