Unverified Commit 0d563228 authored Jun 14, 2021 by Kevin F. Haggerty

Merge tag 'android-11.0.0_r38' into staging/lineage-18.1_merge-android-11.0.0_r38

Android 11.0.0 Release 38 (RQ3A.210605.005)

* tag 'android-11.0.0_r38':
Prevent apk-in-apex from being registered under wrong apex
Mark intents as immutable
Restrict alarm broadcast
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
getCameraIdListNoLazy : remove system cameras from mTorchStatus as well.
DO NOT MERGE Set focus to PasswordTextView by default.
Update carrier privilege check in enforceSubscriptionPlanAccess
Increase maximum allowed size for status bar icons
Increase maximum allowed size for status bar icons
Rebind InstallSuccess UI on resume
Revert "DO NOT MERGE Remove focus on PasswordTextView"
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
DO NOT MERGE Fix bubbles for workprofile
Camera: Fix a removal-while-iterate bug
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
DO NOT MERGE Reset top focused root task when task hidden
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Bluetooth airplane listener: Check for null
[DO NOT MERGE] Make PendingIntents in screenshots immutable
[DO NOT MERGE] Make PendingIntents in screenshots immutable
Import translations. DO NOT MERGE ANYWHERE
BG-FGS while-in-use restriction uses the same grace period mechanism as BG-Activity-Launch.
Allow FGS started from MediaButtonReceiver to have while-in-use permissions.
Ensure the next activity of non-focusable task to be visible
Import translations. DO NOT MERGE ANYWHERE
DO NOT MERGE: Don't take the AM lock in cached app compaction handler
RESTRICT AUTOMERGE Handling removing <original-package> tag
RESTRICT AUTOMERGE Revert "Handling removing <original-package> tag"
Dump warning logs to prevent app crash while no top-resumed changes
DO NOT MERGE - Disallow deletion of channels with FGS notifications
Prevent caching unexpected IME shown state for legacy split
DO NOT MERGE - Disallow deletion of channels with FGS notifications
DO NOT MERGE Inflate NotificationPanel on instantiation
TelephonyRegistry: Pass featureId to LocationAccessPolicy
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
DO NOT MERGE Remove superfluous resetting of Keyguard on unocclusion.
Vibrate as system instead of as an app
Import translations. DO NOT MERGE ANYWHERE
Fix an NPE in BatteryService
Override isRestricted for preventing unexpected resource loading
DO NOT MERGE Delete superfluous call of mInsetsController.onControlsChanged.
Make sure to hide IME adjust dims when exiting split mode
Import translations. DO NOT MERGE ANYWHERE
Sanitize text fields
Import translations. DO NOT MERGE ANYWHERE
wifidisplay: restrict broadcast by the proper permission
wifidisplay: restrict broadcast by the proper permission
Import translations. DO NOT MERGE ANYWHERE
Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened"
Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened"
DO NOT MERGE Remove focus on PasswordTextView
Ensure that ML model results are still bounded by the gesture insets
Include whether in touch mode for WindowlessWindowManager
Return copy of pending token list
DO NOT MERGE Do not reinflate the layout if it has not been already inflated.
Use futures for binding and talking to the ExternalStorageService.
Import translations. DO NOT MERGE ANYWHERE
[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen.
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Move posting logic from PerDisplay to DisplayWIndowInsetsControllerImpl.
DO NOT MERGE Add generic rotary support for sysui overlay window
Configure privapp perms for rotary service
Import translations. DO NOT MERGE ANYWHERE
Fix nine-patches to always filter
Restrict the overridden min size for PiP
[Fix] Bluetooth device ordering
DO NOT MERGE Allow the Car Setup Wizard appl to send CAR_INFORMATION notifications
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Configure Bluetooth profiles displayed in settings
DO NOT MERGE Intercept back button on user switcher screen
Avoid TransferPipe for local dumpCacheInfo calls
Configure privapp perms for car activity resolver
Stop keeping freeform activities visible.
Add immutability flag to PendingIntents
Add Emergency callback mode shell command
Import translations. DO NOT MERGE ANYWHERE
Disable resetting WRITE_MEDIA_IMAGES and WRITE_MEDIA_VIDEO appops
Make two broadcasts protected
Add pkg target to snoozing alarm
Add pkg target to snoozing alarm
Import translations. DO NOT MERGE ANYWHERE
Fix possible NPE when matching accessory version
Make isAppBad() lock-free
DO NOT MERGE Chk QUERY_ALL_PACKAGES when resolving
Notify client to clear intermediate rotated adjustments
Import translations. DO NOT MERGE ANYWHERE
Adds caller check to getAllPackages()
Adds caller check to getAllPackages()
[DO NOT MERGE] Catch RuntimeException from DisplayManager
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Allow empty tokens in strict grammar
Allow empty tokens in strict grammar
Import translations. DO NOT MERGE ANYWHERE
DO NOT MERGE Disable privacy indicators
Parcel queriesProviders in ParsingPackageImpl
Do not keep the input array with CPU times
Apply split-screen resize on sync queue
CachedAppOptimizer: don't take AM lock when freezer is not enabled
Revoke storage on SDK downgrade or new full storage request
freezer: handle exception in locks file format
Stop passing in statsFile fds as they will be leaked when returned to the caller.
Fix the the proto definition for app startup and fully drawn events.
[DO NOT MERGE] Make screenshot error notification PendingIntent immutable
[DO NOT MERGE] Make screenshot error notification PendingIntent immutable
Import translations. DO NOT MERGE ANYWHERE
Handle cancelled Insets animation
[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser"
Create ux restricted customizations for DeviceDefault buttons and switches
DO NOT MERGE: Associate notif cancels with notif posts
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
[DO NOT MERGE] Close screenshot process on user switched
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
RESTRICT AUTOMERGE Allow CDM to hide overlays
Import translations. DO NOT MERGE ANYWHERE
[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard.
[DO NOT MERGE] DisplayImeController: fix out-of-sync IME visibility
DO NOT MERGE Dont restore focus on new HUN window
[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard.
Fix ambient information which did not get for locking refresh rate
Added to enable/disable log for DisplayModeDirector
Import translations. DO NOT MERGE ANYWHERE
Change setPrimaryStorageUuid to handle it for the current user
[DO NOT MERGE] Close screenshot process on user switched
Fix legacy APIs when VPN switches to suspended underlying network.
Backport test coverage from aosp/1547496.
Backport some helpers in ConnectivityServiceTest.
Test for bugs with suspended VPN underlying networks.
Add a test for getDefaultNetworkCapabilitiesForUser.
Improve testing of CONNECTIVITY_ACTION broadcasts.
Test passing an underlying network array with null network in it.
Make testVpnNetworkActive more deterministic.
Make MockVpn more realistic and easier to use.
Increase test coverage for VPN info sent to NetworkStatsService.
Simplify MockVpn.
Test a VPN with an underlying network that does not yet exist.
Limit maximum allowed size for a status bar icon
Limit maximum allowed size for a status bar icon
[DO NOT MERGE] Close screenshot process on user switched
[DO NOT MERGE] Close screenshot process on user switched
[DO NOT MERGE] Close screenshot process on user switched
Fix legacy APIs when VPN switches to suspended underlying network.
Backport test coverage from aosp/1547496.
Backport some helpers in ConnectivityServiceTest.
Test for bugs with suspended VPN underlying networks.
Add a test for getDefaultNetworkCapabilitiesForUser.
Improve testing of CONNECTIVITY_ACTION broadcasts.
Test passing an underlying network array with null network in it.
Make testVpnNetworkActive more deterministic.
Make MockVpn more realistic and easier to use.
Increase test coverage for VPN info sent to NetworkStatsService.
Simplify MockVpn.
Test a VPN with an underlying network that does not yet exist.
[DO NOT MERGE] Close screenshot process on user switched
DO NOT MERGE Handle back button for notification panel
Add IMMUTABLE flag to AccountManager pending intents.
ActivityManagerService: all users can handle freezer state in debug builds
Allow carriers to configure RTT while roaming
DO NOT MERGE: Do not inject mock location to chipset
Remove bundled CompanionDeviceSupport permissions
freezer: increase timeout to 5 mins
DO NOT MERGE Do not update bar control target when application is starting
Enabled TEMP_NOT_METERED support for carriers
add Shell-package-library to allow product type level update
Change target package for com.android.car.shell
Fix thread safety issue on clearing cache
Fix thread safety issue on clearing cache
ActivityManager: don't freeze processes holding file locks
[SettingsProvider] extend font size scale range
[SettingsProvider] extend font size scale range
[SettingsProvider] extend font size scale range
[SettingsProvider] extend font size scale range
Don't release WakeLock w/o active client
Fix fingerprint dialog color contrast for dark theme
DO NOT MERGE: Do not inject mock location to chipset
DO NOT MERGE: Do not inject mock location to chipset
Prevent multiple calls of ActivityThread.systemMain()
DO NOT MERGE "Fix the ambient lux which did not update for blocking zone"
DO NOT MERGE "Allow DeviceConfig to change display settings for high zone"
DO NOT MERGE "Set fixed fps when ambient or display brightness is high"
Add a new reason code for IMS call failed due to network congestion
DO NOT MERGE: Do not inject mock location to chipset
DO NOT MERGE: Do not inject mock location to chipset
[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent.
Temporary fix to prevent TEMPORARILY_NOT_METERED leak
Allow CBR when device owners is set up
Do not abort launch logger by invisible drawn activity
DO NOT MERGE Remove floating cards launcher
Get ApplicationInfo using usr id
Import translations. DO NOT MERGE ANYWHERE
DO NOT MERGE Revert "Set fixed fps when ambient or display brightness is high"
DO NOT MERGE Revert "Allow DeviceConfig to change display settings for high zone"
DO NOT MERGE Revert "Fix the ambient lux which did not update for blocking zone"
Import translations. DO NOT MERGE ANYWHERE
Only allow BROWSABLE && DEFAULT Intents to be always opened
Only allow BROWSABLE && DEFAULT Intents to be always opened
Only allow BROWSABLE && DEFAULT Intents to be always opened
Only allow BROWSABLE && DEFAULT Intents to be always opened
Only allow BROWSABLE && DEFAULT Intents to be always opened
Only allow BROWSABLE && DEFAULT Intents to be always opened
Fix the ambient lux which did not update for blocking zone
Add method to clear out SubscriptionInfo#getCardString
Whitelist READ_PRIVILEGED_PHONE_STATE for the contacts provider
Update the getIccId docs to reflect access requirements
Pass interaction type to FalsingManager.isFalse
Check mode/boost index before accessing cached support value
Check mode/boost index before accessing cached support value
Fix renaming file and moving file issue in MTP
Ensure OK/Cancel buttons always shown
Import translations. DO NOT MERGE ANYWHERE
Notify visibility change if source visibility is changed
[RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user
Clean up dead code in NetInitiatedActivity
DO NOT MERGE Focus clock by default
DO NOT MERGE: Disable StrictMode VM Policy check.
Use default color when artwork is too small
Nfc adapter randomly returns null on devices having Nfc
RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background.
Unregister Touch Sensors for DOZE_AOD_DOCKED
DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL.
DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL.
DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL.
DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL.
Protect account chooser activities against overlay.
Protect account chooser activities against overlay.
Only update native InputApplicationHandle once
Listen for EXTRA_PRESENT changes
Fix DevicePolicyManager.isBackupServiceEnabled() breakage.
BackupManagerService: Make new behavior conditional on ChangeId.
Enforce BACKUP permission on Service end.
RESTRICT AUTOMERGE Allow CDM to hide overlays
RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
RESTRICT AUTOMERGE Allow CDM to hide overlays
RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
RESTRICT AUTOMERGE Allow CDM to hide overlays
RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
Allow CDM to hide overlays
Prevent non-system overlays from showing over CDM UI
Protect DeviceAdminReceiver intents
[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser
Revoke storage on SDK downgrade or new full storage request
docs: Remove error in requestPermissions doc

Conflicts:
packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

Change-Id: I9e9651e436f43aca02b424d453a4c76e32a79d7d

parents b80ca7e2 ba595d5d

cmds/statsd/src/atoms.proto

+8 −8

Original line number	Diff line number	Diff line
		@@ -3612,11 +3612,11 @@ message AppStartOccurred {
		// Empty if not set.
		optional string launch_token = 13;

		// The compiler filter used when when the package was optimized.
		optional int32 package_optimization_compilation_filter = 14;

		// The reason why the package was optimized.
		optional int32 package_optimization_compilation_reason = 15;
		optional int32 package_optimization_compilation_reason = 14;

		// The compiler filter used when when the package was optimized.
		optional int32 package_optimization_compilation_filter = 15;
		}

		message AppStartCanceled {
		@@ -3662,11 +3662,11 @@ message AppStartFullyDrawn {
		// App startup time (until call to Activity#reportFullyDrawn()).
		optional int64 app_startup_time_millis = 6;

		// The compiler filter used when when the package was optimized.
		optional int32 package_optimization_compilation_filter = 7;

		// The reason why the package was optimized.
		optional int32 package_optimization_compilation_reason = 8;
		optional int32 package_optimization_compilation_reason = 7;

		// The compiler filter used when when the package was optimized.
		optional int32 package_optimization_compilation_filter = 8;
		}

		/**

core/java/android/app/Activity.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -5183,12 +5183,6 @@ public class Activity extends ContextThemeWrapper
		* #checkSelfPermission(String)}.
		* </p>
		* <p>
		* Calling this API for permissions already granted to your app would show UI
		* to the user to decide whether the app can still hold these permissions. This
		* can be useful if the way your app uses data guarded by the permissions
		* changes significantly.
		* </p>
		* <p>
		* You cannot request a permission if your activity sets {@link
		* android.R.styleable#AndroidManifestActivity_noHistory noHistory} to
		* <code>true</code> because in this case the activity would not receive

core/java/android/app/ActivityManagerInternal.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -377,6 +377,21 @@ public abstract class ActivityManagerInternal {
		*/
		public abstract boolean hasRunningForegroundService(int uid, int foregroundServiceType);

		/**
		* Returns {@code true} if the given notification channel currently has a
		* notification associated with a foreground service. This is an AMS check
		* because that is the source of truth for the FGS state.
		*/
		public abstract boolean hasForegroundServiceNotification(String pkg, @UserIdInt int userId,
		String channelId);

		/**
		* If the given app has any FGSs whose notifications are in the given channel,
		* stop them.
		*/
		public abstract void stopForegroundServicesForChannel(String pkg, @UserIdInt int userId,
		String channelId);

		/**
		* Registers the specified {@code processObserver} to be notified of future changes to
		* process state.
		@@ -440,4 +455,11 @@ public abstract class ActivityManagerInternal {
		* @return true if exists, false otherwise.
		*/
		public abstract boolean isPendingTopUid(int uid);

		public abstract void tempAllowWhileInUsePermissionInFgs(int uid, long duration);

		public abstract boolean isTempAllowlistedForFgsWhileInUse(int uid);

		public abstract boolean canAllowWhileInUsePermissionInFgs(int pid, int uid,
		@NonNull String packageName);
		}

core/java/android/app/ActivityThread.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -4602,6 +4602,10 @@ public final class ActivityThread extends ClientTransactionHandler {
		}

		if (r.isTopResumedActivity == onTop) {
		if (!Build.IS_DEBUGGABLE) {
		Slog.w(TAG, "Activity top position already set to onTop=" + onTop);
		return;
		}
		throw new IllegalStateException("Activity top position already set to onTop=" + onTop);
		}

core/java/android/app/AppOpsManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2436,9 +2436,9 @@ public class AppOpsManager {
		false, // READ_MEDIA_AUDIO
		false, // WRITE_MEDIA_AUDIO
		false, // READ_MEDIA_VIDEO
		false, // WRITE_MEDIA_VIDEO
		true, // WRITE_MEDIA_VIDEO
		false, // READ_MEDIA_IMAGES
		false, // WRITE_MEDIA_IMAGES
		true, // WRITE_MEDIA_IMAGES
		true, // LEGACY_STORAGE
		false, // ACCESS_ACCESSIBILITY
		false, // READ_DEVICE_IDENTIFIERS