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

Commit ab4c79bd authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge changes from topic 'framework-net-aosp' 

* changes:
  DO NOT MERGE: frameworks-test: adding missing @SmallTest
  DO NOT MERGE: Netd events: record connect() success/errno
  DO NOT MERGE: Add missing dependency.
  DO NOT MERGE: Show notification for always-on app VPN
  DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
  DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe
  DO NOT MERGE: NetworkMonitor metrics: add first validation information
  DO NOT MERGE: APF: also drop any ICMPv6 RSs
  DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
  DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
  DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
  DO NOT MERGE: Define API for metering network stats buckets.
  DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
  DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
  DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
  DO NOT MERGE: VPN network stat accounting changes.
  DO NOT MERGE: ConnectivityThread: use lazy holder idiom
  DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
  DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
  DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
  DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
parents 25afce88 cfcc1cb7

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ LOCAL_SRC_FILES += \ 
       core/java/android/app/admin/SecurityLogTags.logtags \

       core/java/android/content/EventLogTags.logtags \

       core/java/android/speech/tts/EventLogTags.logtags \

       core/java/android/net/EventLogTags.logtags \

       core/java/android/webkit/EventLogTags.logtags \

       core/java/com/android/internal/logging/EventLogTags.logtags \

]

0 → 100644
+12 −0
Original line number Diff line number Diff line 
NetworkNotificationManager: logging improvements



TODO: squash me

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

# On branch notification_tagging

# Your branch is ahead of 'goog/master' by 2 commits.

#   (use "git push" to publish your local commits)

#

# Changes to be committed:

#	modified:   services/core/java/com/android/server/connectivity/NetworkNotificationManager.java

#

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6447,6 +6447,7 @@ package android.app.usage { 
  public static class NetworkStats.Bucket {

    ctor public NetworkStats.Bucket();

    method public long getEndTimeStamp();

    method public int getMetered();

    method public int getRoaming();

    method public long getRxBytes();

    method public long getRxPackets();
@@ -6456,6 +6457,9 @@ package android.app.usage { 
    method public long getTxBytes();

    method public long getTxPackets();

    method public int getUid();

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

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

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

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

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

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

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6739,6 +6739,7 @@ package android.app.usage { 
  public static class NetworkStats.Bucket {

    ctor public NetworkStats.Bucket();

    method public long getEndTimeStamp();

    method public int getMetered();

    method public int getRoaming();

    method public long getRxBytes();

    method public long getRxPackets();
@@ -6748,6 +6749,9 @@ package android.app.usage { 
    method public long getTxBytes();

    method public long getTxPackets();

    method public int getUid();

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

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

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

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

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

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

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6456,6 +6456,7 @@ package android.app.usage { 
  public static class NetworkStats.Bucket {

    ctor public NetworkStats.Bucket();

    method public long getEndTimeStamp();

    method public int getMetered();

    method public int getRoaming();

    method public long getRxBytes();

    method public long getRxPackets();
@@ -6465,6 +6466,9 @@ package android.app.usage { 
    method public long getTxBytes();

    method public long getTxPackets();

    method public int getUid();

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

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

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

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

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

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