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

Commit 4f2ebfa4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Resolve the deadlock caused by unfreezeProcess()." into tm-qpr-dev am: eff330b0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19802702



Change-Id: I62cb78fdcf2720305f7a10b50b32ba2bc15baa3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5bc38d20 eff330b0

services/core/java/com/android/server/am/CachedAppOptimizer.java

+12 −1
Original line number Diff line number Diff line
@@ -1167,7 +1167,18 @@ public final class CachedAppOptimizer { 
                return;

            }

            Slog.d(TAG_AM, "quick sync unfreeze " + pid);

            unfreezeAppLSP(app, reason);

            try {

                freezeBinder(pid, false);

            } catch (RuntimeException e) {

                Slog.e(TAG_AM, "Unable to quick unfreeze binder for " + pid);

                return;

            }



            try {

                Process.setProcessFrozen(pid, app.uid, false);

            } catch (Exception e) {

                Slog.e(TAG_AM, "Unable to quick unfreeze " + pid);

            }

        }

    }