Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add tracepoint for gesture navigation launching the camera" into qt-dev

Browse Source
This commit is contained in:
Ioannis Ilkos
2019-05-23 10:43:54 +00:00
committed by Android (Google) Code Review
parent f6ca3f4e8f 5390be36c1
commit c543913a79
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
services/core/java/com/android/server/GestureLauncherService.java
View File

@@ -35,6 +35,7 @@ import android.os.PowerManager;
import android.os.PowerManager.WakeLock; import android.os.PowerManager.WakeLock;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.Trace;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.util.MutableBoolean; import android.util.MutableBoolean;
@@ -404,26 +405,35 @@ public class GestureLauncherService extends SystemService {
*/ */
@VisibleForTesting @VisibleForTesting
boolean handleCameraGesture(boolean useWakelock, int source) { boolean handleCameraGesture(boolean useWakelock, int source) {
boolean userSetupComplete = Settings.Secure.getIntForUser(mContext.getContentResolver(), Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "GestureLauncher:handleCameraGesture");
Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0; try {
if (!userSetupComplete) { boolean userSetupComplete = Settings.Secure.getIntForUser(mContext.getContentResolver(),
if (DBG) Slog.d(TAG, String.format( Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;
"userSetupComplete = %s, ignoring camera gesture.", if (!userSetupComplete) {
userSetupComplete)); if (DBG) {
return false; Slog.d(TAG, String.format(
} "userSetupComplete = %s, ignoring camera gesture.",
if (DBG) Slog.d(TAG, String.format( userSetupComplete));
"userSetupComplete = %s, performing camera gesture.", }
userSetupComplete)); return false;
}
if (DBG) {
Slog.d(TAG, String.format(
"userSetupComplete = %s, performing camera gesture.",
userSetupComplete));
}
if (useWakelock) { if (useWakelock) {
// Make sure we don't sleep too early // Make sure we don't sleep too early
mWakeLock.acquire(500L); 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() { private final BroadcastReceiver mUserReceiver = new BroadcastReceiver() {