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

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

Snap for 6903454 from 151a41f9 to sc-release 

Change-Id: Ia8a99c87a51ba4e6dfebe36e0d24fa223ce946d5
parents ae2b6e83 151a41f9

res/values-mn/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
    <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Сүлжээний байршлын мэдээлэл"</string>

    <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Сүлжээнд байршлын мэдээллийн хуудас байгааг заах зорилгоор харуулдаг мэдэгдэл"</string>

    <string name="connected" msgid="4563643884927480998">"Холбогдсон"</string>

    <string name="tap_for_info" msgid="6849746325626883711">"Холбогдсон / Вэб сайтыг үзэхийн тулд товшино уу"</string>

    <string name="tap_for_info" msgid="6849746325626883711">"Холбогдсон / Веб сайтыг үзэхийн тулд товшино уу"</string>

    <string name="application_label" msgid="1322847171305285454">"Сүлжээний менежер"</string>

</resources>

src/android/net/apf/ApfFilter.java

+5 −5
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ import static android.system.OsConstants.IPPROTO_TCP; 
import static android.system.OsConstants.IPPROTO_UDP;

import static android.system.OsConstants.SOCK_RAW;



import static com.android.server.util.NetworkStackConstants.ICMPV6_ECHO_REQUEST_TYPE;

import static com.android.server.util.NetworkStackConstants.ICMPV6_NEIGHBOR_ADVERTISEMENT;

import static com.android.server.util.NetworkStackConstants.ICMPV6_ROUTER_ADVERTISEMENT;

import static com.android.server.util.NetworkStackConstants.ICMPV6_ROUTER_SOLICITATION;

import static com.android.server.util.NetworkStackConstants.IPV6_ADDR_LEN;

import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ECHO_REQUEST_TYPE;

import static com.android.net.module.util.NetworkStackConstants.ICMPV6_NEIGHBOR_ADVERTISEMENT;

import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ROUTER_ADVERTISEMENT;

import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ROUTER_SOLICITATION;

import static com.android.net.module.util.NetworkStackConstants.IPV6_ADDR_LEN;



import android.content.BroadcastReceiver;

import android.content.Context;

src/android/net/dhcp/DhcpClient.java

+5 −5
Original line number Diff line number Diff line
@@ -51,11 +51,11 @@ import static android.system.OsConstants.SO_BROADCAST; 
import static android.system.OsConstants.SO_RCVBUF;

import static android.system.OsConstants.SO_REUSEADDR;



import static com.android.server.util.NetworkStackConstants.ARP_REQUEST;

import static com.android.server.util.NetworkStackConstants.ETHER_ADDR_LEN;

import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;

import static com.android.server.util.NetworkStackConstants.IPV4_CONFLICT_ANNOUNCE_NUM;

import static com.android.server.util.NetworkStackConstants.IPV4_CONFLICT_PROBE_NUM;

import static com.android.net.module.util.NetworkStackConstants.ARP_REQUEST;

import static com.android.net.module.util.NetworkStackConstants.ETHER_ADDR_LEN;

import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ANY;

import static com.android.net.module.util.NetworkStackConstants.IPV4_CONFLICT_ANNOUNCE_NUM;

import static com.android.net.module.util.NetworkStackConstants.IPV4_CONFLICT_PROBE_NUM;



import android.content.Context;

import android.net.DhcpResults;

src/android/net/dhcp/DhcpLeaseRepository.java

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import static android.net.dhcp.DhcpLease.inet4AddrToString; 
import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTH;

import static com.android.net.module.util.Inet4AddressUtils.intToInet4AddressHTH;

import static com.android.net.module.util.Inet4AddressUtils.prefixLengthToV4NetmaskIntHTH;

import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;

import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_BITS;

import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ANY;

import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_BITS;



import static java.lang.Math.min;

src/android/net/dhcp/DhcpPacket.java

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package android.net.dhcp;



import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ALL;

import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;

import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ALL;

import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ANY;



import android.net.DhcpResults;

import android.net.LinkAddress;