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

Commit 1e3404d1 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Check processName when starting providers." into nyc-dev am: 6bd012a7 am: 9208ed4c 

am: 5d25ac90

* commit '5d25ac90':
  Check processName when starting providers.

Change-Id: I7f1db78686332805d4cc097f0aa05ec2e7d1e93a
parents cc9e496f 5d25ac90

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

+7 −2
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ import java.util.Iterator; 
import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicLong;
@@ -11124,8 +11125,12 @@ public final class ActivityManagerService extends ActivityManagerNative 
                                    .getPackageInfo(pkgName, matchFlags, userId);

                            if (pkgInfo != null && !ArrayUtils.isEmpty(pkgInfo.providers)) {

                                for (ProviderInfo provInfo : pkgInfo.providers) {

                                    if (Objects.equals(provInfo.processName, app.processName)) {

                                        Log.v(TAG, "Installing " + provInfo);

                                        app.thread.scheduleInstallProvider(provInfo);

                                    } else {

                                        Log.v(TAG, "Skipping " + provInfo);

                                    }

                                }

                            }

                        } catch (RemoteException ignored) {