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

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

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

Merge commit '045398e6' into gingerbread-plus-aosp

* commit '045398e6':
  Fix a deadlock I ran into.
parents 9c708358 045398e6

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

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

                return;

            }

        }



        long oldIdent = Binder.clearCallingIdentity();

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

        }

    }

    }



    // done with this agent

    public void unbindBackupAgent(ApplicationInfo appInfo) {