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

Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev

Browse Source
This commit is contained in:
Jae Seo
2015-08-05 00:07:11 +00:00
committed by Android (Google) Code Review
parent 0d6168835a ac3f8e5534
commit 2094a702b3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
View File

@@ -127,10 +127,8 @@ public final class MediaProjectionManagerService extends SystemService
IBinder.DeathRecipient deathRecipient = new IBinder.DeathRecipient() { IBinder.DeathRecipient deathRecipient = new IBinder.DeathRecipient() {
@Override @Override
public void binderDied() { public void binderDied() {
synchronized (mLock) {
removeCallback(callback); removeCallback(callback);
} }
}
}; };
synchronized (mLock) { synchronized (mLock) {
mCallbackDelegate.add(callback); mCallbackDelegate.add(callback);
@@ -344,6 +342,7 @@ public final class MediaProjectionManagerService extends SystemService
public final String packageName; public final String packageName;
public final UserHandle userHandle; public final UserHandle userHandle;
private IMediaProjectionCallback mCallback;
private IBinder mToken; private IBinder mToken;
private IBinder.DeathRecipient mDeathEater; private IBinder.DeathRecipient mDeathEater;
private int mType; private int mType;
@@ -406,7 +405,8 @@ public final class MediaProjectionManagerService extends SystemService
throw new IllegalStateException( throw new IllegalStateException(
"Cannot start already started MediaProjection"); "Cannot start already started MediaProjection");
} }
registerCallback(callback); mCallback = callback;
registerCallback(mCallback);
try { try {
mToken = callback.asBinder(); mToken = callback.asBinder();
mDeathEater = new IBinder.DeathRecipient() { mDeathEater = new IBinder.DeathRecipient() {
@@ -435,8 +435,11 @@ public final class MediaProjectionManagerService extends SystemService
+ "pid=" + Binder.getCallingPid() + ")"); + "pid=" + Binder.getCallingPid() + ")");
return; return;
} }
mToken.unlinkToDeath(mDeathEater, 0);
stopProjectionLocked(this); stopProjectionLocked(this);
mToken.unlinkToDeath(mDeathEater, 0);
mToken = null;
unregisterCallback(mCallback);
mCallback = null;
} }
} }