Merge "Fix calls to Rect.intersect(Rect)" into mnc-dev (8085da8d) · Commits · e / os / android_frameworks_base

media/java/android/media/Image.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -228,7 +228,9 @@ public abstract class Image implements AutoCloseable {

		if (cropRect != null) {
		cropRect = new Rect(cropRect); // make a copy
		cropRect.intersect(0, 0, getWidth(), getHeight());
		if (!cropRect.intersect(0, 0, getWidth(), getHeight())) {
		cropRect.setEmpty();
		}
		}
		mCropRect = cropRect;
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -3240,8 +3240,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		// Clip to the window bounds.
		Rect windowBounds = mTempRect1;
		getWindowBounds(focus.getWindowId(), windowBounds);
		boundsInScreen.intersect(windowBounds);
		if (boundsInScreen.isEmpty()) {
		if (!boundsInScreen.intersect(windowBounds)) {
		return false;
		}

		@@ -3255,8 +3254,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		// Clip to the screen bounds.
		Point screenSize = mTempPoint;
		mDefaultDisplay.getRealSize(screenSize);
		boundsInScreen.intersect(0, 0, screenSize.x, screenSize.y);
		if (boundsInScreen.isEmpty()) {
		if (!boundsInScreen.intersect(0, 0, screenSize.x, screenSize.y)) {
		return false;
		}