Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[DPM] Minor code fixes in NetworkLoggingHandler"

Browse Source
This commit is contained in:
Michal Karpinski
2016-11-14 16:21:33 +00:00
committed by Android (Google) Code Review
parent d43d705735 aabe96db87
commit 445c692bce
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -9572,6 +9572,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
* A maximum of 1200 events are returned, and the total marshalled size is in the order of
* 100kB, so returning a List instead of ParceledListSlice is acceptable.
* Ideally this would be done with ParceledList, however it only supports homogeneous types.
*
* @see NetworkLoggingHandler#MAX_EVENTS_PER_BATCH
*/
@Override
public synchronized List<NetworkEvent> retrieveNetworkLogs(ComponentName admin,

9
services/devicepolicy/java/com/android/server/devicepolicy/NetworkLoggingHandler.java
View File

@@ -61,8 +61,9 @@ final class NetworkLoggingHandler extends Handler {
@GuardedBy("this")
private ArrayList<NetworkEvent> mFullBatch;
// each full batch is represented by its token, which the DPC has to provide back to revieve it
@GuardedBy("this")
private long currentFullBatchToken;
private long mCurrentFullBatchToken;
NetworkLoggingHandler(Looper looper, DevicePolicyManagerService dpm) {
super(looper);
@@ -101,9 +102,9 @@ final class NetworkLoggingHandler extends Handler {
scheduleBatchFinalization(BATCH_FINALIZATION_TIMEOUT_MS);
// notify DO that there's a new non-empty batch waiting
if (mFullBatch.size() > 0) {
currentFullBatchToken++;
mCurrentFullBatchToken++;
Bundle extras = new Bundle();
extras.putLong(DeviceAdminReceiver.EXTRA_NETWORK_LOGS_TOKEN, currentFullBatchToken);
extras.putLong(DeviceAdminReceiver.EXTRA_NETWORK_LOGS_TOKEN, mCurrentFullBatchToken);
extras.putInt(DeviceAdminReceiver.EXTRA_NETWORK_LOGS_COUNT, mFullBatch.size());
mDpm.sendDeviceOwnerCommand(DeviceAdminReceiver.ACTION_NETWORK_LOGS_AVAILABLE, extras);
} else {
@@ -112,7 +113,7 @@ final class NetworkLoggingHandler extends Handler {
}
synchronized List<NetworkEvent> retrieveFullLogBatch(long batchToken) {
if (batchToken != currentFullBatchToken) {
if (batchToken != mCurrentFullBatchToken) {
return null;
}
return mFullBatch;