1be2d732e0487cad61ba1c2f96a111c252ee117d - platform/frameworks/base

commit	1be2d732e0487cad61ba1c2f96a111c252ee117d	[log] [tgz]
author	junyulai <junyulai@google.com>	Thu Jan 02 19:35:59 2020 +0800
committer	Junyu Lai <junyulai@google.com>	Thu Mar 19 01:40:55 2020 +0000
tree	7148a212394dda348563d5be21131ec4b5d8c727
parent	6f813159b50fa6e91fabcea0bea3f4a7afd5a1fb [diff]

[SM07] Make combine subtype configurable from Settings

Note that enabling/disabling would not take effect until device
reboot. This will be addressed in follow-up patch.

Test: 1. atest NetworkStatsServieTest SettingsBackupTest
      2. adb shell settings put global netstats_combine_subtype_enabled 1|0
Bug: 146415925

Change-Id: Ic94da540afa479ed18f1b6fbda4ae3216c37476b
Merged-In: Ic94da540afa479ed18f1b6fbda4ae3216c37476b
(cherry picked from commit c4f77ac90bf2e48a655ad19b162fe74a23bf3fb0)

core/java/android/net/NetworkIdentity.java[diff]
core/java/android/provider/Settings.java[diff]
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java[diff]
services/core/java/com/android/server/net/NetworkStatsService.java[diff]
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java[diff]

5 files changed