commit a44c50f3626685f6663a9fe3beb62a54baf94baa
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 12 19:17:58 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 12 19:18:02 2017 +0000
tree 92922b722ad705ea5b7ee50175f41c12911ae05c
parent d53cbfd0dc5f3c63d5ace4f67ff87fe8219a8fb1
parent 5b4b0fcc0e5f9c6cf6e6041fa7a450c996f4953e

Merge "Do not notifyNoFullUi if no view is focused" into oc-dev

services/autofill/java/com/android/server/autofill/Session.java

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 0d1eed4..6d58e72 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -1122,7 +1122,7 @@
 
     private void notifyUnavailableToClient() {
         synchronized (mLock) {
-            if (!mHasCallback) return;
+            if (!mHasCallback || mCurrentViewId == null) return;
             try {
                 mClient.notifyNoFillUi(id, mCurrentViewId);
             } catch (RemoteException e) {