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

Commit cde5a041 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid NPE when fetching ContentProviderRecord#name."

parents dd9b3b4b ca8d0fe3

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

+1 −2
Original line number Diff line number Diff line
@@ -6630,8 +6630,7 @@ public class ActivityManagerService extends IActivityManager.Stub 














                String msg;















                if ((msg = checkContentProviderAssociation(r, callingUid, cpi)) != null) {













                    throw new SecurityException("Content provider lookup "













                            + cpr.name.flattenToShortString()













                    throw new SecurityException("Content provider lookup " + name















                            + " failed: association not allowed with package " + msg);















                }















                checkTime(startTime, "getContentProviderImpl: before checkContentProviderPermission");