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

Commit 80f36873 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes from topic "wifi_overlay" 

* changes:
  WifiManager: Add @SystemApi for STA/AP MAC randomization
  wifi: Formalize wifi resource usages
parents 0b646e51 b55ba05c

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ package android { 














  public static final class R.drawable {















    field public static final int ic_info = 17301684; // 0x10800b4













    field public static final int stat_notify_wifi_in_range = 17301685; // 0x10800b5















  }





























  public static final class R.raw {









@@ -268,6 +269,9 @@ package android {













    field public static final int config_helpIntentNameKey = 17039390; // 0x104001e















    field public static final int config_helpPackageNameKey = 17039387; // 0x104001b















    field public static final int config_helpPackageNameValue = 17039388; // 0x104001c













    field public static final int notification_channel_network_alerts = 17039398; // 0x1040026













    field public static final int notification_channel_network_available = 17039399; // 0x1040027













    field public static final int notification_channel_network_status = 17039397; // 0x1040025















  }





























  public static final class R.style {










@@ -4828,6 +4832,8 @@ package android.net.wifi {













    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();















    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();















    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getWifiApState();













    method public boolean isApMacRandomizationSupported();













    method public boolean isConnectedMacRandomizationSupported();















    method @Deprecated public boolean isDeviceToDeviceRttSupported();















    method public boolean isPortableHotspotSupported();















    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiApEnabled();

































config/hiddenapi-greylist.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -793,7 +793,6 @@ Lcom/android/internal/R$id;->media_actions:I













Lcom/android/internal/R$id;->message:I















Lcom/android/internal/R$id;->minute:I















Lcom/android/internal/R$id;->month:I













Lcom/android/internal/R$id;->name:I















Lcom/android/internal/R$id;->notification_header:I















Lcom/android/internal/R$id;->ok:I















Lcom/android/internal/R$id;->overlay:I

































core/res/res/drawable/ic_wifi_settings.xml
deleted100644 → 0



+0
−41




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!--













    Copyright (C) 2017 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.













-->













<vector xmlns:android="http://schemas.android.com/apk/res/android"













    android:width="24dp"













    android:height="24dp"













    android:viewportWidth="24"













    android:viewportHeight="24">



























    <path













        android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />













    <path













        android:fillColor="#000000"













        android:pathData="M12.584,15.93c0.026-0.194,0.044-0.397,0.044-0.608c0-0.211-0.018-0.405-0.044-0.608l1.304-1.022













c0.115-0.088,0.15-0.256,0.071-0.397l-1.234-2.133c-0.071-0.132-0.238-0.185-0.379-0.132l-1.533,0.617













c-0.317-0.247-0.67-0.449-1.04-0.608L9.535,9.4c-0.018-0.132-0.141-0.247-0.3-0.247H6.768c-0.15,0-0.282,0.115-0.3,0.256













L6.23,11.048c-0.379,0.159-0.723,0.361-1.04,0.608l-1.533-0.617c-0.141-0.053-0.3,0-0.379,0.132l-1.234,2.133













c-0.079,0.132-0.044,0.3,0.07,0.397l1.304,1.022c-0.026,0.194-0.044,0.405-0.044,0.608s0.018,0.405,0.044,0.608l-1.304,1.022













c-0.115,0.088-0.15,0.256-0.07,0.397l1.234,2.133c0.07,0.132,0.238,0.185,0.379,0.132l1.533-0.617













c0.317,0.247,0.67,0.449,1.04,0.608l0.238,1.639c0.018,0.15,0.15,0.256,0.3,0.256h2.467c0.159,0,0.282-0.115,0.3-0.256













l0.238-1.639c0.379-0.15,0.723-0.361,1.04-0.608l1.533,0.617c0.141,0.053,0.3,0,0.379-0.132l1.234-2.133













c0.071-0.132,0.044-0.3-0.07-0.397L12.584,15.93z













M8.002,17.481c-1.19,0-2.159-0.969-2.159-2.159s0.969-2.159,2.159-2.159













s2.159,0.969,2.159,2.159C10.161,16.512,9.191,17.481,8.002,17.481z" />













    <path













        android:fillColor="#000000"













        android:pathData="M16.003,12.026l5.995-7.474c-0.229-0.172-2.537-2.06-6-2.06s-5.771,1.889-6,2.06l5.995,7.469l0.005,0.01L16.003,12.026z" />













</vector>










 No newline at end of file
























core/res/res/layout/wifi_p2p_dialog.xml
deleted100644 → 0



+0
−48




























Original line number
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.













-->



























<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"













    android:layout_width="wrap_content"













    android:layout_height="wrap_content">



























    <LinearLayout













        android:layout_width="wrap_content"













        android:layout_height="wrap_content"













        android:orientation="vertical">



























        <LinearLayout android:id="@+id/info"













            style="@style/wifi_section" />



























        <LinearLayout android:id="@+id/enter_pin_section"













            style="@style/wifi_section"













            android:visibility="gone">



























            <LinearLayout













                style="@style/wifi_item">













                <TextView













                    android:text="@string/wifi_p2p_enter_pin_message"













                    style="@style/wifi_item_label" />



























                <EditText android:id="@+id/wifi_p2p_wps_pin"













                        android:singleLine="true"













                        android:maxLines="8"













                        android:inputType="number"













                        style="@style/wifi_item_content" />













            </LinearLayout>













        </LinearLayout>













    </LinearLayout>



























</ScrollView>
























core/res/res/layout/wifi_p2p_dialog_row.xml
deleted100644 → 0



+0
−28




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!-- Copyright (C) 2010 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.













-->



























<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"













    style="@style/wifi_item">













    <TextView













            style="@style/wifi_item_label"













            android:id="@+id/name" />



























    <TextView













            android:id="@+id/value"













            style="@style/wifi_item_content"













            android:textStyle="bold"













            android:textAlignment="viewStart" />













</LinearLayout>