diff options
| author | Dianne Hackborn <hackbod@google.com> | 2018-12-06 00:44:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-12-06 00:44:24 +0000 |
| commit | 77b13fd30aaf5f72bf6f6ec9a73ab860ff029d22 (patch) | |
| tree | b9e97745f5e058979eabcacf3b67ec1448bf4d99 /core/java/android/app/ContextImpl.java | |
| parent | 6f5ea0c11a79087dd1fa7c50dd77ff93a06aac05 (diff) | |
| parent | 2f55e5a929fade0a3cbb05f4c6636075811f7209 (diff) | |
Merge "Fix various issues in ordering of grouped bindings."
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 6f0b6c8687db..c7a9d99fe927 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1731,8 +1731,11 @@ class ContextImpl extends Context { throw new IllegalArgumentException("connection is null"); } if (mPackageInfo != null) { - IServiceConnection sd = mPackageInfo.forgetServiceDispatcher( - getOuterContext(), conn); + IServiceConnection sd = mPackageInfo.lookupServiceDispatcher(conn, getOuterContext()); + if (sd == null) { + throw new IllegalArgumentException("ServiceConnection not currently bound: " + + conn); + } try { ActivityManager.getService().updateServiceGroup(sd, group, importance); } catch (RemoteException e) { |