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

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

Snap for 6318629 from 6351f34a to rvc-d1-release 

Change-Id: Ic66a5d4695f116182ad20e695a49a28c2823f706
parents bbcf06c8 6351f34a

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

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

    @Override

    public String getSsid(@Nullable NetworkCapabilities nc) {

    public String getSsid(@Nullable NetworkCapabilities nc) {

        if (nc == null) return null;

        if (nc == null) return null;

        return nc.getSSID();

        return nc.getSsid();

    }

    }





    @NonNull

    @NonNull

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,6 +44,6 @@ public class NetworkShimImpl extends com.android.networkstack.apishim.api29.Netw 
     */

     */

    @Override

    @Override

    public int getNetId() {

    public int getNetId() {

        return mNetwork.netId;

        return mNetwork.getNetId();

    }

    }

}
 
}

res/values-af/strings.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ 
    <skip />

    <skip />

    <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Netwerkplekinligting"</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="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="connected" msgid="4563643884927480998">"Gekoppel"</string>

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

    <!-- no translation found for tap_for_info (6849746325626883711) -->

    <skip />

    <string name="application_label" msgid="8095087899576605955">"Konnektiwiteitbestuurder"</string>

    <string name="application_label" msgid="8095087899576605955">"Konnektiwiteitbestuurder"</string>

</resources>
 
</resources>

res/values-am/strings.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ 
    <skip />

    <skip />

    <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"የአውታረ መረብ መድረክ መረጃ"</string>

    <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"የአውታረ መረብ መድረክ መረጃ"</string>

    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"አውታረ መረቡ የመድረክ መረጃ ግገጽ እንዳለው ለማመልከት ማሳወቂያዎች ይታያሉ"</string>

    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"አውታረ መረቡ የመድረክ መረጃ ግገጽ እንዳለው ለማመልከት ማሳወቂያዎች ይታያሉ"</string>

    <string name="connected_to_ssid_param1" msgid="2312858438037646286">"ከ%1$s ጋር ተገናኝቷል"</string>

    <string name="connected" msgid="4563643884927480998">"ተገናኝቷል"</string>

    <string name="connected" msgid="4563643884927480998">"ተገናኝቷል"</string>

    <string name="tap_for_info" msgid="5203220728001805560">"የመድረክ መረጃን ለማግኘት መታ ያድርጉ"</string>

    <!-- no translation found for tap_for_info (6849746325626883711) -->

    <skip />

    <string name="application_label" msgid="8095087899576605955">"የግንኙነት አስተዳዳሪ"</string>

    <string name="application_label" msgid="8095087899576605955">"የግንኙነት አስተዳዳሪ"</string>

</resources>
 
</resources>

res/values-ar/strings.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ 
    <skip />

    <skip />

    <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"معلومات عن المكان الذي يوفّر الشبكة"</string>

    <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"معلومات عن المكان الذي يوفّر الشبكة"</string>

    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"الإشعارات التي يتم عرضها لتشير إلى أن الشبكة تحتوي على صفحة معلومات عن المكان."</string>

    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"الإشعارات التي يتم عرضها لتشير إلى أن الشبكة تحتوي على صفحة معلومات عن المكان."</string>

    <string name="connected_to_ssid_param1" msgid="2312858438037646286">"‏تم الاتصال بشبكة %1$s"</string>

    <string name="connected" msgid="4563643884927480998">"الجهاز متصل الآن بالإنترنت."</string>

    <string name="connected" msgid="4563643884927480998">"الجهاز متصل الآن بالإنترنت."</string>

    <string name="tap_for_info" msgid="5203220728001805560">"انقر للحصول على معلومات عن المكان."</string>

    <!-- no translation found for tap_for_info (6849746325626883711) -->

    <skip />

    <string name="application_label" msgid="8095087899576605955">"مدير إمكانية الاتصال"</string>

    <string name="application_label" msgid="8095087899576605955">"مدير إمكانية الاتصال"</string>

</resources>
 
</resources>