Merge "Merge "AOD: Pause FalsingManager prox sensor while showing AOD" into... (6017928f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java

+16 −7

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import android.view.accessibility.AccessibilityManager;
		import com.android.systemui.Dependency;
		import com.android.systemui.UiOffloadThread;
		import com.android.systemui.analytics.DataCollector;
		import com.android.systemui.recents.misc.SystemServicesProxy;
		import com.android.systemui.statusbar.StatusBarState;

		import java.io.PrintWriter;
		@@ -76,6 +75,7 @@ public class FalsingManager implements SensorEventListener {
		private boolean mSessionActive = false;
		private int mState = StatusBarState.SHADE;
		private boolean mScreenOn;
		private boolean mShowingAod;
		private Runnable mPendingWtf;

		protected final ContentObserver mSettingsObserver = new ContentObserver(mHandler) {
		@@ -122,7 +122,7 @@ public class FalsingManager implements SensorEventListener {
		.append(" mState=").append(StatusBarState.toShortString(mState))
		.toString()
		);
		return isEnabled() && mScreenOn && (mState == StatusBarState.KEYGUARD);
		return isEnabled() && mScreenOn && (mState == StatusBarState.KEYGUARD) && !mShowingAod;
		}

		private boolean sessionEntrypoint() {
		@@ -144,6 +144,14 @@ public class FalsingManager implements SensorEventListener {
		}
		}

		public void updateSessionActive() {
		if (shouldSessionBeActive()) {
		sessionEntrypoint();
		} else {
		sessionExitpoint(false /* force */);
		}
		}

		private void onSessionStart() {
		if (FalsingLog.ENABLED) {
		FalsingLog.i("onSessionStart", "classifierEnabled=" + isClassiferEnabled());
		@@ -249,6 +257,11 @@ public class FalsingManager implements SensorEventListener {
		return mEnforceBouncer;
		}

		public void setShowingAod(boolean showingAod) {
		mShowingAod = showingAod;
		updateSessionActive();
		}

		public void setStatusBarState(int state) {
		if (FalsingLog.ENABLED) {
		FalsingLog.i("setStatusBarState", new StringBuilder()
		@@ -257,11 +270,7 @@ public class FalsingManager implements SensorEventListener {
		.toString());
		}
		mState = state;
		if (shouldSessionBeActive()) {
		sessionEntrypoint();
		} else {
		sessionExitpoint(false /* force */);
		}
		updateSessionActive();
		}

		public void onScreenTurningOn() {

packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.os.Handler;
		import com.android.internal.hardware.AmbientDisplayConfiguration;
		import com.android.systemui.R;
		import com.android.systemui.SystemUIApplication;
		import com.android.systemui.classifier.FalsingManager;
		import com.android.systemui.statusbar.phone.DozeParameters;
		import com.android.systemui.util.wakelock.DelayedWakeLock;
		import com.android.systemui.util.wakelock.WakeLock;
		@@ -53,6 +54,7 @@ public class DozeFactory {
		DozeMachine machine = new DozeMachine(wrappedService, config, wakeLock);
		machine.setParts(new DozeMachine.Part[]{
		new DozePauser(handler, machine, alarmManager),
		new DozeFalsingManagerAdapter(FalsingManager.getInstance(context)),
		createDozeTriggers(context, sensorManager, host, alarmManager, config, params,
		handler, wakeLock, machine),
		createDozeUi(context, host, wakeLock, machine, handler, alarmManager),

packages/SystemUI/src/com/android/systemui/doze/DozeFalsingManagerAdapter.java

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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 com.android.systemui.doze;

		import com.android.systemui.classifier.FalsingManager;

		/**
		* Notifies FalsingManager of whether or not AOD is showing.
		*/
		public class DozeFalsingManagerAdapter implements DozeMachine.Part {

		private final FalsingManager mFalsingManager;

		public DozeFalsingManagerAdapter(FalsingManager falsingManager) {
		mFalsingManager = falsingManager;
		}

		@Override
		public void transitionTo(DozeMachine.State oldState, DozeMachine.State newState) {
		mFalsingManager.setShowingAod(isAodMode(newState));
		}

		private boolean isAodMode(DozeMachine.State state) {
		switch (state) {
		case DOZE_AOD:
		case DOZE_AOD_PAUSING:
		case DOZE_AOD_PAUSED:
		return true;
		default:
		return false;
		}
		}
		}