)]}'
{
  "commit": "5356a35c3bcfcdf2d184c620af6bfbf9bddf35c5",
  "tree": "ac9d0f28800b1b1846e6fb3554b41515c8058e4d",
  "parents": [
    "d33fe05c66b8423d956c55f0cc6a74269cd94adc"
  ],
  "author": {
    "name": "Lorenzo Colitti",
    "email": "lorenzo@google.com",
    "time": "Thu Aug 17 19:23:08 2017 +0900"
  },
  "committer": {
    "name": "Lorenzo Colitti",
    "email": "lorenzo@google.com",
    "time": "Sat Aug 19 00:21:56 2017 +0900"
  },
  "message": "Add tether offload traffic to interface stats as well.\n\nCurrently, we only count add tethering traffic to per-UID\nstats, but not to total data usage (i.e., dev and XT stats). This\nis correct for software tethering, because all software forwarded\npackets are already included in interface counters, but it is\nincorrect for hardware offload, because such packets do not\nincrement interface counters.\n\nTo fix this:\n1. Add an argument to ITetheringStatsProvider#getTetherStats to\n   indicate whether per-UID stats are requested. For clarity,\n   define integer constants STATS_PER_IFACE and STATS_PER_UID\n   to represent these operations.\n2. Make NetdTetheringStatsProvider return stats only if per-UID\n   stats are requested. (Otherwise tethering traffic would be\n   double-counted).\n3. Make OffloadController\u0027s stats provider return the same\n   stats regardless of whether per-UID stats were requested or\n   not.\n4. Make NetworkStatsService add non-per-UID tethering stats to\n   the dev and XT snapshots. The per-UID snapshots were already\n   correctly adding in per-UID stats.\n\nBug: 29337859\nBug: 32163131\nTest: runtest frameworks-net\nTest: runtest frameworks-telephony\nChange-Id: I7a4d04ab47694d754874136179f8edad71099638\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "1aeabc1e62de2ffd51361ffd95c8b50dcf4714e0",
      "old_mode": 33188,
      "old_path": "core/java/android/net/ITetheringStatsProvider.aidl",
      "new_id": "da0bf4c47b94b932de5bc9cfbb1e4e9feb9fb330",
      "new_mode": 33188,
      "new_path": "core/java/android/net/ITetheringStatsProvider.aidl"
    },
    {
      "type": "modify",
      "old_id": "be9e80973875f7c2a3e58ef50b6f93b10976e6bb",
      "old_mode": 33188,
      "old_path": "core/java/android/net/NetworkStats.java",
      "new_id": "171adc054bbe782a0ed969866288e3b86ced7f7c",
      "new_mode": 33188,
      "new_path": "core/java/android/net/NetworkStats.java"
    },
    {
      "type": "modify",
      "old_id": "e6e1da4a71c741c523549cb35a61f823fa9ca58c",
      "old_mode": 33188,
      "old_path": "core/java/android/os/INetworkManagementService.aidl",
      "new_id": "05627160cc3a4586ad17bbc0d12fc1bb5d4ecd01",
      "new_mode": 33188,
      "new_path": "core/java/android/os/INetworkManagementService.aidl"
    },
    {
      "type": "modify",
      "old_id": "901e1e7c424df97500b6a624246a04b7c4785645",
      "old_mode": 33188,
      "old_path": "services/core/java/com/android/server/NetworkManagementService.java",
      "new_id": "96275aba5a17446e17cf4cd46a41de0107210235",
      "new_mode": 33188,
      "new_path": "services/core/java/com/android/server/NetworkManagementService.java"
    },
    {
      "type": "modify",
      "old_id": "ad661d79767df4e44a1389c2feac21a0542f1ba6",
      "old_mode": 33188,
      "old_path": "services/core/java/com/android/server/connectivity/tethering/OffloadController.java",
      "new_id": "4393e3527e4d2c7e6eb9e6a2a9026ac1f0d466c8",
      "new_mode": 33188,
      "new_path": "services/core/java/com/android/server/connectivity/tethering/OffloadController.java"
    },
    {
      "type": "modify",
      "old_id": "8209adeb89477492eb6ff2fcf535c5d915070d9e",
      "old_mode": 33188,
      "old_path": "services/core/java/com/android/server/net/NetworkStatsService.java",
      "new_id": "b14aa13bfb28a3f3fc71e0d515fe1c930d3e702c",
      "new_mode": 33188,
      "new_path": "services/core/java/com/android/server/net/NetworkStatsService.java"
    },
    {
      "type": "modify",
      "old_id": "6a9d00e66d02736a9f2c610896571feeea6eee0e",
      "old_mode": 33188,
      "old_path": "telephony/java/android/telephony/TelephonyManager.java",
      "new_id": "3d1b4a288ff0d24ebba6af37324bef10afca9968",
      "new_mode": 33188,
      "new_path": "telephony/java/android/telephony/TelephonyManager.java"
    },
    {
      "type": "modify",
      "old_id": "983e04d9930dbeee35c88e324e5bc674d1516c1c",
      "old_mode": 33188,
      "old_path": "tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java",
      "new_id": "53a9b5a6befb69578c0694fb26802a02e2ad9586",
      "new_mode": 33188,
      "new_path": "tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java"
    },
    {
      "type": "modify",
      "old_id": "feb46d39b563383d1ff7b450b94b22891a461a41",
      "old_mode": 33188,
      "old_path": "tests/net/java/com/android/server/net/NetworkStatsServiceTest.java",
      "new_id": "fa997958ba6de97fef43b6a43c186418eb61a96f",
      "new_mode": 33188,
      "new_path": "tests/net/java/com/android/server/net/NetworkStatsServiceTest.java"
    }
  ]
}