Unverified Commit 2ff7bb28 authored Dec 14, 2021 by Michael Bestas

Merge tag 'android-12.0.0_r18' into staging/lineage-19.0_merge-android-12.0.0_r18

Android 12.0.0 release 18

* tag 'android-12.0.0_r18': (633 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Fix normalize doesn't work on carrier template
  [RESTRICT AUTOMERGE] Hide Wi-Fi Scanning message when Location is disabled (QS Internet Dialog)
  [DO NOT MERGE] Revert "Fixed the performance of unlocking when dozing"
  Import translations. DO NOT MERGE ANYWHERE
  Use SystemUI theme to inflate FrameLayout and SplashScreenView
  Ensure we clear mPackagesWithShareRequests when a remote exception happens at write() or start().
  Ensure end action is called if keyguard animation is cancelled
  Add config to detect e-call call based on dialed sim emerg # list.
  Fixed an issue where using UDFPS always dismissed the shade
  [DO NOT MERGE] Handle IllegalStateException in APM event handling.
  Fixed the performance of unlocking when dozing
  [SystemUI] 1.Remove the unnecessary log 2. update signal icon in bg thread
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Update the BroadcastQueue logic for runtime permissions
  Fix initialization of snapshot SkImage instance
  Conditionally cache RenderEffect results
  [RESTRICT AUTOMERGE] Add Wi-Fi Scanning notify to QS Internet Dialog
  [RESTRICT AUTOMERGE] Add WiFi scan notify message (QS Internet Dialog)
  ...

 Conflicts:
	packages/SystemUI/src/com/android/keyguard/LockIconView.java
	packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
	packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollHelper.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollProgressBarDrawable.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollProgressBarSegment.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
	packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java
	packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt
	packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java
	packages/SystemUI/tests/src/com/android/systemui/keyguard/LockIconViewControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
	services/core/java/com/android/server/display/DisplayModeDirector.java
	services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java

 Manually edited:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

Change-Id: I70454178aefb80df19aafb39f8aaa7a9ed0a7e33

parents 560255f8 6c2cb687

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2918,6 +2918,13 @@ public class DeviceIdleController extends SystemService
	reasonCode, reason).sendToTarget();		reasonCode, reason).sendToTarget();
	}		}
	reportTempWhitelistChangedLocked(uid, true);		reportTempWhitelistChangedLocked(uid, true);
			} else {
			// The uid is already temp allowlisted, only need to update AMS for temp allowlist
			// duration.
			if (mLocalActivityManager != null) {
			mLocalActivityManager.updateDeviceIdleTempAllowlist(null, uid, true,
			duration, tempAllowListType, reasonCode, reason, callingUid);
			}
	}		}
	}		}
	if (informWhitelistChanged) {		if (informWhitelistChanged) {

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+12 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1008,13 +1008,21 @@ public class JobSchedulerService extends com.android.server.SystemService
	}		}

	@Override		@Override
	public void onUserUnlocked(@NonNull TargetUser user) {		public void onUserStarting(@NonNull TargetUser user) {
	synchronized (mLock) {		synchronized (mLock) {
	// Note that the user has started after its unlocked instead of when the user
	// actually starts because the storage won't be decrypted until unlock.
	mStartedUsers = ArrayUtils.appendInt(mStartedUsers, user.getUserIdentifier());		mStartedUsers = ArrayUtils.appendInt(mStartedUsers, user.getUserIdentifier());
	}		}
	// Let's kick any outstanding jobs for this user.		// The user is starting but credential encrypted storage is still locked.
			// Only direct-boot-aware jobs can safely run.
			// Let's kick off any eligible jobs for this user.
			mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();
			}

			@Override
			public void onUserUnlocked(@NonNull TargetUser user) {
			// The user is fully unlocked and credential encrypted storage is now decrypted.
			// Direct-boot-UNaware jobs can now safely run.
			// Let's kick off any outstanding jobs for this user.
	mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();		mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();
	}		}

apex/media/OWNERS

+4 −4

Original line number	Original line	Diff line number	Diff line
	andrewlewis@google.com		# Bug component: 1344
	aquilescanta@google.com
	chz@google.com
	hdmoon@google.com		hdmoon@google.com
	hkuang@google.com		hkuang@google.com
	jinpark@google.com		jinpark@google.com
	klhyun@google.com		klhyun@google.com
	lnilsson@google.com		lnilsson@google.com
	marcone@google.com
	sungsoo@google.com		sungsoo@google.com

			# go/android-fwk-media-solutions for info on areas of ownership.
			include platform/frameworks/av:/media/janitors/media_solutions_OWNERS

cmds/bootanimation/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ cc_library_shared {
	"libui",		"libui",
	"libjnigraphics",		"libjnigraphics",
	"libEGL",		"libEGL",
	"libGLESv1_CM",		"libGLESv2",
	"libgui",		"libgui",
	],		],
	}		}

cmds/bootanimation/BootAnimation.cpp

+335 −106

File changed.

Preview size limit exceeded, changes collapsed.