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

Commit 0ddd5ae3 authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Fix spurious "Timeout waiting for provider""

parents efa89035 6e721e11

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

+1 −1
Original line number Diff line number Diff line
@@ -7156,7 +7156,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    } finally {

                        Binder.restoreCallingIdentity(ident);

                    }

                } else if (dyingProc == cpr.proc) {

                } else if (dyingProc == cpr.proc && dyingProc != null) {

                    // The old stable connection's client should be killed during proc cleaning up,

                    // so do not re-use the old ContentProviderRecord, otherwise the new clients

                    // could get killed unexpectedly.