commit 692e68e7a2b8d7028d5b4e7d44da6697974f8d2f
author Etan Cohen <etancohen@google.com> Thu Sep 14 15:42:01 2017 -0700
committer Etan Cohen <etancohen@google.com> Tue Oct 03 07:01:05 2017 -0700
tree 925b7c4ca54378cfee49c25c8ac69897a7ba8d38
parent 17ba47254ceabc27c3c8ebc8728fa6c0d55975bc

[RTT2] Add API for testing whether feature exists on platform

Add PackageManager API which allows apps to test whether the platform
officially supports the Wi-Fi RTT API.

Only start the RTT service if the device supports it.

Bug: 65014628
Test: integration tests pass
Change-Id: Ie88bd29ccd592e9a29ff24e8cc346afc360f03b0

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 6fc614b..1d385b5 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1079,8 +1079,15 @@
                 if (!disableRtt) {
                     traceBeginAndSlog("StartWifiRtt");
                     mSystemServiceManager.startService("com.android.server.wifi.RttService");
-                    mSystemServiceManager.startService("com.android.server.wifi.rtt.RttService");
                     traceEnd();
+
+                    if (context.getPackageManager().hasSystemFeature(
+                            PackageManager.FEATURE_WIFI_RTT)) {
+                        traceBeginAndSlog("StartRttService");
+                        mSystemServiceManager.startService(
+                                "com.android.server.wifi.rtt.RttService");
+                        traceEnd();
+                    }
                 }
 
                 if (context.getPackageManager().hasSystemFeature(
@@ -1088,8 +1095,6 @@
                     traceBeginAndSlog("StartWifiAware");
                     mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS);
                     traceEnd();
-                } else {
-                    Slog.i(TAG, "No Wi-Fi Aware Service (Aware support Not Present)");
                 }
 
                 if (context.getPackageManager().hasSystemFeature(