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

Commit 0674069a authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix a deadlock I ran into. 

Activity manager was calling into the backup service (and other
things) with its lock held.

Change-Id: Id55093e09cc5fe81b73b85968184816d956e0ae8
parent dd62a056

services/java/com/android/server/am/ActivityManagerService.java

+13 −13
Original line number Diff line number Diff line
@@ -9621,6 +9621,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                Slog.e(TAG, "Backup agent created for " + agentPackageName + " but not requested!");

                return;

            }

        }



        long oldIdent = Binder.clearCallingIdentity();

        try {
@@ -9636,7 +9637,6 @@ public final class ActivityManagerService extends ActivityManagerNative 
            Binder.restoreCallingIdentity(oldIdent);

        }

    }

    }



    // done with this agent

    public void unbindBackupAgent(ApplicationInfo appInfo) {