summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2017-03-22 08:39:42 -0700
committer Jean-Michel Trivi <jmtrivi@google.com> 2017-03-22 08:39:42 -0700
commita00f86009eb84a96a2086d3e3e065bd812cdcee3 (patch)
tree34fb882ad03f0c52e8bbede3cd92cc8431c645b7
parent229ce701279110080dd9e4241637cc72347eb5d8 (diff)
PlayerBase: more general exception catching in release
When stopping AppOps watching in the player release, catch any exception to be safer. Test: see bug repro steps Bug: 36240191 Change-Id: I8e11cfc12c305878699dc57131e35e2a98eb7b16
-rw-r--r--media/java/android/media/PlayerBase.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/PlayerBase.java b/media/java/android/media/PlayerBase.java
index 1f5986f2c350..e634dc2f1d3c 100644
--- a/media/java/android/media/PlayerBase.java
+++ b/media/java/android/media/PlayerBase.java
@@ -254,7 +254,7 @@ public abstract class PlayerBase {
if (mAppOps != null) {
mAppOps.stopWatchingMode(mAppOpsCallback);
}
- } catch (RemoteException e) {
+ } catch (Exception e) {
// nothing to do here, the object is supposed to be released anyway
}
}