commit 2387932b74699c4d5baa493271e999e31b09d2b8
author Amith Yamasani <yamasani@google.com> Wed Mar 30 16:51:26 2016 -0700
committer Amith Yamasani <yamasani@google.com> Wed Mar 30 17:28:53 2016 -0700
tree 00e52eb4191be8ad27c05891c9e926a157c74178
parent 0b880795c12954f1b7818c78d6416d47f1df08dc

Fix a deadlock due to wtf in BaseBundle

Use Slog.wtf instead of Log.wtf, so that it is
asynchronously reported.

Mark incoming application restrictions as defusable
since they are being unparceled.

Bug: 27811728
Change-Id: I166de69a74417e439ec5ef9159fbbfbfe711dde6

services/core/java/com/android/server/pm/UserManagerService.java

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 7f0da1e..88f4190 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -2281,6 +2281,7 @@
             if (restrictions == null || restrictions.isEmpty()) {
                 cleanAppRestrictionsForPackage(packageName, userId);
             } else {
+                restrictions.setDefusable(true);
                 // Write the restrictions to XML
                 writeApplicationRestrictionsLP(packageName, restrictions, userId);
             }