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

Commit 045398e6 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix a deadlock I ran into." into gingerbread

parents 37cedce1 0674069a

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) {