commit 7a6e3a63a1d0c71e4a0d22284a5ee729b2cd23f9
author Alex Salo <asalo@google.com> Wed Feb 27 15:08:15 2019 -0800
committer Alex Salo <asalo@google.com> Mon Mar 18 14:40:52 2019 -0700
tree 5a41501d83ef446ee93a5a7798666bb3eb81c7d2
parent 18c3f0c4a88203ffb9573150586262d00f4ba910

Don't start AttentionService if not configured

Bug: 126472143, 111939367
Test: manually

Change-Id: Iffbda6c38a3aca88599bc544c079cc8b6e39f2ff

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 3de3152..849fb42 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1231,6 +1231,7 @@
             }
 
             startContentCaptureService(context);
+            startAttentionService(context);
 
             // App prediction manager service
             traceBeginAndSlog("StartAppPredictionService");
@@ -1285,10 +1286,6 @@
                 traceEnd();
             }
 
-            traceBeginAndSlog("StartAttentionManagerService");
-            mSystemServiceManager.startService(AttentionManagerService.class);
-            traceEnd();
-
             traceBeginAndSlog("StartNetworkScoreService");
             mSystemServiceManager.startService(NetworkScoreService.Lifecycle.class);
             traceEnd();
@@ -2261,6 +2258,17 @@
         traceEnd();
     }
 
+    private void startAttentionService(@NonNull Context context) {
+        if (!AttentionManagerService.isServiceConfigured(context)) {
+            Slog.d(TAG, "AttentionService is not configured on this device");
+            return;
+        }
+
+        traceBeginAndSlog("StartAttentionManagerService");
+        mSystemServiceManager.startService(AttentionManagerService.class);
+        traceEnd();
+    }
+
     static final void startSystemUi(Context context, WindowManagerService windowManager) {
         Intent intent = new Intent();
         intent.setComponent(new ComponentName("com.android.systemui",