diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-11-20 09:44:08 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-03-01 13:19:11 -0800 |
| commit | 1fb3d87da306082cdde1b2d913d0cdc728a08189 (patch) | |
| tree | bb68ecdb2807b4e593c7f2ec936f37d8b79742d4 | |
| parent | 492582667f9fadb7d178238b86b20e2c83eb2279 (diff) | |
| download | base-1fb3d87da306082cdde1b2d913d0cdc728a08189.tar.gz | |
Fix missing observer reply callbacks
This was causing upto 2 seconds in user switching delay.
Bug: 25813588
Change-Id: Icf23b021f134a8ccfa2dae470af02b2da7454acc
(cherry picked from commit dbb75248b19366d76cfdd7d4536d68467e7322c1)
| -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 { |