commit a6c406bb59fb1a0399e093eabd745df3978e4c81
author Unsuk Jung <unsuk@google.com> Thu Sep 03 22:05:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 22:05:26 2015 +0000
tree 795ac5f1bd8cf5597afe2ca44ed39be3dba09cef
parent edda4b4490ad6918db4b1e2a33a7ed22959be432
parent c20407415bca4969e1455d541f6a9fcc63a0569f

am c2040741: Merge "Explicitly call out FEATURE_LOCATION_NETWORK as optional" into lmp-sprout-dev

* commit 'c20407415bca4969e1455d541f6a9fcc63a0569f':
  Explicitly call out FEATURE_LOCATION_NETWORK as optional

apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
index c0895d7..105e92b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -220,6 +220,9 @@
             new Feature(PackageManager.FEATURE_SENSOR_RELATIVE_HUMIDITY, false),
             new Feature(PackageManager.FEATURE_VERIFIED_BOOT, false),
 
+            // Features explicitly made optional in L
+            new Feature("PackageManager.FEATURE_LOCATION_NETWORK", false),
+
             // New hidden features in L
             new Feature("android.hardware.ethernet", false),
             new Feature("android.hardware.hdmi.cec", false),