Merge "Pull showStrictModeViolation off of local threads." into jb-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
208236dd96
@ -5248,9 +5248,14 @@ public class WindowManagerService extends IWindowManager.Stub
|
|||||||
|
|
||||||
// TODO: more accounting of which pid(s) turned it on, keep count,
|
// TODO: more accounting of which pid(s) turned it on, keep count,
|
||||||
// only allow disables from pids which have count on, etc.
|
// only allow disables from pids which have count on, etc.
|
||||||
|
@Override
|
||||||
public void showStrictModeViolation(boolean on) {
|
public void showStrictModeViolation(boolean on) {
|
||||||
if (mHeadless) return;
|
if (mHeadless) return;
|
||||||
|
mH.sendMessage(mH.obtainMessage(H.SHOW_STRICT_MODE_VIOLATION, on ? 1 : 0, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void showStrictModeViolation(int arg) {
|
||||||
|
final boolean on = arg != 0;
|
||||||
int pid = Binder.getCallingPid();
|
int pid = Binder.getCallingPid();
|
||||||
synchronized(mWindowMap) {
|
synchronized(mWindowMap) {
|
||||||
// Ignoring requests to enable the red border from clients
|
// Ignoring requests to enable the red border from clients
|
||||||
@ -6714,6 +6719,7 @@ public class WindowManagerService extends IWindowManager.Stub
|
|||||||
public static final int BOOT_TIMEOUT = 23;
|
public static final int BOOT_TIMEOUT = 23;
|
||||||
public static final int WAITING_FOR_DRAWN_TIMEOUT = 24;
|
public static final int WAITING_FOR_DRAWN_TIMEOUT = 24;
|
||||||
public static final int BULK_UPDATE_PARAMETERS = 25;
|
public static final int BULK_UPDATE_PARAMETERS = 25;
|
||||||
|
public static final int SHOW_STRICT_MODE_VIOLATION = 26;
|
||||||
|
|
||||||
public static final int ANIMATOR_WHAT_OFFSET = 100000;
|
public static final int ANIMATOR_WHAT_OFFSET = 100000;
|
||||||
public static final int SET_TRANSPARENT_REGION = ANIMATOR_WHAT_OFFSET + 1;
|
public static final int SET_TRANSPARENT_REGION = ANIMATOR_WHAT_OFFSET + 1;
|
||||||
@ -7179,6 +7185,11 @@ public class WindowManagerService extends IWindowManager.Stub
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case SHOW_STRICT_MODE_VIOLATION: {
|
||||||
|
showStrictModeViolation(msg.arg1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
// Animation messages. Move to Window{State}Animator
|
// Animation messages. Move to Window{State}Animator
|
||||||
case SET_TRANSPARENT_REGION: {
|
case SET_TRANSPARENT_REGION: {
|
||||||
Pair<WindowStateAnimator, Region> pair =
|
Pair<WindowStateAnimator, Region> pair =
|
||||||
|
Reference in New Issue
Block a user