OSDN Git Service

Fix deadlock in NetworkLoggingHandler
authorKenny Guy <kennyguy@google.com>
Mon, 26 Jun 2017 18:13:56 +0000 (19:13 +0100)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 27 Jun 2017 22:35:01 +0000 (22:35 +0000)
commit3d3582d08e591eee6746825ba0672078885f9248
treeca2a03326c46f0a385d8ac42d10e2f1ae04e335f
parent961a323040acd945cd7e07b9a147cbadf59f238c
Fix deadlock in NetworkLoggingHandler

Stop NetworkLoggingHandler holding a lock
when calling back into DevicePolicyManagerService.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithTwoUsers

Bug: 62966480
Change-Id: I41c3edca8922008a9d838d71ddcc50883699bc74
(cherry picked from commit 08a8783c56539b4a990a8c95d7f5011a263848b8)
services/devicepolicy/java/com/android/server/devicepolicy/NetworkLoggingHandler.java