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

Disable keep_screen_on traces am: 44aabe4b72

Browse Source 
am: 3cb9edff41

* commit '3cb9edff41317a9b3627032918cf9cfc54f0eb88':
  Disable keep_screen_on traces

Change-Id: I57e74c20bfb4339dcac52ee85a89899b89ca237d
This commit is contained in:
Chong Zhang
2016-05-10 21:40:11 +00:00
committed by android-build-merger
parent c4b7595962 3cb9edff41
commit eb80f34310
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/ViewRootImpl.java
View File

@@ -125,6 +125,7 @@ public final class ViewRootImpl implements ViewParent,
private static final boolean DEBUG_CONFIGURATION = false || LOCAL_LOGV; private static final boolean DEBUG_CONFIGURATION = false || LOCAL_LOGV;
private static final boolean DEBUG_FPS = false; private static final boolean DEBUG_FPS = false;
private static final boolean DEBUG_INPUT_STAGES = false || LOCAL_LOGV; private static final boolean DEBUG_INPUT_STAGES = false || LOCAL_LOGV;
private static final boolean DEBUG_KEEP_SCREEN_ON = false || LOCAL_LOGV;
/** /**
* Set to false if we do not want to use the multi threaded renderer. Note that by disabling * Set to false if we do not want to use the multi threaded renderer. Note that by disabling
@@ -563,9 +564,10 @@ public final class ViewRootImpl implements ViewParent,
attrs = mWindowAttributes; attrs = mWindowAttributes;
setTag(); setTag();
if ((mClientWindowLayoutFlags&WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) != 0 if (DEBUG_KEEP_SCREEN_ON && (mClientWindowLayoutFlags
& WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) != 0
&& (attrs.flags&WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) == 0) { && (attrs.flags&WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) == 0) {
Slog.d(mTag, "setView: FLAG_KEEP_SCREEN_ON changed from true to false!!!"); Slog.d(mTag, "setView: FLAG_KEEP_SCREEN_ON changed from true to false!");
} }
// Keep track of the actual window flags supplied by the client. // Keep track of the actual window flags supplied by the client.
mClientWindowLayoutFlags = attrs.flags; mClientWindowLayoutFlags = attrs.flags;
@@ -894,9 +896,11 @@ public final class ViewRootImpl implements ViewParent,
final int oldInsetBottom = mWindowAttributes.surfaceInsets.bottom; final int oldInsetBottom = mWindowAttributes.surfaceInsets.bottom;
final int oldSoftInputMode = mWindowAttributes.softInputMode; final int oldSoftInputMode = mWindowAttributes.softInputMode;
final boolean oldHasManualSurfaceInsets = mWindowAttributes.hasManualSurfaceInsets; final boolean oldHasManualSurfaceInsets = mWindowAttributes.hasManualSurfaceInsets;
if ((mClientWindowLayoutFlags&WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) != 0
if (DEBUG_KEEP_SCREEN_ON && (mClientWindowLayoutFlags
& WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) != 0
&& (attrs.flags&WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) == 0) { && (attrs.flags&WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) == 0) {
Slog.d(mTag, "setLayoutParams: FLAG_KEEP_SCREEN_ON from true to false!!!"); Slog.d(mTag, "setLayoutParams: FLAG_KEEP_SCREEN_ON from true to false!");
} }
// Keep track of the actual window flags supplied by the client. // Keep track of the actual window flags supplied by the client.

2
services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
View File

@@ -75,5 +75,5 @@ public class WindowManagerDebugConfig {
static final boolean DEBUG_WINDOW_CROP = false; static final boolean DEBUG_WINDOW_CROP = false;
static final String TAG_KEEP_SCREEN_ON = "DebugKeepScreenOn"; static final String TAG_KEEP_SCREEN_ON = "DebugKeepScreenOn";
static final boolean DEBUG_KEEP_SCREEN_ON = true; static final boolean DEBUG_KEEP_SCREEN_ON = false;
} }