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

Merge "Fix a deadlock due to wtf in BaseBundle" into nyc-dev

Browse Source 
am: 27c49d5

* commit '27c49d5790647cc0bb81cc76a999ae65fe4a34cc':
  Fix a deadlock due to wtf in BaseBundle

Change-Id: I4049794185b9cc7d29828c13fe8a4441631230f8
This commit is contained in:
Amith Yamasani
2016-03-31 02:25:26 +00:00
committed by android-build-merger
parent ed507a7475 27c49d5790
commit 54ef24779f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/BaseBundle.java
View File

@@ -20,6 +20,7 @@ import android.annotation.Nullable;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.MathUtils; import android.util.MathUtils;
import android.util.Slog;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
@@ -229,7 +230,7 @@ public class BaseBundle {
} }
if (sShouldDefuse && (mFlags & FLAG_DEFUSABLE) == 0) { if (sShouldDefuse && (mFlags & FLAG_DEFUSABLE) == 0) {
Log.wtf(TAG, "Attempting to unparcel a Bundle while in transit; this may " Slog.wtf(TAG, "Attempting to unparcel a Bundle while in transit; this may "
+ "clobber all data inside!", new Throwable()); + "clobber all data inside!", new Throwable());
} }

1
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -2281,6 +2281,7 @@ public class UserManagerService extends IUserManager.Stub {
if (restrictions == null || restrictions.isEmpty()) { if (restrictions == null || restrictions.isEmpty()) {
cleanAppRestrictionsForPackage(packageName, userId); cleanAppRestrictionsForPackage(packageName, userId);
} else { } else {
restrictions.setDefusable(true);
// Write the restrictions to XML // Write the restrictions to XML
writeApplicationRestrictionsLP(packageName, restrictions, userId); writeApplicationRestrictionsLP(packageName, restrictions, userId);
} }