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

Commit ca8d0fe3 authored by Varun Shah's avatar Varun Shah
Browse files

Avoid NPE when fetching ContentProviderRecord#name. 

Bug: 122364189
Test: n/a
Change-Id: I66a3918781131bd02799dec3b2ddc9c28d9809f4
parent f28075bf

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");