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

Commit a08795bd authored by Raphael Kim's avatar Raphael Kim Committed by Android Build Coastguard Worker
Browse files

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

Bug: 295335110
Test: Test app with long component name
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f5fc7f0580127b779a6f69c3301d5fc8d5764c0)
Merged-In: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579
Change-Id: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579
parent 049d942f

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

+4 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 


    private static final int ASSOCIATE_WITHOUT_PROMPT_MAX_PER_TIME_WINDOW = 5;

    private static final long ASSOCIATE_WITHOUT_PROMPT_WINDOW_MS = 60 * 60 * 1000; // 60 min;

    private static final int MAX_CN_LENGTH = 500;



    private static final String XML_TAG_ASSOCIATIONS = "associations";

    private static final String XML_TAG_ASSOCIATION = "association";
@@ -555,6 +556,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
            String callingPackage = component.getPackageName();

            checkCanCallNotificationApi(callingPackage);

            int userId = getCallingUserId();

            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(),