commit 7f70fc7bef5670bdcbc828dde2189966753fbc58
author Michael Kwan <mkwan@google.com> Fri Jul 20 16:12:19 2018 -0700
committer Michael Kwan <mkwan@google.com> Tue Jul 24 17:15:05 2018 +0000
tree 0a8b4f14a8c5a698051114959b6199b2dad1ee33
parent 0502d90f672324cfffc8e1fdd69adafbdec30421

Watch type devices currently do not support instant apps, prevent
related services from launching.

Bug: 111598607
Test: manual test
Change-Id: I5cc6909ecb287ece5b964ea6c7c685dbe767c895

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 85de581..86c5175 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1552,13 +1552,15 @@
             }
             traceEnd();
 
-            traceBeginAndSlog("StartPruneInstantAppsJobService");
-            try {
-                PruneInstantAppsJobService.schedule(context);
-            } catch (Throwable e) {
-                reportWtf("StartPruneInstantAppsJobService", e);
+            if (!isWatch) {
+                traceBeginAndSlog("StartPruneInstantAppsJobService");
+                try {
+                    PruneInstantAppsJobService.schedule(context);
+                } catch (Throwable e) {
+                    reportWtf("StartPruneInstantAppsJobService", e);
+                }
+                traceEnd();
             }
-            traceEnd();
 
             // LauncherAppsService uses ShortcutService.
             traceBeginAndSlog("StartShortcutServiceLifecycle");