Unverified Commit e33699a6 authored Mar 14, 2023 by Michael Bestas

Merge tag 'android-13.0.0_r35' into staging/lineage-20.0_merge-android-13.0.0_r35

Android 13.0.0 release 35

* tag 'android-13.0.0_r35': (2087 commits)
Revert change that would detectFp when FP is locked out
Validate package name passed to setApplicationRestrictions. (Reland)
DO NOT MERGE ANYWHERE
DO NOT MERGE ANYWHERE
Send system user broadcasts in headless system user mode.
Fix QS header constraints so status icons are now ellipsized where there is lack of space.
Fix work tile setup when adding work profile
Revisit how launch animations handle View visibility
Use the correct FGS View when animating into a dialog
[Status Bar] Append "__external" to external icons.
Revert "Ensure that only SysUI can override pending intent launch flags"
Revert "Add dumpsys logs to debug lockscreen stack height"
Make the header INVISIBLE when alpha is 0
NotificationChildrenContainer apply the roundness on NotificationHeaderViewWrapper too
Fix DisplayManager race condition when state is unknown
Add one new method is3gpp
Add NR bands to service state.
Fix issue with leaking death recipients
Setting the display state to off when the default display is being changed
Adding a feature flag for Auto Pin Confirmation feature
...

Conflicts:
core/java/android/app/StatusBarManager.java
core/java/android/hardware/Camera.java
core/java/com/android/internal/statusbar/IStatusBarService.aidl
core/jni/android_hardware_Camera.cpp
packages/SystemUI/Android.bp
packages/SystemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java
packages/SystemUI/res-keyguard/layout/footer_actions.xml
packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml
packages/SystemUI/res/values-night/styles.xml
packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityView.java
packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java
packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java
packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt
packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java
packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.kt
packages/SystemUI/tests/src/com/android/systemui/screenshot/ImageExporterTest.java
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java
services/appwidget/java/com/android/server/appwidget/AppWidgetXmlUtil.java
services/core/java/com/android/server/display/AutomaticBrightnessController.java
services/core/java/com/android/server/display/DisplayPowerController.java
services/core/java/com/android/server/media/MediaSessionRecord.java
services/core/java/com/android/server/power/PowerGroup.java
services/core/java/com/android/server/power/PowerManagerService.java
services/core/java/com/android/server/statusbar/StatusBarManagerService.java

Change-Id: I44409b71953557bd33192e471da5f50f19b22819

parents 0b34a54d af0429f7

Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,9 @@ java_library {
		visibility: [
		// DO NOT ADD ANY MORE ENTRIES TO THIS LIST
		"//external/robolectric-shadows:__subpackages__",
		//This will eventually replace the item above, and serves the
		//same purpose.
		"//external/robolectric:__subpackages__",
		"//frameworks/layoutlib:__subpackages__",
		],
		}

PREUPLOAD.cfg

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclu

		ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/packages/SystemUI/ktfmt_includes.txt ${PREUPLOAD_FILES}

		ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES}
		ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}

		owners_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "OWNERS$"

TEST_MAPPING

+30 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,22 @@
		]
		}
		],
		"presubmit-pm": [
		{
		"name": "PackageManagerServiceServerTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		}
		],
		"presubmit": [
		{
		"name": "ManagedProvisioningTests",
		@@ -167,6 +183,20 @@
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		},
		{
		"name": "PackageManagerServiceServerTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		}
		]
		}

apex/jobscheduler/framework/java/android/app/JobSchedulerImpl.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -16,7 +16,10 @@

		package android.app;

		import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		import android.app.job.IJobScheduler;
		import android.app.job.IUserVisibleJobObserver;
		import android.app.job.JobInfo;
		import android.app.job.JobScheduler;
		import android.app.job.JobSnapshot;
		@@ -119,4 +122,28 @@ public class JobSchedulerImpl extends JobScheduler {
		return null;
		}
		}

		@RequiresPermission(allOf = {
		android.Manifest.permission.MANAGE_ACTIVITY_TASKS,
		android.Manifest.permission.INTERACT_ACROSS_USERS_FULL})
		@Override
		public void registerUserVisibleJobObserver(@NonNull IUserVisibleJobObserver observer) {
		// TODO(255767350): implement
		}

		@RequiresPermission(allOf = {
		android.Manifest.permission.MANAGE_ACTIVITY_TASKS,
		android.Manifest.permission.INTERACT_ACROSS_USERS_FULL})
		@Override
		public void unregisterUserVisibleJobObserver(@NonNull IUserVisibleJobObserver observer) {
		// TODO(255767350): implement
		}

		@RequiresPermission(allOf = {
		android.Manifest.permission.MANAGE_ACTIVITY_TASKS,
		android.Manifest.permission.INTERACT_ACROSS_USERS_FULL})
		@Override
		public void stopUserVisibleJobsForUser(@NonNull String packageName, int userId) {
		// TODO(255767350): implement
		}
		}

apex/jobscheduler/framework/java/android/app/job/IUserVisibleJobObserver.aidl

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.app.job;

		import android.app.job.UserVisibleJobSummary;

		/**
		* IPC protocol to know about user-visible job activity.
		*
		* @hide
		*/
		oneway interface IUserVisibleJobObserver {
		/**
		* Notify the client of all changes to a user-visible jobs' state.
		* @param summary A token/summary that uniquely identifies and details a single running job
		* @param isRunning whether the job is currently running or not
		*/
		void onUserVisibleJobStateChanged(in UserVisibleJobSummary summary, boolean isRunning);
		}