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

Commit 10c40fc0 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am a12ac54c: am 25596374: Merge "[ActivityManager] Prevent provider from been created twice." 

* commit 'a12ac54c':
  [ActivityManager] Prevent provider from been created twice.
parents 62404e15 a12ac54c

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

+7 −5
Original line number Diff line number Diff line
@@ -9339,12 +9339,14 @@ public final class ActivityManagerService extends ActivityManagerNative 
                            if (DEBUG_PROVIDER) {

                                Slog.d(TAG, "Installing in existing process " + proc);

                            }

                            if (!proc.pubProviders.containsKey(cpi.name)) {

                                checkTime(startTime, "getContentProviderImpl: scheduling install");

                                proc.pubProviders.put(cpi.name, cpr);

                                try {

                                    proc.thread.scheduleInstallProvider(cpi);

                                } catch (RemoteException e) {

                                }

                            }

                        } else {

                            checkTime(startTime, "getContentProviderImpl: before start process");

                            proc = startProcessLocked(cpi.processName,