diff options
| author | Addison Nuding <addison@google.com> | 2016-03-01 05:00:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-01 05:00:30 +0000 |
| commit | 834ea63173c1132b4af0faa57d0441f2786c556b (patch) | |
| tree | 38803eb2829bdbbae11cf065e270c2c92b5fd4c7 | |
| parent | baa413a0da57bd8506d1c51cbee0d6d1d6c228c5 (diff) | |
| parent | f66d1da6a5d811eef570a7181bc8d9eb31c59333 (diff) | |
| download | base-834ea63173c1132b4af0faa57d0441f2786c556b.tar.gz | |
Merge "Fix missing observer reply callbacks" into mnc-dr-ryu-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/fingerprint/FingerprintService.java | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index fa9c4bbcb485..83edc967c260 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -383,6 +383,12 @@ public class PhoneStatusBarPolicy implements Callback { @Override public void onUserSwitching(int newUserId, IRemoteCallback reply) { mUserInfoController.reloadUserInfo(); + if (reply != null) { + try { + reply.sendResult(null); + } catch (RemoteException e) { + } + } } @Override diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java index ec7c1c437d92..103ed0a9f0cf 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java @@ -1139,6 +1139,12 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe public void onUserSwitching(int newUserId, IRemoteCallback reply) { mHandler.obtainMessage(MSG_USER_SWITCHING, newUserId, 0 /* unused */) .sendToTarget(); + if (reply != null) { + try { + reply.sendResult(null); + } catch (RemoteException e) { + } + } } @Override public void onUserSwitchComplete(int newUserId) throws RemoteException { |