diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2018-03-27 17:54:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-27 17:54:21 +0000 |
| commit | b394251d90e1a3e6aad36cc16d4255e42e4f98cc (patch) | |
| tree | 47cd82432794af2dea76cef3ed0d0c2ee111c8de | |
| parent | f505f0dcf4142a0bec6bdcf21cf3e94570b1139f (diff) | |
| parent | dfd5e7b69b36805308e2f6a502ecd46f09e67f78 (diff) | |
| download | MediaProvider-b394251d90e1a3e6aad36cc16d4255e42e4f98cc.tar.gz | |
Merge "Don't leak MtpDatabase receiver." into pi-dev
| -rw-r--r-- | src/com/android/providers/media/MtpService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/providers/media/MtpService.java b/src/com/android/providers/media/MtpService.java index cbf7b2ec3..072001019 100644 --- a/src/com/android/providers/media/MtpService.java +++ b/src/com/android/providers/media/MtpService.java @@ -121,6 +121,11 @@ public class MtpService extends Service { @Override public void onDestroy() { mStorageManager.unregisterListener(mStorageEventListener); + synchronized (MtpService.class) { + if (sServerHolder != null) { + sServerHolder.database.setServer(null); + } + } } @Override |