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

Merge "Fix issue #5186318: Can't take multiple screenshots"

Browse Source
This commit is contained in:
Dianne Hackborn
2011-08-19 14:48:40 -07:00
committed by Android (Google) Code Review
parent 067bb3b443 c0e3f2453c
commit cd94303e8a
1 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -2398,10 +2398,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
} }
final Object mScreenshotLock = new Object();
ServiceConnection mScreenshotConnection = null; ServiceConnection mScreenshotConnection = null;
Runnable mScreenshotTimeout = null; Runnable mScreenshotTimeout = null;
void finishScreenshot(ServiceConnection conn) { void finishScreenshotLSS(ServiceConnection conn) {
if (mScreenshotConnection == conn) { if (mScreenshotConnection == conn) {
mContext.unbindService(conn); mContext.unbindService(conn);
mScreenshotConnection = null; mScreenshotConnection = null;
@@ -2416,48 +2417,56 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mScreenshotConnection != null) { synchronized (mScreenshotLock) {
return; if (mScreenshotConnection != null) {
} return;
ComponentName cn = new ComponentName("com.android.systemui",
"com.android.systemui.screenshot.TakeScreenshotService");
Intent intent = new Intent();
intent.setComponent(cn);
ServiceConnection conn = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
if (mScreenshotConnection != this) {
return;
}
Messenger messenger = new Messenger(service);
Message msg = Message.obtain(null, 1);
final ServiceConnection myConn = this;
Handler h = new Handler(mHandler.getLooper()) {
@Override
public void handleMessage(Message msg) {
finishScreenshot(myConn);
}
};
msg.replyTo = new Messenger(h);
try {
messenger.send(msg);
} catch (RemoteException e) {
}
} }
@Override ComponentName cn = new ComponentName("com.android.systemui",
public void onServiceDisconnected(ComponentName name) {} "com.android.systemui.screenshot.TakeScreenshotService");
}; Intent intent = new Intent();
if (mContext.bindService(intent, conn, Context.BIND_AUTO_CREATE)) { intent.setComponent(cn);
mScreenshotConnection = conn; ServiceConnection conn = new ServiceConnection() {
mScreenshotTimeout = new Runnable() { @Override
@Override public void run() { public void onServiceConnected(ComponentName name, IBinder service) {
if (mScreenshotConnection != null) { synchronized (mScreenshotLock) {
finishScreenshot(mScreenshotConnection); if (mScreenshotConnection != this) {
return;
}
Messenger messenger = new Messenger(service);
Message msg = Message.obtain(null, 1);
final ServiceConnection myConn = this;
Handler h = new Handler(mHandler.getLooper()) {
@Override
public void handleMessage(Message msg) {
synchronized (mScreenshotLock) {
finishScreenshotLSS(myConn);
}
}
};
msg.replyTo = new Messenger(h);
try {
messenger.send(msg);
} catch (RemoteException e) {
}
} }
} }
@Override
public void onServiceDisconnected(ComponentName name) {}
}; };
mHandler.postDelayed(mScreenshotTimeout, 10000); if (mContext.bindService(intent, conn, Context.BIND_AUTO_CREATE)) {
mScreenshotConnection = conn;
mScreenshotTimeout = new Runnable() {
@Override public void run() {
synchronized (mScreenshotLock) {
if (mScreenshotConnection != null) {
finishScreenshotLSS(mScreenshotConnection);
}
}
}
};
mHandler.postDelayed(mScreenshotTimeout, 10000);
}
} }
} }
}); });