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

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

Snap for 6329815 from 858f64b4 to rvc-release 

Change-Id: Iedd96df46ee8cb5d70df6fbb173b2acc2f6a077f
parents 0862e5f2 858f64b4

common/moduleutils/src/android/net/shared/ProvisioningConfiguration.java

+14 −4
Original line number Original line Diff line number Diff line
@@ -29,7 +29,9 @@ import android.net.ScanResultInfoParcelable; 
import android.net.StaticIpConfiguration;

import android.net.StaticIpConfiguration;

import android.net.apf.ApfCapabilities;

import android.net.apf.ApfCapabilities;

import android.net.ip.IIpClient;

import android.net.ip.IIpClient;

import android.util.Log;





import java.nio.BufferUnderflowException;

import java.nio.ByteBuffer;

import java.nio.ByteBuffer;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;
@@ -61,6 +63,8 @@ import java.util.StringJoiner; 
 * @hide

 * @hide

 */

 */

public class ProvisioningConfiguration {

public class ProvisioningConfiguration {

    private static final String TAG = "ProvisioningConfiguration";



    // TODO: Delete this default timeout once those callers that care are

    // TODO: Delete this default timeout once those callers that care are

    // fixed to pass in their preferred timeout.

    // fixed to pass in their preferred timeout.

    //

    //
@@ -281,7 +285,7 @@ public class ProvisioningConfiguration { 
            public InformationElementParcelable toStableParcelable() {

            public InformationElementParcelable toStableParcelable() {

                final InformationElementParcelable p = new InformationElementParcelable();

                final InformationElementParcelable p = new InformationElementParcelable();

                p.id = mId;

                p.id = mId;

                p.payload = mPayload.clone();

                p.payload = mPayload != null ? mPayload.clone() : null;

                return p;

                return p;

            }

            }
@@ -367,12 +371,18 @@ public class ProvisioningConfiguration { 




        private static byte[] convertToByteArray(final ByteBuffer buffer) {

        private static byte[] convertToByteArray(final ByteBuffer buffer) {

            if (buffer == null) return null;

            if (buffer == null) return null;

            byte[] bytes = new byte[buffer.limit()];

            final byte[] bytes = new byte[buffer.limit()];

            final ByteBuffer copy = buffer.asReadOnlyBuffer();

            final ByteBuffer copy = buffer.asReadOnlyBuffer();

            try {

                copy.position(0);

                copy.get(bytes);

                copy.get(bytes);

            } catch (BufferUnderflowException e) {

                Log.wtf(TAG, "Buffer under flow exception should never happen.");

            } finally {

                return bytes;

                return bytes;

            }

            }

        }

        }

    }





    public boolean mEnableIPv4 = true;

    public boolean mEnableIPv4 = true;

    public boolean mEnableIPv6 = true;

    public boolean mEnableIPv6 = true;

res/values-af/strings.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
    <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" msgid="4563643884927480998">"Gekoppel"</string>

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

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

    <string name="tap_for_info" msgid="6849746325626883711">"Is gekoppel / Tik om webwerf te bekyk"</string>

    <skip />

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

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

</resources>
 
</resources>

res/values-am/strings.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
    <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" msgid="4563643884927480998">"ተገናኝቷል"</string>

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

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

    <string name="tap_for_info" msgid="6849746325626883711">"ተገናኝቷል / የድር ጣቢያን ለማየት መታ ያድርጉ"</string>

    <skip />

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

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

</resources>
 
</resources>

res/values-ar/strings.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
    <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" msgid="4563643884927480998">"الجهاز متصل الآن بالإنترنت."</string>

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

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

    <string name="tap_for_info" msgid="6849746325626883711">"متصل بالشبكة، انقر للانتقال إلى الموقع الإلكتروني"</string>

    <skip />

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

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

</resources>
 
</resources>

res/values-az/strings.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
    <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Şəbəkənin məkan məlumatı"</string>

    <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Şəbəkənin məkan məlumatı"</string>

    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Şəbəkədə məkan məlumatı səhifəsi olduğunu göstərən bildirişlər"</string>

    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Şəbəkədə məkan məlumatı səhifəsi olduğunu göstərən bildirişlər"</string>

    <string name="connected" msgid="4563643884927480998">"Qoşulub"</string>

    <string name="connected" msgid="4563643884927480998">"Qoşulub"</string>

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

    <string name="tap_for_info" msgid="6849746325626883711">"Qoşulub / Veb sayta baxmaq üçün toxunun"</string>

    <skip />

    <string name="application_label" msgid="8095087899576605955">"Bağlantı Meneceri"</string>

    <string name="application_label" msgid="8095087899576605955">"Bağlantı Meneceri"</string>

</resources>
 
</resources>