diff options
| -rw-r--r-- | services/core/java/com/android/server/GestureLauncherService.java | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java index 8077e3499bb2..de96aaa1d940 100644 --- a/services/core/java/com/android/server/GestureLauncherService.java +++ b/services/core/java/com/android/server/GestureLauncherService.java @@ -35,6 +35,7 @@ import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.os.SystemClock; import android.os.SystemProperties; +import android.os.Trace; import android.os.UserHandle; import android.provider.Settings; import android.util.MutableBoolean; @@ -404,26 +405,35 @@ public class GestureLauncherService extends SystemService { */ @VisibleForTesting boolean handleCameraGesture(boolean useWakelock, int source) { - 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 gesture.", - userSetupComplete)); - return false; - } - if (DBG) Slog.d(TAG, String.format( - "userSetupComplete = %s, performing camera gesture.", - userSetupComplete)); + Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "GestureLauncher:handleCameraGesture"); + try { + 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 gesture.", + userSetupComplete)); + } + return false; + } + if (DBG) { + Slog.d(TAG, String.format( + "userSetupComplete = %s, performing camera gesture.", + userSetupComplete)); + } - if (useWakelock) { - // Make sure we don't sleep too early - mWakeLock.acquire(500L); + if (useWakelock) { + // Make sure we don't sleep too early + mWakeLock.acquire(500L); + } + StatusBarManagerInternal service = LocalServices.getService( + StatusBarManagerInternal.class); + service.onCameraLaunchGestureDetected(source); + return true; + } finally { + Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); } - StatusBarManagerInternal service = LocalServices.getService( - StatusBarManagerInternal.class); - service.onCameraLaunchGestureDetected(source); - return true; } private final BroadcastReceiver mUserReceiver = new BroadcastReceiver() { |