Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1a3a449 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev

parents 3d8c9981 f16c3be1

services/core/java/com/android/server/GestureLauncherService.java

+3 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.os.PowerManager; 
import android.os.PowerManager.WakeLock;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.MutableBoolean;

import android.util.Slog;
@@ -284,8 +285,8 @@ public class GestureLauncherService extends SystemService { 
     * @return true if camera was launched, false otherwise.

     */

    private boolean handleCameraLaunchGesture(boolean useWakelock, int source) {

        boolean userSetupComplete = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.USER_SETUP_COMPLETE, 0) != 0;

        boolean userSetupComplete = Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;

        if (!userSetupComplete) {

            if (DBG) Slog.d(TAG, String.format(

                    "userSetupComplete = %s, ignoring camera launch gesture.",