commit 71a083ba59f3e934b6eff60e67b2255e40f631ea
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 07 01:24:55 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 07 01:24:56 2017 +0000
tree 541f0a871fb0e8eb33eed8fabc9f57421cdc7af7
parent 54d1ba782232c5aed7317afb95b94f2390d182cf
parent c729f699349f6bf57c50d64e88011964043403ef

Merge "Fix NPE in isForegroundAllowedLocked()"

src/com/android/nfc/cardemulation/PreferredServices.java

diff --git a/src/com/android/nfc/cardemulation/PreferredServices.java b/src/com/android/nfc/cardemulation/PreferredServices.java
index c550c56..01fe229 100644
--- a/src/com/android/nfc/cardemulation/PreferredServices.java
+++ b/src/com/android/nfc/cardemulation/PreferredServices.java
@@ -206,7 +206,7 @@
             // preferences.
             if (mForegroundCurrent != null) {
                 if (!isForegroundAllowedLocked(mForegroundCurrent))  {
-                    Log.d(TAG, "Removing foreground preferred service because of conflict.");
+                    Log.d(TAG, "Removing foreground preferred service.");
                     mForegroundRequested = null;
                     mForegroundUid = -1;
                     changed = true;
@@ -229,6 +229,10 @@
         }
         ApduServiceInfo serviceInfo = mServiceCache.getService(ActivityManager.getCurrentUser(),
                 service);
+        if (serviceInfo == null) {
+            Log.d(TAG, "Requested foreground service unexpectedly removed");
+            return false;
+        }
         // Do some sanity checking
         if (!mPaymentDefaults.preferForeground) {
             // Foreground apps are not allowed to override payment default
@@ -281,7 +285,7 @@
                     success = false;
                 }
             } else {
-                Log.e(TAG, "Requested foreground service conflicts with default payment app.");
+                Log.e(TAG, "Requested foreground service conflicts or was removed.");
             }
         }
         if (success) {