diff options
| author | 2011-09-07 11:24:16 -0700 | |
|---|---|---|
| committer | 2011-09-07 11:51:48 -0700 | |
| commit | 45b8b464992bbfa9bd2a587f05c1e1723aedcecd (patch) | |
| tree | 50dac8e1ca44a16ee6995b70b99b0a415105203e | |
| parent | 8b55e926f1a50cf38596be915603c08afd1f27ac (diff) | |
Add feature definition for Wi-Fi Direct
Bug: 5267396
Change-Id: I4f61b0afd1466420ab951f6d74ec444036772b21
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 7 | ||||
| -rw-r--r-- | data/etc/android.hardware.wifi.direct.xml | 20 |
3 files changed, 28 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index f8b7bd9ffc6b..0b10d86562e4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6211,6 +6211,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host"; field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi"; + field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct"; field public static final int GET_ACTIVITIES = 1; // 0x1 field public static final int GET_CONFIGURATIONS = 16384; // 0x4000 field public static final int GET_DISABLED_COMPONENTS = 512; // 0x200 diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 5c641f10b753..b4e3988be62d 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1021,6 +1021,13 @@ public abstract class PackageManager { public static final String FEATURE_WIFI = "android.hardware.wifi"; /** + * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device supports Wi-Fi Direct networking. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct"; + + /** * Action to external storage service to clean out removed apps. * @hide */ diff --git a/data/etc/android.hardware.wifi.direct.xml b/data/etc/android.hardware.wifi.direct.xml new file mode 100644 index 000000000000..78cb4747fbf2 --- /dev/null +++ b/data/etc/android.hardware.wifi.direct.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- This is the standard feature indicating that the device includes WiFi Direct. --> +<permissions> + <feature name="android.hardware.wifi.direct" /> +</permissions> |