summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2015-11-20 09:44:08 -0800
committerAddison Nuding <addison@google.com>2016-02-27 00:33:29 +0000
commitf66d1da6a5d811eef570a7181bc8d9eb31c59333 (patch)
tree7b1ed72161fc1a2e5989782f0b17dadc4132c2f1
parent2e0fb0f559374102ebb3963819f6f3a816e77709 (diff)
downloadbase-f66d1da6a5d811eef570a7181bc8d9eb31c59333.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.java6
-rw-r--r--services/core/java/com/android/server/fingerprint/FingerprintService.java6
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 {