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

Commit 51538905 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6301978 from 97397fad to rvc-d1-release 

Change-Id: I5bee345562ee8d81afe9d672064be70c638ad087
parents 6c8a8758 97397fad

AndroidManifestBase.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
          android:versionCode="11"

          android:versionName="Q-initial">

    <application

        android:label="NetworkStack"

        android:label="@string/application_label"

        android:defaultToDeviceProtectedStorage="true"

        android:directBootAware="true"

        android:usesCleartextTraffic="true">

apishim/29/com/android/networkstack/apishim/api29/NetworkInformationShimImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class NetworkInformationShimImpl implements NetworkInformationShim { 


    @Nullable

    @Override

    public String getSSID(@Nullable NetworkCapabilities nc) {

    public String getSsid(@Nullable NetworkCapabilities nc) {

        // Not supported on this API level

        return null;

    }

apishim/30/com/android/networkstack/apishim/NetworkInformationShimImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class NetworkInformationShimImpl extends 


    @Nullable

    @Override

    public String getSSID(@Nullable NetworkCapabilities nc) {

    public String getSsid(@Nullable NetworkCapabilities nc) {

        if (nc == null) return null;

        return nc.getSSID();

    }

apishim/common/com/android/networkstack/apishim/NetworkInformationShim.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public interface NetworkInformationShim { 
     * @see NetworkCapabilities#getSSID()

     */

    @Nullable

    String getSSID(@Nullable NetworkCapabilities nc);

    String getSsid(@Nullable NetworkCapabilities nc);



    /**

     * @see LinkProperties#makeSensitiveFieldsParcelingCopy()

res/values-af/strings.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

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

 -->



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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="notification_channel_name_connected" msgid="1795068343200033922">"Kontroleringsportaalstawing"</string>

    <string name="notification_channel_description_connected" msgid="1664506646629701401">"Kennisgewings word gewys wanneer die toestel suksesvol vir \'n kontroleringsportaalnetwerk gestaaf het"</string>

    <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Netwerkplekinligting"</string>

    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Kennisgewings word gewys om aan te dui dat die netwerk \'n plekinligtingbladsy het"</string>

    <string name="connected_to_ssid_param1" msgid="2312858438037646286">"Gekoppel aan %1$s"</string>

    <string name="connected" msgid="4563643884927480998">"Gekoppel"</string>

    <string name="tap_for_info" msgid="5203220728001805560">"Tik vir plekinligting"</string>

</resources>