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

Merge "Fix calls to Rect.intersect(Rect)" into mnc-dev

Browse Source
This commit is contained in:
Doris Liu
2015-06-03 16:57:44 +00:00
committed by Android (Google) Code Review
parent 87e949c4b8 942bc58518
commit 8085da8d4c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/Image.java
View File

@@ -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;
}

6
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -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;
}