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

Commit 1be1cdbe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensure only valid events are reported." into udc-dev am: ab109af8 am: 25fe9840 

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



Change-Id: If82a400acdb1a3bb0b746557ff0eae809321fa30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28418a59 25fe9840

services/usage/java/com/android/server/usage/UsageStatsService.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -2539,10 +2539,14 @@ public class UsageStatsService extends SystemService implements 
        }

        }





        @Override

        @Override

        public void reportChooserSelection(String packageName, int userId, String contentType,

        public void reportChooserSelection(@NonNull String packageName, int userId,

                                           String[] annotations, String action) {

                String contentType, String[] annotations, String action) {

            if (packageName == null) {

            if (packageName == null) {

                Slog.w(TAG, "Event report user selecting a null package");

                throw new IllegalArgumentException("Package selection must not be null.");

            }

            // Verify if this package exists before reporting an event for it.

            if (mPackageManagerInternal.getPackageUid(packageName, 0, userId) < 0) {

                Slog.w(TAG, "Event report user selecting an invalid package");

                return;

                return;

            }

            }