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

Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev

Browse Source 
am: 2a6f476

* commit '2a6f4768366b78965326710410fe938644feb60d':
  Camera2: Unlink camera device death listener on disconnect

Change-Id: Iddfc98e8d4aa699f1411d609589d729e323fb994
This commit is contained in:
Eino-Ville Talvala
2016-04-05 23:25:27 +00:00
committed by android-build-merger
parent 55b063f5aa 2a6f476836
commit 42b53cc1fc
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
View File

@@ -974,6 +974,7 @@ public class CameraDeviceImpl extends CameraDevice
if (mRemoteDevice != null) {
mRemoteDevice.disconnect();
mRemoteDevice.unlinkToDeath(this, /*flags*/0);
}
// Only want to fire the onClosed callback once;

5
core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java
View File

@@ -31,6 +31,7 @@ import android.hardware.camera2.ICameraDeviceUser;
import android.hardware.camera2.impl.CameraMetadataNative;
import android.hardware.camera2.params.OutputConfiguration;
import android.hardware.camera2.utils.SubmitInfo;
import android.os.IBinder;
import android.os.RemoteException;
import android.view.Surface;
@@ -53,6 +54,10 @@ public class ICameraDeviceUserWrapper {
mRemoteDevice = remoteDevice;
}
public void unlinkToDeath(IBinder.DeathRecipient recipient, int flags) {
mRemoteDevice.asBinder().unlinkToDeath(recipient, flags);
}
public void disconnect() {
try {
mRemoteDevice.disconnect();