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

Commit 8902f815 authored by Glen Kuhne's avatar Glen Kuhne Committed by Android (Google) Code Review
Browse files

Merge "Move ipconnectivity.proto to services-proto.jar"

parents 411f8215 0719940c

services/core/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ LOCAL_AIDL_INCLUDES := system/netd/server/binder 


LOCAL_SRC_FILES += \

    $(call all-java-files-under,java) \

    $(call all-proto-files-under, proto) \

    java/com/android/server/EventLogTags.logtags \

    java/com/android/server/am/EventLogTags.logtags \

    ../../../../system/netd/server/binder/android/net/INetd.aidl \
@@ -24,7 +23,6 @@ LOCAL_JAVA_LIBRARIES := \ 
    android.hardware.light@2.0-java



LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update

LOCAL_PROTOC_OPTIMIZE_TYPE := nano



ifneq ($(INCREMENTAL_BUILDS),)

    LOCAL_PROGUARD_ENABLED := disabled

services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityEventBuilderTest.java

+14 −15
Original line number Diff line number Diff line
@@ -16,6 +16,17 @@ 


package com.android.server.connectivity;



import static com.android.server.connectivity.MetricsTestUtil.aBool;

import static com.android.server.connectivity.MetricsTestUtil.aByteArray;

import static com.android.server.connectivity.MetricsTestUtil.aLong;

import static com.android.server.connectivity.MetricsTestUtil.aString;

import static com.android.server.connectivity.MetricsTestUtil.aType;

import static com.android.server.connectivity.MetricsTestUtil.anInt;

import static com.android.server.connectivity.MetricsTestUtil.anIntArray;

import static com.android.server.connectivity.MetricsTestUtil.b;

import static com.android.server.connectivity.MetricsTestUtil.describeIpEvent;

import static com.android.server.connectivity.metrics.IpConnectivityLogClass.IpConnectivityLog;



import android.net.ConnectivityMetricsEvent;

import android.net.metrics.ApfProgramEvent;

import android.net.metrics.ApfStats;
@@ -28,21 +39,10 @@ import android.net.metrics.IpReachabilityEvent; 
import android.net.metrics.NetworkEvent;

import android.net.metrics.RaEvent;

import android.net.metrics.ValidationProbeEvent;

import com.google.protobuf.nano.MessageNano;

import java.util.Arrays;



import junit.framework.TestCase;



import static com.android.server.connectivity.metrics.IpConnectivityLogClass.IpConnectivityLog;

import static com.android.server.connectivity.MetricsTestUtil.aBool;

import static com.android.server.connectivity.MetricsTestUtil.aByteArray;

import static com.android.server.connectivity.MetricsTestUtil.aLong;

import static com.android.server.connectivity.MetricsTestUtil.aString;

import static com.android.server.connectivity.MetricsTestUtil.aType;

import static com.android.server.connectivity.MetricsTestUtil.anInt;

import static com.android.server.connectivity.MetricsTestUtil.anIntArray;

import static com.android.server.connectivity.MetricsTestUtil.b;

import static com.android.server.connectivity.MetricsTestUtil.describeIpEvent;

import static com.android.server.connectivity.MetricsTestUtil.ipEv;

import java.util.Arrays;



public class IpConnectivityEventBuilderTest extends TestCase {
@@ -351,8 +351,7 @@ public class IpConnectivityEventBuilderTest extends TestCase { 
    static void verifySerialization(String want, ConnectivityMetricsEvent... input) {

        try {

            byte[] got = IpConnectivityEventBuilder.serialize(0, Arrays.asList(input));

            IpConnectivityLog log = new IpConnectivityLog();

            MessageNano.mergeFrom(log, got);

            IpConnectivityLog log = IpConnectivityLog.parseFrom(got);

            assertEquals(want, log.toString());

        } catch (Exception e) {

            fail(e.toString());

services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityMetricsTest.java

+12 −11
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.server.connectivity;



import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.verify;



import android.content.Context;

import android.net.ConnectivityMetricsEvent;

import android.net.IIpConnectivityMetrics;
@@ -30,22 +33,21 @@ import android.net.metrics.RaEvent; 
import android.net.metrics.ValidationProbeEvent;

import android.os.Parcelable;

import android.util.Base64;



import com.android.server.connectivity.metrics.IpConnectivityLogClass;

import com.google.protobuf.nano.MessageNano;



import junit.framework.TestCase;



import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.io.PrintWriter;

import java.io.StringWriter;

import java.util.Collections;

import java.util.Comparator;

import java.util.Iterator;

import java.util.List;

import junit.framework.TestCase;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



public class IpConnectivityMetricsTest extends TestCase {

    static final IpReachabilityEvent FAKE_EV =
@@ -254,8 +256,7 @@ public class IpConnectivityMetricsTest extends TestCase { 
        try {

            byte[] got = Base64.decode(output, Base64.DEFAULT);

            IpConnectivityLogClass.IpConnectivityLog log =

                    new IpConnectivityLogClass.IpConnectivityLog();

            MessageNano.mergeFrom(log, got);

                    IpConnectivityLogClass.IpConnectivityLog.parseFrom(got);

            assertEquals(want, log.toString());

        } catch (Exception e) {

            fail(e.toString());