commit 3e88fa4a0b694b4dd066e6a531ae2dfccb1026b9
author Zim <zezeozue@google.com> Mon Feb 22 10:40:03 2021 +0000
committer Zim <zezeozue@google.com> Mon Feb 22 10:40:03 2021 +0000
tree 6737c0fad218b8d15558fb1482e0068ef3e9b2f3
parent 48b7ee3fc2c8a727aeb2990d93338a596e86fc37

Fix spammy invalid media capabilities uid log event

Previously, we logged if a non app uid is passed in a Bundle, but if
it's empty and we get 0, we think an invalid uid was passed.

Now, we check if the media_capabilities uid is present in the bundle
before attempting to extract/log invalid

Test: atest TranscodeTest
Bug: 176157500
Change-Id: Ia356dc59d97422dd5a9adf0f3da75f99cc78dd27

src/com/android/providers/media/TranscodeHelper.java

diff --git a/src/com/android/providers/media/TranscodeHelper.java b/src/com/android/providers/media/TranscodeHelper.java
index 186c5bc..0daca36 100644
--- a/src/com/android/providers/media/TranscodeHelper.java
+++ b/src/com/android/providers/media/TranscodeHelper.java
@@ -413,16 +413,18 @@
     }
 
     private static int getMediaCapabilitiesUid(int uid, Bundle bundle) {
-        if (bundle == null) {
+        if (bundle == null || !bundle.containsKey(MediaStore.EXTRA_MEDIA_CAPABILITIES_UID)) {
             return uid;
         }
+
         int mediaCapabilitiesUid = bundle.getInt(MediaStore.EXTRA_MEDIA_CAPABILITIES_UID);
         if (mediaCapabilitiesUid >= Process.FIRST_APPLICATION_UID) {
             logVerbose(
                     "Media capabilities uid " + mediaCapabilitiesUid + ", passed for uid " + uid);
             return mediaCapabilitiesUid;
         }
-        Log.d(TAG, "Ignoring invalid Media capabilities uid " + mediaCapabilitiesUid);
+        Log.w(TAG, "Ignoring invalid media capabilities uid " + mediaCapabilitiesUid
+                + " for uid: " + uid);
         return uid;
     }