Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a58dce0 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Add feature definition for Wi-Fi Direct"

parents 58ba3eda 45b8b464

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -6214,6 +6214,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_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_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 = "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_ACTIVITIES = 1; // 0x1

    field public static final int GET_CONFIGURATIONS = 16384; // 0x4000

    field public static final int GET_CONFIGURATIONS = 16384; // 0x4000

    field public static final int GET_DISABLED_COMPONENTS = 512; // 0x200

    field public static final int GET_DISABLED_COMPONENTS = 512; // 0x200

core/java/android/content/pm/PackageManager.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -1020,6 +1020,13 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_WIFI = "android.hardware.wifi";

    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.

     * Action to external storage service to clean out removed apps.

     * @hide

     * @hide

data/etc/android.hardware.wifi.direct.xml

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
<?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>