summaryrefslogtreecommitdiff
path: root/services/java/com
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-04-12 21:17:29 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-04-12 21:17:33 +0000
commita402d6dd2f15e179d08cb0d5ffd668916e9a8bfb (patch)
tree74a98bfa4668bc7b2669484337e5e391e6b9ec2a /services/java/com
parentad6ab44e15a86c1130eef3b638343d47b5ada0e1 (diff)
parent43574b03e5604e346f088a1b0da2ab37fb115226 (diff)
Merge "Add autofill feature API" into oc-dev
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/SystemServer.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index e47da552c717..67f1a0a5c658 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1541,9 +1541,11 @@ public final class SystemServer {
mSystemServiceManager.startService(RetailDemoModeService.class);
traceEnd();
- traceBeginAndSlog("StartAutoFillService");
- mSystemServiceManager.startService(AUTO_FILL_MANAGER_SERVICE_CLASS);
- traceEnd();
+ if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_AUTOFILL)) {
+ traceBeginAndSlog("StartAutoFillService");
+ mSystemServiceManager.startService(AUTO_FILL_MANAGER_SERVICE_CLASS);
+ traceEnd();
+ }
// It is now time to start up the app processes...