Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54ef2477 authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

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

am: 27c49d57

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

Change-Id: I4049794185b9cc7d29828c13fe8a4441631230f8
parents ed507a74 27c49d57

core/java/android/os/BaseBundle.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.Nullable; 
import android.util.ArrayMap;

import android.util.Log;

import android.util.MathUtils;

import android.util.Slog;



import java.io.Serializable;

import java.util.ArrayList;
@@ -229,7 +230,7 @@ public class BaseBundle { 
        }



        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());

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -2281,6 +2281,7 @@ public class UserManagerService extends IUserManager.Stub { 
            if (restrictions == null || restrictions.isEmpty()) {

                cleanAppRestrictionsForPackage(packageName, userId);

            } else {

                restrictions.setDefusable(true);

                // Write the restrictions to XML

                writeApplicationRestrictionsLP(packageName, restrictions, userId);

            }