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

Commit 067a0e3e authored by Raphael Kim's avatar Raphael Kim
Browse files

[CDM] Validate component name length before requesting notification access. 

Bug: 295335110
Test: Test app with long component name
Change-Id: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579
parent 59db8423

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ public class CompanionDeviceManagerService extends SystemService { 
            "debug.cdm.cdmservice.removal_time_window";



    private static final long ASSOCIATION_REMOVAL_TIME_WINDOW_DEFAULT = DAYS.toMillis(90);

    private static final int MAX_CN_LENGTH = 500;



    private final ActivityManager mActivityManager;

    private final OnPackageVisibilityChangeListener mOnPackageVisibilityChangeListener;
@@ -756,6 +757,9 @@ public class CompanionDeviceManagerService extends SystemService { 
            String callingPackage = component.getPackageName();

            checkCanCallNotificationApi(callingPackage);

            // TODO: check userId.

            if (component.flattenToString().length() > MAX_CN_LENGTH) {

                throw new IllegalArgumentException("Component name is too long.");

            }

            final long identity = Binder.clearCallingIdentity();

            try {

                return PendingIntent.getActivityAsUser(getContext(),