Snap for 8186230 from d7a45338bb12f326b7b9c0ca41b3c379272c763e to sc-qpr3-release (f952e603) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -3103,11 +3103,18 @@ public class DevicePolicyManager {
		}
		}

		/** @hide */
		public void resetNewUserDisclaimer() {
		/**
		* Acknoledges that the new managed user disclaimer was viewed by the (human) user
		* so that {@link #ACTION_SHOW_NEW_USER_DISCLAIMER broadcast} is not sent again the next time
		* this user is switched to.
		*
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_USERS)
		public void acknowledgeNewUserDisclaimer() {
		if (mService != null) {
		try {
		mService.resetNewUserDisclaimer();
		mService.acknowledgeNewUserDisclaimer();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -5673,7 +5680,7 @@ public class DevicePolicyManager {
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_SHOW_NEW_USER_DISCLAIMER =
		"android.app.action.ACTION_SHOW_NEW_USER_DISCLAIMER";
		"android.app.action.SHOW_NEW_USER_DISCLAIMER";

		/**
		* Widgets are enabled in keyguard

core/java/android/app/admin/IDevicePolicyManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -264,7 +264,7 @@ interface IDevicePolicyManager {
		int getLogoutUserId();
		void clearLogoutUser();
		List<UserHandle> getSecondaryUsers(in ComponentName who);
		void resetNewUserDisclaimer();
		void acknowledgeNewUserDisclaimer();

		void enableSystemApp(in ComponentName admin, in String callerPackage, in String packageName);
		int enableSystemAppWithIntent(in ComponentName admin, in String callerPackage, in Intent intent);

core/res/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -703,7 +703,7 @@
		<protected-broadcast android:name="android.scheduling.action.REBOOT_READY" />
		<protected-broadcast android:name="android.app.action.DEVICE_POLICY_CONSTANTS_CHANGED" />
		<protected-broadcast android:name="android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" />
		<protected-broadcast android:name="android.app.action.ACTION_SHOW_NEW_USER_DISCLAIMER" />
		<protected-broadcast android:name="android.app.action.SHOW_NEW_USER_DISCLAIMER" />

		<!-- ====================================================================== -->
		<!-- RUNTIME PERMISSIONS -->

packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.view.View
		import android.view.ViewGroup
		import android.view.ViewGroupOverlay
		import androidx.annotation.VisibleForTesting
		import com.android.keyguard.KeyguardViewController
		import com.android.systemui.R
		import com.android.systemui.animation.Interpolators
		import com.android.systemui.dagger.SysUISingleton
		@@ -39,7 +40,6 @@ import com.android.systemui.statusbar.StatusBarState
		import com.android.systemui.statusbar.SysuiStatusBarStateController
		import com.android.systemui.statusbar.notification.stack.StackStateAnimator
		import com.android.systemui.statusbar.phone.KeyguardBypassController
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager
		import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.statusbar.policy.KeyguardStateController
		import com.android.systemui.util.Utils
		@@ -82,7 +82,7 @@ class MediaHierarchyManager @Inject constructor(
		private val notifLockscreenUserManager: NotificationLockscreenUserManager,
		configurationController: ConfigurationController,
		wakefulnessLifecycle: WakefulnessLifecycle,
		private val statusBarKeyguardViewManager: StatusBarKeyguardViewManager
		private val keyguardViewController: KeyguardViewController
		) {

		/**
		@@ -998,7 +998,7 @@ class MediaHierarchyManager @Inject constructor(

		private fun isLockScreenVisibleToUser(): Boolean {
		return !statusBarStateController.isDozing &&
		!statusBarKeyguardViewManager.isBouncerShowing &&
		!keyguardViewController.isBouncerShowing &&
		statusBarStateController.state == StatusBarState.KEYGUARD &&
		notifLockscreenUserManager.shouldShowLockscreenNotifications() &&
		statusBarStateController.isExpanded &&
		@@ -1007,7 +1007,7 @@ class MediaHierarchyManager @Inject constructor(

		private fun isLockScreenShadeVisibleToUser(): Boolean {
		return !statusBarStateController.isDozing &&
		!statusBarKeyguardViewManager.isBouncerShowing &&
		!keyguardViewController.isBouncerShowing &&
		(statusBarStateController.state == StatusBarState.SHADE_LOCKED \|\|
		(statusBarStateController.state == StatusBarState.KEYGUARD && qsExpanded))
		}

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -428,7 +428,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		public void setBrightnessMirrorController(
		BrightnessMirrorController brightnessMirrorController) {
		mQSPanelController.setBrightnessMirror(brightnessMirrorController);
		mQuickQSPanelController.setBrightnessMirror(brightnessMirrorController);
		}

		@Override