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

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

Snap for 6314400 from 77c21141 to rvc-release

Change-Id: I7000dec632ef48e5bc43a2e0255bcec4d6a91dfa
parents a860ed26 77c21141
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class NetworkInformationShimImpl extends
    @NonNull
    @Override
    public LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull final LinkProperties lp) {
        return lp.makeSensitiveFieldsParcelingCopy();
        return new LinkProperties(lp, true);
    }

    @Override
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public interface NetworkInformationShim {
    String getSsid(@Nullable NetworkCapabilities nc);

    /**
     * @see LinkProperties#makeSensitiveFieldsParcelingCopy()
     * @see LinkProperties#LinkProperties(LinkProperties, boolean)
     */
    @NonNull
    LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull LinkProperties lp);
+8 −11
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@

package android.net.networkstack;

import static android.content.Context.NETWORK_STACK_SERVICE;
import static android.os.Build.VERSION.SDK_INT;

import android.annotation.NonNull;
import android.content.Context;
import android.net.INetworkStackConnector;
import android.net.NetworkStack;
import android.os.Build;
import android.os.IBinder;
import android.util.Log;
@@ -47,14 +47,14 @@ public class ModuleNetworkStackClient extends NetworkStackClientBase {
        // TODO(b/149676685): change this check to "< R" once R is defined
        if (SDK_INT < Build.VERSION_CODES.Q
                || (SDK_INT == Build.VERSION_CODES.Q && "REL".equals(Build.VERSION.CODENAME))) {
            // NETWORK_STACK_SERVICE is not available through getSystemService before R
            // The NetworkStack connector is not available through NetworkStack before R
            throw new UnsupportedOperationException(
                    "ModuleNetworkStackClient is not supported on API " + SDK_INT);
        }

        if (sInstance == null) {
            sInstance = new ModuleNetworkStackClient();
            sInstance.startPolling(packageContext);
            sInstance.startPolling();
        }
        return sInstance;
    }
@@ -64,10 +64,10 @@ public class ModuleNetworkStackClient extends NetworkStackClientBase {
        sInstance = null;
    }

    private void startPolling(Context context) {
    private void startPolling() {
        // If the service is already registered (as it will be most of the time), do not poll and
        // fulfill requests immediately.
        final IBinder nss = (IBinder) context.getSystemService(NETWORK_STACK_SERVICE);
        final IBinder nss = NetworkStack.getService();
        if (nss != null) {
            // Calling onNetworkStackConnected here means that pending oneway Binder calls to the
            // NetworkStack get sent from the current thread and not a worker thread; this is fine
@@ -75,21 +75,18 @@ public class ModuleNetworkStackClient extends NetworkStackClientBase {
            onNetworkStackConnected(INetworkStackConnector.Stub.asInterface(nss));
            return;
        }
        new Thread(new PollingRunner(context)).start();
        new Thread(new PollingRunner()).start();
    }

    private class PollingRunner implements Runnable {
        private final Context mContext;

        private PollingRunner(Context context) {
            mContext = context;
        }
        private PollingRunner() {}

        @Override
        public void run() {
            // Block until the NetworkStack connector is registered in ServiceManager.
            IBinder nss;
            while ((nss = (IBinder) mContext.getSystemService(NETWORK_STACK_SERVICE)) == null) {
            while ((nss = NetworkStack.getService()) == null) {
                try {
                    Thread.sleep(200);
                } catch (InterruptedException e) {
+3 −1
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@
<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>
    <!-- no translation found for notification_channel_description_connected (7239184168268014518) -->
    <skip />
    <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>
    <string name="application_label" msgid="8095087899576605955">"Konnektiwiteitbestuurder"</string>
</resources>
+3 −1
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@
<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">"የተያዥ መግቢያ ማረጋገጥ"</string>
    <string name="notification_channel_description_connected" msgid="1664506646629701401">"መሣሪያው በተሳካ ሁኔታ ከአንድ ተያዥ መግቢያ አውታረ መረብ ጋር ሲረጋገጥ ማሳወቂያዎች ይታያሉ"</string>
    <!-- no translation found for notification_channel_description_connected (7239184168268014518) -->
    <skip />
    <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_to_ssid_param1" msgid="2312858438037646286">"ከ%1$s ጋር ተገናኝቷል"</string>
    <string name="connected" msgid="4563643884927480998">"ተገናኝቷል"</string>
    <string name="tap_for_info" msgid="5203220728001805560">"የመድረክ መረጃን ለማግኘት መታ ያድርጉ"</string>
    <string name="application_label" msgid="8095087899576605955">"የግንኙነት አስተዳዳሪ"</string>
</resources>
Loading