Merge "Fix missing observer reply callbacks" into mnc-dr-dev am: d1811e07d5 am: a3798d7a92 am: d6de840957

am: b9f686968c

* commit 'b9f686968cbbf953700f68be0076a461a71e5b67':
  Fix missing observer reply callbacks

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

@@ -398,6 +398,12 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
                 @Override
                 public void onUserSwitching(int newUserId) throws RemoteException {
                     mUserInfoController.reloadUserInfo();
+                    if (reply != null) {
+                        try {
+                            reply.sendResult(null);
+                        } catch (RemoteException e) {
+                        }
+                    }
                 }
 
                 @Override

services/core/java/com/android/server/fingerprint/FingerprintService.java

@@ -1186,6 +1186,12 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
                     public void onUserSwitching(int newUserId) throws RemoteException {
                         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 {