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

Commit 41e040fa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Ensure only valid events are reported."" into udc-dev am: 3e09bdb5 

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



Change-Id: I593d9f22260d769e3be54a035436a036b39da65a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2039382 3e09bdb5

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

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



        @Override

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

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

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

                                           String[] annotations, String action) {

            if (packageName == null) {

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

            }

            if (contentType == null) {

                throw new IllegalArgumentException("Content type for selection must not be null.");

            }

            if (action == null) {

                throw new IllegalArgumentException("Selection action 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");

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

                return;

            }