Attempt to fix bug with setActiveGroup() in FingerprintService.

This attempts to fix a crash where setActiveGroup is crashing because
there's no fingerprint hardware.

Attempt to fix bug 21224390

Change-Id: Iff1c6ebb68deb6662fcb4a58248b5a562d9da2c2

1 files changed, 5 insertions, 5 deletions

diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index f16fcb0..d725d94 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -626,16 +626,16 @@ public class FingerprintService extends SystemService {
     public void onStart() {
         publishBinderService(Context.FINGERPRINT_SERVICE, new FingerprintServiceWrapper());
         mHalDeviceId = nativeOpenHal();
-        if (mHalDeviceId != 0) {
-            updateActiveGroup(ActivityManager.getCurrentUser());
-        }
+        updateActiveGroup(ActivityManager.getCurrentUser());
         if (DEBUG) Slog.v(TAG, "Fingerprint HAL id: " + mHalDeviceId);
         listenForUserSwitches();
     }
 
     private void updateActiveGroup(int userId) {
-        File path = Environment.getUserSystemDirectory(userId);
-        nativeSetActiveGroup(userId, path.getAbsolutePath().getBytes());
+        if (mHalDeviceId != 0) {
+            File path = Environment.getUserSystemDirectory(userId);
+            nativeSetActiveGroup(userId, path.getAbsolutePath().getBytes());
+        }
     }
 
     private void listenForUserSwitches() {