bbf352a2c136bfeb1fa7ad751df75d3069e9fdb0 - platform_frameworks_base

commit	bbf352a2c136bfeb1fa7ad751df75d3069e9fdb0	[log] [tgz]
author	Michal Karpinski <mkarpinski@google.com>	Thu Nov 03 15:46:17 2016 +0000
committer	Michal Karpinski <mkarpinski@google.com>	Tue Dec 13 17:22:07 2016 +0000
tree	c82bcf051f7d9f9bd581e835c80689165ca4f790
parent	4c47adef60ca0326bdbe124dfdd335382e5c0787 [diff]

DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve
the same batch many times

This allows DO to:
a) know that some logs were dropped (by trying with token and not
getting anything)
b) know how many logs were there in each batch (useful especially
for the dropped ones)
c) retry batch retrieval if it failed

Test: will be CTS tested once APIs unhidden
Bug: 29748723

(cherry picked from commit a9ff206af26871695bfce54969428b8ad03e31e6)

Change-Id: Iac10e61cdf3b100719a9c029ff897bd5ef5c8e2f

core/java/android/app/admin/DeviceAdminReceiver.java[diff]
core/java/android/app/admin/DevicePolicyManager.java[diff]
core/java/android/app/admin/IDevicePolicyManager.aidl[diff]
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java[diff]
services/devicepolicy/java/com/android/server/devicepolicy/NetworkLogger.java[diff]
services/devicepolicy/java/com/android/server/devicepolicy/NetworkLoggingHandler.java[diff]

6 files changed

tree: c82bcf051f7d9f9bd581e835c80689165ca4f790