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

Merge "Prevent notifyScreenshotError() from calling twice" into nyc-mr1-dev

Browse Source
This commit is contained in:
Geoffrey Pitsch
2016-09-13 15:39:41 +00:00
committed by Android (Google) Code Review
parent e0ca918e23 b2d6ed3cd1
commit 221330f9f9
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -5534,7 +5534,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
@Override
public void onServiceDisconnected(ComponentName name) {
notifyScreenshotError();
synchronized (mScreenshotLock) {
if (mScreenshotConnection != null) {
mContext.unbindService(mScreenshotConnection);
mScreenshotConnection = null;
mHandler.removeCallbacks(mScreenshotTimeout);
notifyScreenshotError();
}
}
}
};
if (mContext.bindServiceAsUser(serviceIntent, conn,
@@ -7771,7 +7778,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
int delta = newRotation - oldRotation;
if (delta < 0) delta += 4;
// Likewise we don't rotate seamlessly for 180 degree rotations
// in this case the surfaces never resize, and our logic to
// in this case the surfaces never resize, and our logic to
// revert the transformations on size change will fail. We could
// fix this in the future with the "tagged" frames idea.
if (delta == Surface.ROTATION_180) {