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

Commit d2d6282f authored by Raphael Kim's avatar Raphael Kim Committed by Automerger Merge Worker
Browse files

[CDM] Validate component name length before requesting notification access. am: 618767b6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805434



Change-Id: Ibf7ac54c688f222dc95caf886c3fc4b50d568ec8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8ad006d 618767b6

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

+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,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 PersistentDataStore mPersistentStore;

    private final PersistUserStateHandler mUserPersistenceHandler;
@@ -544,6 +545,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(),