resolved conflicts for merge of f31cbb to master (b61498d1) · Commits · e / os / android_frameworks_base

services/java/com/android/server/WindowManagerService.java

+529 −511

Original line number	Diff line number	Diff line
		@@ -202,6 +202,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
		long mLastBatteryStatsCallTime = 0;

		private static final String SYSTEM_SECURE = "ro.secure";
		private static final String SYSTEM_DEBUGGABLE = "ro.debuggable";

		/**
		* Condition waited on by {@link #reenableKeyguard} to know the call to
		@@ -3425,7 +3426,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
		* @see com.android.server.ViewServer#VIEW_SERVER_DEFAULT_PORT
		*/
		public boolean startViewServer(int port) {
		if ("1".equals(SystemProperties.get(SYSTEM_SECURE, "0"))) {
		if (isSystemSecure()) {
		return false;
		}

		@@ -3457,6 +3458,11 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
		return false;
		}

		private boolean isSystemSecure() {
		return "1".equals(SystemProperties.get(SYSTEM_SECURE, "1")) &&
		"0".equals(SystemProperties.get(SYSTEM_DEBUGGABLE, "0"));
		}

		/**
		* Stops the view server if it exists.
		*
		@@ -3466,7 +3472,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
		* @see com.android.server.ViewServer
		*/
		public boolean stopViewServer() {
		if ("1".equals(SystemProperties.get(SYSTEM_SECURE, "0"))) {
		if (isSystemSecure()) {
		return false;
		}

		@@ -3488,7 +3494,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
		* @see com.android.server.ViewServer
		*/
		public boolean isViewServerRunning() {
		if ("1".equals(SystemProperties.get(SYSTEM_SECURE, "0"))) {
		if (isSystemSecure()) {
		return false;
		}

		@@ -3509,7 +3515,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
		* @return False if an error occured, true otherwise.
		*/
		boolean viewServerListWindows(Socket client) {
		if ("1".equals(SystemProperties.get(SYSTEM_SECURE, "0"))) {
		if (isSystemSecure()) {
		return false;
		}

		@@ -3576,7 +3582,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
		* not indicate whether the command itself was successful.
		*/
		boolean viewServerWindowCommand(Socket client, String command, String parameters) {
		if ("1".equals(SystemProperties.get(SYSTEM_SECURE, "0"))) {
		if (isSystemSecure()) {
		return false;
		}

		@@ -3787,10 +3793,13 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo

		Object targetObj = mKeyWaiter.waitForNextEventTarget(null, qev,
		ev, true, false);
		<<<<<<< HEAD:services/java/com/android/server/WindowManagerService.java

		if (MEASURE_LATENCY) {
		lt.sample("3 Last dispatch finished ", System.nanoTime() - qev.whenNano);
		}
		=======
		>>>>>>> f31cbb:services/java/com/android/server/WindowManagerService.java

		int action = ev.getAction();

		@@ -3828,8 +3837,12 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
		WindowState target = (WindowState)targetObj;

		final long eventTime = ev.getEventTime();
		<<<<<<< HEAD:services/java/com/android/server/WindowManagerService.java
		final long eventTimeNano = ev.getEventTimeNano();

		=======

		>>>>>>> f31cbb:services/java/com/android/server/WindowManagerService.java
		//Log.i(TAG, "Sending " + ev + " to " + target);

		if (uid != 0 && uid != target.mSession.mUid) {
		@@ -3846,12 +3859,17 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
		return false;
		}
		}
		<<<<<<< HEAD:services/java/com/android/server/WindowManagerService.java

		if (MEASURE_LATENCY) {
		lt.sample("4 in dispatchPointer ", System.nanoTime() - eventTimeNano);
		}

		if ((target.mAttrs.flags &
		=======

		if ((target.mAttrs.flags &
		>>>>>>> f31cbb:services/java/com/android/server/WindowManagerService.java
		WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES) != 0) {
		//target wants to ignore fat touch events
		boolean cheekPress = mPolicy.isCheekPressedAgainstScreen(ev);