Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933092

Change-Id: Ic3808c2bcd576ded8ab10f5d1e10865b1087e4a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933092

Change-Id: I668111442714295543792d471f1d8df2089b7d7b

[automerger skipped] Add ALLOW_SLIPPERY_TOUCHES permission am: cccf1915 am: 71b81972 -s ours am: 6f9fb3db -s ours am: e511b84e -s ours

am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 d732692b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16510843

Change-Id: Ief272c359670a9cf4a936b69053b9a95b12b84f3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933085

Change-Id: Iaba9b70fd6df725c3a74f8a2ab2df70b6c036407

[automerger skipped] Add ALLOW_SLIPPERY_TOUCHES permission am: cccf1915 am: 71b81972 -s ours am: 6f9fb3db -s ours

am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 d732692b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16510843

Change-Id: Iaede29d5a757e930b52323bda3e9b9e7727ce0a8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933085

Change-Id: I08a0606e4f7bbc3aeca9679ec9072653d8f2ee9b

am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 d732692b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16510843

Change-Id: I187f7af8b7df0e26ddcb132d9299637df4c8bf4b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16510843

Change-Id: I9153b444c36d8f5456bf911aa4c27979be80bb7b

DataUnit is a hidden class, remove the references to
it from files that about to be moved into the module.

Test: TH
Bug: 204830222

Change-Id: Ibfb82ab74f283686fb2af6c3a550d541440c890d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918557

Change-Id: Id0fd4e8e92f26aaee063580c7290bc7f2d2cb290

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918557

Change-Id: I3ec8c1c73701e94c826ec25111f0a5a1d0f36b1d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931122

Change-Id: Ia26f0cb871a62a6e5219e05ed492fdf681d3f50f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931122

Change-Id: I84baf855a168bdaadf03a06729e3c19be50f66e7

Merge "Removed reference to developer guide from class description. Added some missing parameter and return descriptions." am: 01b57ef4 am: ba649118

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922957

Change-Id: I1d208f05026c4a50a0e7e8b12ef9e3edd381f07c

Merge "Removed reference to developer guide from class description. Added some missing parameter and return descriptions." am: 01b57ef4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922957

Change-Id: I71d910d700d913e869887fd331440a1abfd316bb

Merge "Removed reference to developer guide from class description. Added some missing parameter and return descriptions."

This includes:
1. Use android.util.IndentingPrintWriter instead of the
   deprecated internal one.
2. Replace usages of IntArray with CollectionUtils and ArrayList.
3. Replace usages of ArrayUtils with CollectionUtils.
4. Refactor MathUtils.constrain functions into NetworkStatsUtils.
5. Replace Maps.newHashMap and Lists.newArrayList with public
   class constructors.
6. Replace Slog with Log.

Test: FrameworksNetTests NetworkStaticLibTests
Bug: 204830222
Change-Id: If009194ad5668a6d48dd341ea6d325028ce56d42

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926899

Change-Id: I0827c33efc8661a1788f124812c9685bfa57733b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926899

Change-Id: I07a8ea808a99afdf25d970f53089fddee7ee6dca

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931615

Change-Id: I2121ae767462cf14198db1d23ee45b54070fc7e2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931615

Change-Id: I72276ebd4a3fc42ab9459dafcaa4c232ca4d9442

Add a extra variable to store whether the local traffic is
exempted from the VPN.

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I70301901c2374ded9fdf179d0ce64e7bb2d7b1ab

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931587

Change-Id: Id2c4c109fc89ac853c5846e5fa60d045e7df6e2d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931587

Change-Id: I3c51ec1fb523958b6adebe68f19a4d6a60346a62

* changes:
  [MS16.2] Change exception handling for Data Usage APIs
  [MS16.1] Prepare APIs for replacing getNetwork[Total|Uid]Bytes

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931584

Change-Id: I7282d81fa3fae433a44100bc227a236c6e203f60

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931584

Change-Id: Id5ff8dbdcc06c2312b731981d1386f2395769925

Bug: 203492478
Test: manual -
  1. Build a system image and flash it to a device.
  2. adb shell setprop dalvik.vm.extra-opts '-verbose:image'
  3. adb shell setprop dalvik.vm.profilebootclasspath true
  4. adb shell setprop ctl.restart zygote
  5. See the boot image extension being compiled in memory
     (http://gpaste/4688561208033280).
Change-Id: I69c11e3e41b9ab142b427ee054c2a6275ff089de

Follow-up from ag/2815797, callers who uses the hidden API
will have their data augmented by default, and the public
API offers a way to opt-into augmentation.

However, since the data usage is going to the module.
All the hidden API usage must be eliminated. Also, from user
perspective, it is better for UI and API to have aligned
behavior.

Thus, enable augment data usage for public API callers.

Test: atest FrameworksNetTests \
      android.app.usage.cts.NetworkUsageStatsTest
Bug: 204830222
Change-Id: Ida254fac8d44c32d388f1886a866f7324a41ce75

Test: TH
Bug: 204830222
Change-Id: If4e37f227adcabf6901d70ba0bee0dc29b9b3bdc

These internal methods are used in MultipathPolicyTracker and
NetworkPolicyManagementService. getNetworkTotalBytes is used
to query total bytes regarding to the specified NetworkPolicy,
to see how much data quota is used. getNetworkUidBytes is used
to find the app to blame for rapid data usage.

These methods needs to be replaced by public APIs in follow-up
patches.

Test: TH
Bug: 204830222
Change-Id: Iec9cc7a07397ec2bbc6c3d2559fc3680b149cb8a

Merge "Global settings for Bluetooth (Settings.Global.BLUETOOTH_ON) must be set to BLUETOOTH_ON_BLUETOOTH whenever non-BLE MESSAGE_ENABLE is handled irrespective of the state." am: 28c8ad15 am: 19703c51

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1919033

Change-Id: I8ae349015b6829c5f0830c6f371b7ad022f783e7

Merge "Global settings for Bluetooth (Settings.Global.BLUETOOTH_ON) must be set to BLUETOOTH_ON_BLUETOOTH whenever non-BLE MESSAGE_ENABLE is handled irrespective of the state." am: 28c8ad15

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1919033

Change-Id: I911506f3f9ec5344f7a28ffe5cfa46327e988ba6