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

Commit 95cb226c authored by Hugo Benichi's avatar Hugo Benichi
Browse files

IP connectivity metrics: cleanup obsolete code 

This patch cleans obsolete code related to IP connectivity metrics:
 - remove @SystemApi on android.net.metrics: now that metrics events
   are processed and serialized in the frameworks only, event classes
   should not appear in the system apis.
 - remove obsolete Logger classes: ConnectivityMetrics app was the
   unique user of ConnectivityMetricsLogger until nyc-mr1. From nyc-mr1
   the app started using dumpsys to get metrics for IpConnectivity and
   Telephony, which made ConnectivityMetricsLogger obsolete.
 - simplifications in MetricsTestUtil

Test: - runtest frameworks-net
      - manually verified $ adb shell dumpsys connmetrics
Bug: 30054585
Bug: 32648597
Change-Id: I85ef65f7f69eb9299e4636cc7af54067201d9daf
parent 56ff7d9e

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/usb/IUsbManager.aidl \

	core/java/android/net/ICaptivePortal.aidl \

	core/java/android/net/IConnectivityManager.aidl \

	core/java/android/net/IConnectivityMetricsLogger.aidl \

	core/java/android/net/IIpConnectivityMetrics.aidl \

	core/java/android/net/IEthernetManager.aidl \

	core/java/android/net/IEthernetServiceListener.aidl \

api/system-current.txt

+0 −207
Original line number Diff line number Diff line
@@ -26825,44 +26825,6 @@ package android.net { 
    method public void onTetheringStarted();

  }













  public final class ConnectivityMetricsEvent implements android.os.Parcelable {













    ctor public ConnectivityMetricsEvent(long, int, int, android.os.Parcelable);













    method public int describeContents();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.ConnectivityMetricsEvent> CREATOR;













    field public final int componentTag;













    field public final android.os.Parcelable data;













    field public final int eventTag;













    field public final long timestamp;













  }

























  public static final class ConnectivityMetricsEvent.Reference implements android.os.Parcelable {













    ctor public ConnectivityMetricsEvent.Reference(long);













    method public int describeContents();













    method public long getValue();













    method public void readFromParcel(android.os.Parcel);













    method public void setValue(long);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.ConnectivityMetricsEvent.Reference> CREATOR;













  }

























  public class ConnectivityMetricsLogger {













    ctor public ConnectivityMetricsLogger();













    method public android.net.ConnectivityMetricsEvent[] getEvents(android.net.ConnectivityMetricsEvent.Reference);













    method public void logEvent(long, int, int, android.os.Parcelable);













    method public boolean register(android.app.PendingIntent);













    method public boolean unregister(android.app.PendingIntent);













    field public static final int COMPONENT_TAG_BLUETOOTH = 1; // 0x1













    field public static final int COMPONENT_TAG_CONNECTIVITY = 0; // 0x0













    field public static final int COMPONENT_TAG_TELECOM = 3; // 0x3













    field public static final int COMPONENT_TAG_TELEPHONY = 4; // 0x4













    field public static final int COMPONENT_TAG_WIFI = 2; // 0x2













    field public static final java.lang.String CONNECTIVITY_METRICS_LOGGER_SERVICE = "connectivity_metrics_logger";













    field public static final java.lang.String DATA_KEY_EVENTS_COUNT = "count";













    field public static final int NUMBER_OF_COMPONENTS = 5; // 0x5













    field public static final int TAG_SKIPPED_EVENTS = -1; // 0xffffffff













  }



























  public class Credentials {















    ctor public Credentials(int, int, int);















    method public int getGid();










@@ -27574,175 +27536,6 @@ package android.net.http {



























}



























package android.net.metrics {

























  public final class ApfProgramEvent implements android.os.Parcelable {













    method public int describeContents();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.metrics.ApfProgramEvent> CREATOR;













    field public static final int FLAG_HAS_IPV4_ADDRESS = 1; // 0x1













    field public static final int FLAG_MULTICAST_FILTER_ON = 0; // 0x0













    field public final int currentRas;













    field public final int filteredRas;













    field public final int flags;













    field public final long lifetime;













    field public final int programLength;













  }

























  public final class ApfStats implements android.os.Parcelable {













    method public int describeContents();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.metrics.ApfStats> CREATOR;













    field public final int droppedRas;













    field public final long durationMs;













    field public final int matchingRas;













    field public final int maxProgramSize;













    field public final int parseErrors;













    field public final int programUpdates;













    field public final int receivedRas;













    field public final int zeroLifetimeRas;













  }

























  public final class DefaultNetworkEvent implements android.os.Parcelable {













    method public int describeContents();













    method public static void logEvent(int, int[], int, boolean, boolean);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.metrics.DefaultNetworkEvent> CREATOR;













    field public final int netId;













    field public final boolean prevIPv4;













    field public final boolean prevIPv6;













    field public final int prevNetId;













    field public final int[] transportTypes;













  }

























  public final class DhcpClientEvent implements android.os.Parcelable {













    method public int describeContents();













    method public static void logStateEvent(java.lang.String, java.lang.String);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.metrics.DhcpClientEvent> CREATOR;













    field public final int durationMs;













    field public final java.lang.String ifName;













    field public final java.lang.String msg;













  }

























  public final class DhcpErrorEvent implements android.os.Parcelable {













    method public int describeContents();













    method public static int errorCodeWithOption(int, int);













    method public static void logParseError(java.lang.String, int);













    method public static void logReceiveError(java.lang.String);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final int BOOTP_TOO_SHORT;













    field public static final int BUFFER_UNDERFLOW;













    field public static final android.os.Parcelable.Creator<android.net.metrics.DhcpErrorEvent> CREATOR;













    field public static final int DHCP_BAD_MAGIC_COOKIE;













    field public static final int DHCP_ERROR = 4; // 0x4













    field public static final int DHCP_INVALID_OPTION_LENGTH;













    field public static final int DHCP_NO_MSG_TYPE;













    field public static final int DHCP_UNKNOWN_MSG_TYPE;













    field public static final int L2_ERROR = 1; // 0x1













    field public static final int L2_TOO_SHORT;













    field public static final int L2_WRONG_ETH_TYPE;













    field public static final int L3_ERROR = 2; // 0x2













    field public static final int L3_INVALID_IP;













    field public static final int L3_NOT_IPV4;













    field public static final int L3_TOO_SHORT;













    field public static final int L4_ERROR = 3; // 0x3













    field public static final int L4_NOT_UDP;













    field public static final int L4_WRONG_PORT;













    field public static final int MISC_ERROR = 5; // 0x5













    field public static final int RECEIVE_ERROR;













    field public final int errorCode;













    field public final java.lang.String ifName;













  }

























  public final class DnsEvent implements android.os.Parcelable {













    method public int describeContents();













    method public static void logEvent(int, byte[], byte[], int[]);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.metrics.DnsEvent> CREATOR;













    field public final byte[] eventTypes;













    field public final int[] latenciesMs;













    field public final int netId;













    field public final byte[] returnCodes;













  }

























  public final class IpManagerEvent implements android.os.Parcelable {













    method public int describeContents();













    method public static void logEvent(int, java.lang.String, long);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final int COMPLETE_LIFECYCLE = 3; // 0x3













    field public static final android.os.Parcelable.Creator<android.net.metrics.IpManagerEvent> CREATOR;













    field public static final int PROVISIONING_FAIL = 2; // 0x2













    field public static final int PROVISIONING_OK = 1; // 0x1













    field public final long durationMs;













    field public final int eventType;













    field public final java.lang.String ifName;













  }

























  public final class IpReachabilityEvent implements android.os.Parcelable {













    method public int describeContents();













    method public static void logNudFailed(java.lang.String);













    method public static void logProbeEvent(java.lang.String, int);













    method public static void logProvisioningLost(java.lang.String);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.metrics.IpReachabilityEvent> CREATOR;













    field public static final int NUD_FAILED = 512; // 0x200













    field public static final int PROBE = 256; // 0x100













    field public static final int PROVISIONING_LOST = 768; // 0x300













    field public final int eventType;













    field public final java.lang.String ifName;













  }

























  public final class NetworkEvent implements android.os.Parcelable {













    method public int describeContents();













    method public static void logCaptivePortalFound(int, long);













    method public static void logEvent(int, int);













    method public static void logValidated(int, long);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.metrics.NetworkEvent> CREATOR;













    field public static final int NETWORK_CAPTIVE_PORTAL_FOUND = 4; // 0x4













    field public static final int NETWORK_CONNECTED = 1; // 0x1













    field public static final int NETWORK_DISCONNECTED = 7; // 0x7













    field public static final int NETWORK_LINGER = 5; // 0x5













    field public static final int NETWORK_UNLINGER = 6; // 0x6













    field public static final int NETWORK_VALIDATED = 2; // 0x2













    field public static final int NETWORK_VALIDATION_FAILED = 3; // 0x3













    field public final long durationMs;













    field public final int eventType;













    field public final int netId;













  }

























  public final class RaEvent implements android.os.Parcelable {













    method public int describeContents();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.metrics.RaEvent> CREATOR;













    field public final long dnsslLifetime;













    field public final long prefixPreferredLifetime;













    field public final long prefixValidLifetime;













    field public final long rdnssLifetime;













    field public final long routeInfoLifetime;













    field public final long routerLifetime;













  }

























  public final class ValidationProbeEvent implements android.os.Parcelable {













    method public int describeContents();













    method public static void logEvent(int, long, int, int);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.metrics.ValidationProbeEvent> CREATOR;













    field public static final int DNS_FAILURE = 0; // 0x0













    field public static final int DNS_SUCCESS = 1; // 0x1













    field public static final int PROBE_DNS = 0; // 0x0













    field public static final int PROBE_HTTP = 1; // 0x1













    field public static final int PROBE_HTTPS = 2; // 0x2













    field public static final int PROBE_PAC = 3; // 0x3













    field public final long durationMs;













    field public final int netId;













    field public final int probeType;













    field public final int returnCode;













  }

























}



























package android.net.nsd {





























  public final class NsdManager {

























core/java/android/net/ConnectivityMetricsEvent.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -16,5 +16,5 @@





























package android.net;





























/** {@hide} */















parcelable ConnectivityMetricsEvent;












parcelable ConnectivityMetricsEvent.Reference;
























core/java/android/net/ConnectivityMetricsEvent.java



+0
−50




























Original line number
Diff line number
Diff line








@@ -16,12 +16,10 @@





























package android.net;





























import android.annotation.SystemApi;















import android.os.Parcel;















import android.os.Parcelable;































/** {@hide} */













@SystemApi















public final class ConnectivityMetricsEvent implements Parcelable {































    /**  The time when this event was collected, as returned by System.currentTimeMillis(). */










@@ -67,7 +65,6 @@ public final class ConnectivityMetricsEvent implements Parcelable {













        return 0;















    }





























    /** Implement the Parcelable interface */















    @Override















    public void writeToParcel(Parcel dest, int flags) {















        dest.writeLong(timestamp);









@@ -80,51 +77,4 @@ public final class ConnectivityMetricsEvent implements Parcelable {













        return String.format("ConnectivityMetricsEvent(%tT.%tL, %d, %d): %s",















                timestamp, timestamp, componentTag, eventTag, data);















    }



























    /** {@hide} */













    @SystemApi













    public final static class Reference implements Parcelable {



























        private long mValue;



























        public Reference(long ref) {













            this.mValue = ref;













        }



























        /** Implement the Parcelable interface */













        public static final Parcelable.Creator<Reference> CREATOR













                = new Parcelable.Creator<Reference> (){













            public Reference createFromParcel(Parcel source) {













                return new Reference(source.readLong());













            }



























            public Reference[] newArray(int size) {













                return new Reference[size];













            }













        };



























        /** Implement the Parcelable interface */













        @Override













        public int describeContents() {













            return 0;













        }



























        /** Implement the Parcelable interface */













        @Override













        public void writeToParcel(Parcel dest, int flags) {













            dest.writeLong(mValue);













        }



























        public void readFromParcel(Parcel in) {













            mValue = in.readLong();













        }



























        public long getValue() {













            return mValue;













        }



























        public void setValue(long val) {













            mValue = val;













        }













    }















}
























core/java/android/net/ConnectivityMetricsLogger.java
deleted100644 → 0



+0
−92




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2016 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */













package android.net;



























import android.annotation.SystemApi;













import android.app.PendingIntent;













import android.os.Bundle;













import android.os.Parcelable;













import android.os.RemoteException;













import android.os.ServiceManager;













import android.util.Log;



























import com.android.internal.annotations.VisibleForTesting;



























/** {@hide} */













@SystemApi













public class ConnectivityMetricsLogger {













    private static String TAG = "ConnectivityMetricsLogger";













    private static final boolean DBG = true;



























    public static final String CONNECTIVITY_METRICS_LOGGER_SERVICE = "connectivity_metrics_logger";



























    // Component Tags













    public static final int COMPONENT_TAG_CONNECTIVITY = 0;













    public static final int COMPONENT_TAG_BLUETOOTH    = 1;













    public static final int COMPONENT_TAG_WIFI         = 2;













    public static final int COMPONENT_TAG_TELECOM      = 3;













    public static final int COMPONENT_TAG_TELEPHONY    = 4;













    public static final int NUMBER_OF_COMPONENTS       = 5;



























    // Event Tag













    public static final int TAG_SKIPPED_EVENTS = -1;



























    public static final String DATA_KEY_EVENTS_COUNT = "count";



























    public ConnectivityMetricsLogger() {













    }



























    /**













     * Log a ConnectivityMetricsEvent.













     *













     * This method keeps track of skipped events when MetricsLoggerService throttles input events.













     * It skips logging when MetricsLoggerService is active. When throttling ends, it logs a













     * meta-event containing the number of events dropped. It is not safe to call this method













     * concurrently from different threads.













     *













     * @param timestamp is the epoch timestamp of the event in ms.













     * @param componentTag is the COMPONENT_* constant the event belongs to.













     * @param eventTag is an event type constant whose meaning is specific to the component tag.













     * @param data is a Parcelable instance representing the event.













     */













    public void logEvent(long timestamp, int componentTag, int eventTag, Parcelable data) {













    }



























    /**













     * Retrieve events













     *













     * @param reference of the last event previously returned. The function will return













     *                  events following it.













     *                  If 0 then all events will be returned.













     *                  After the function call it will contain reference of the













     *                  last returned event.













     * @return events













     */













    public ConnectivityMetricsEvent[] getEvents(ConnectivityMetricsEvent.Reference reference) {













        return new ConnectivityMetricsEvent[0];













    }



























    /**













     * Register PendingIntent which will be sent when new events are ready to be retrieved.













     */













    public boolean register(PendingIntent newEventsIntent) {













        return false;













    }



























    public boolean unregister(PendingIntent newEventsIntent) {













        return false;













    }













}