Merge "Disable 3-Button NavBar Recents key when launch secure camera" into... (8834fcd8) · Commits · e / os / android_frameworks_base

packages/SystemUI/res-keyguard/values/config.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@
		<!-- Will display the bouncer on one side of the display, and the current user icon and
		user switcher on the other side -->
		<bool name="config_enableBouncerUserSwitcher">false</bool>
		<!-- Will enable custom clocks on the lockscreen -->
		<bool name="config_enableLockScreenCustomClocks">true</bool>
		<!-- Time to be considered a consecutive fingerprint failure in ms -->
		<integer name="fp_consecutive_failure_time_ms">3500</integer>
		</resources>

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+6 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,12 @@ object Flags {
		resourceBooleanFlag(204, R.bool.config_enableBouncerUserSwitcher, "bouncer_user_switcher")

		// TODO(b/254512676): Tracking Bug
		@JvmField val LOCKSCREEN_CUSTOM_CLOCKS = releasedFlag(207, "lockscreen_custom_clocks")
		@JvmField
		val LOCKSCREEN_CUSTOM_CLOCKS = resourceBooleanFlag(
		207,
		R.bool.config_enableLockScreenCustomClocks,
		"lockscreen_custom_clocks"
		)

		// TODO(b/275694445): Tracking Bug
		@JvmField

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+23 −2

Original line number	Diff line number	Diff line
		@@ -1501,13 +1501,17 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		notifyFinishedGoingToSleep();

		if (cameraGestureTriggered) {

		// Just to make sure, make sure the device is awake.
		mContext.getSystemService(PowerManager.class).wakeUp(SystemClock.uptimeMillis(),
		PowerManager.WAKE_REASON_CAMERA_LAUNCH,
		"com.android.systemui:CAMERA_GESTURE_PREVENT_LOCK");
		setPendingLock(false);
		mPendingReset = false;
		mPowerGestureIntercepted = true;
		if (DEBUG) {
		Log.d(TAG, "cameraGestureTriggered=" + cameraGestureTriggered
		+ ",mPowerGestureIntercepted=" + mPowerGestureIntercepted);
		}
		}

		if (mPendingReset) {
		@@ -1706,7 +1710,13 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		mAnimatingScreenOff = false;
		cancelDoKeyguardLaterLocked();
		cancelDoKeyguardForChildProfilesLocked();
		if (DEBUG) Log.d(TAG, "onStartedWakingUp, seq = " + mDelayedShowingSequence);
		if (cameraGestureTriggered) {
		mPowerGestureIntercepted = true;
		}
		if (DEBUG) {
		Log.d(TAG, "onStartedWakingUp, seq = " + mDelayedShowingSequence
		+ ", mPowerGestureIntercepted = " + mPowerGestureIntercepted);
		}
		notifyStartedWakingUp();
		}
		mUiEventLogger.logWithInstanceIdAndPosition(
		@@ -1933,12 +1943,19 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		startKeyguardExitAnimation(0, 0);
		}

		mPowerGestureIntercepted = mUpdateMonitor.isSecureCameraLaunchedOverKeyguard();

		if (mOccluded != isOccluded) {
		mOccluded = isOccluded;
		mKeyguardViewControllerLazy.get().setOccluded(isOccluded, animate
		&& mDeviceInteractive);
		adjustStatusBarLocked();
		}

		if (DEBUG) {
		Log.d(TAG, "isOccluded=" + isOccluded + ",mPowerGestureIntercepted="
		+ mPowerGestureIntercepted);
		}
		}
		Trace.endSection();
		}
		@@ -3056,6 +3073,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		flags \|= StatusBarManager.DISABLE_RECENT;
		}

		if (mPowerGestureIntercepted) {
		flags \|= StatusBarManager.DISABLE_RECENT;
		}

		if (DEBUG) {
		Log.d(TAG, "adjustStatusBarLocked: mShowing=" + mShowing + " mOccluded=" + mOccluded
		+ " isSecure=" + isSecure() + " force=" + forceHideHomeRecentsButtons

services/core/jni/tvinput/JTvInputHal.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -418,7 +418,7 @@ JTvInputHal::TvInputCallback::TvInputCallback(JTvInputHal* hal) {
		::ndk::ScopedAStatus JTvInputHal::TvInputCallback::notifyTvMessageEvent(
		const AidlTvMessageEvent& event) {
		const std::string DEVICE_ID_SUBTYPE = "device_id";
		if (sizeof(event.messages) > 0 && event.messages[0].subType == DEVICE_ID_SUBTYPE) {
		if (event.messages.size() > 1 && event.messages[0].subType == DEVICE_ID_SUBTYPE) {
		mHal->mLooper
		->sendMessage(new NotifyTvMessageHandler(mHal,
		TvMessageEventWrapper::createEventWrapper(

services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ import android.os.SystemProperties;
		import android.os.UpdateEngine;
		import android.os.UpdateEngineCallback;
		import android.provider.DeviceConfig;
		import android.provider.Settings;
		import android.provider.Settings.SettingNotFoundException;
		import android.util.Log;

		import com.android.internal.R;
		@@ -332,8 +334,17 @@ public final class ProfcollectForwardingService extends SystemService {
		Context context = getContext();
		BackgroundThread.get().getThreadHandler().post(() -> {
		try {
		int usageSetting = -1;
		try {
		// Get "Usage & diagnostics" checkbox status. 1 is for enabled, 0 is for
		// disabled.
		usageSetting = Settings.Global.getInt(context.getContentResolver(), "multi_cb");
		} catch (SettingNotFoundException e) {
		Log.i(LOG_TAG, "Usage setting not found: " + e.getMessage());
		}

		// Prepare profile report
		String reportName = mIProfcollect.report() + ".zip";
		String reportName = mIProfcollect.report(usageSetting) + ".zip";

		if (!context.getResources().getBoolean(
		R.bool.config_profcollectReportUploaderEnabled)) {