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

Commit eecb5b98 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 2983e038: am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread 

Merge commit '2983e038'

* commit '2983e038':
  Fix a deadlock I ran into.
parents 6f27ab8b 2983e038

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

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

                return;

            }

        }



        long oldIdent = Binder.clearCallingIdentity();

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

        }

    }

    }



    // done with this agent

    public void unbindBackupAgent(ApplicationInfo appInfo) {