Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 412bbff5 authored Apr 29, 2021 by android-build-team Robot

Merge cherrypicks of [14355792, 14355828, 14355817, 14355712, 14355848] into sc-release

Change-Id: I911024a88a60082704fe4d3d5ce0e46568b1122a

parents 58906532 c920ee72

core/java/android/widget/HorizontalScrollView.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -706,8 +706,7 @@ public class HorizontalScrollView extends FrameLayout {
		if (getChildCount() == 0) {
		return false;
		}
		if ((mIsBeingDragged = !mScroller.isFinished() \|\| !mEdgeGlowRight.isFinished()
		\|\| !mEdgeGlowLeft.isFinished())) {
		if (!mScroller.isFinished()) {
		final ViewParent parent = getParent();
		if (parent != null) {
		parent.requestDisallowInterceptTouchEvent(true);

core/java/android/widget/ScrollView.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -763,8 +763,7 @@ public class ScrollView extends FrameLayout {
		if (getChildCount() == 0) {
		return false;
		}
		if ((mIsBeingDragged = !mScroller.isFinished() \|\| !mEdgeGlowTop.isFinished()
		\|\| !mEdgeGlowBottom.isFinished())) {
		if (!mScroller.isFinished()) {
		final ViewParent parent = getParent();
		if (parent != null) {
		parent.requestDisallowInterceptTouchEvent(true);

services/core/java/com/android/server/SensorPrivacyService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ public final class SensorPrivacyService extends SystemService {
		SparseBooleanArray userIndividualEnabled =
		mIndividualEnabled.valueAt(i);
		for (int j = 0; j < userIndividualEnabled.size(); j++) {
		int sensor = userIndividualEnabled.keyAt(i);
		int sensor = userIndividualEnabled.keyAt(j);
		boolean enabled = userIndividualEnabled.valueAt(j);
		setUserRestriction(userId, sensor, enabled);
		}