From e3ca05bbf94fdc746d29d367b76550b40161f69b Mon Sep 17 00:00:00 2001
From: Joanne Chung <joannechung@google.com>
Date: Wed, 13 Nov 2019 11:01:42 +0800
Subject: [PATCH] Fix NPE when onStopUser.

The default value of mConnection is null, it initializes lazy when we
are serving the first request. Due to no request comes, the mConnection
keeps null which causes NPE.

Bug: 144356634
Test: Manual. Create work profile. Make usre no NPE when stop work profile.
Change-Id: Id656a83989e18ac6f62c1456609bd55e44663914
---
 .../textclassifier/TextClassificationManagerService.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java b/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
index 4d0788f7fdbd6..7d905bae44913 100644
--- a/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
+++ b/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
@@ -120,7 +120,9 @@ public final class TextClassificationManagerService extends ITextClassifierServi
             synchronized (mManagerService.mLock) {
                 UserState userState = mManagerService.peekUserStateLocked(userId);
                 if (userState != null) {
-                    userState.mConnection.cleanupService();
+                    if (userState.mConnection != null) {
+                        userState.mConnection.cleanupService();
+                    }
                     mManagerService.mUserStates.remove(userId);
                 }
             }