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

Commit 76876444 authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

Merge "Handle multi-user when disabling MediaMetrics service." into tm-dev am: 448ae113 

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



Change-Id: I35b0e428a906605dbe7d331d92bb82cbfd610b29
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 320ed36d 448ae113

media/libmediametrics/MediaMetricsItem.cpp

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <unordered_map>



#include <binder/Parcel.h>

#include <cutils/multiuser.h>

#include <cutils/properties.h>

#include <utils/Errors.h>

#include <utils/Log.h>
@@ -343,7 +344,8 @@ bool BaseItem::isEnabled() { 
        // now.

        // TODO(b/190151205): Either allow the HotwordDetectionService to access MediaMetrics or

        // make this disabling specific to that process.

        if (uid >= AID_ISOLATED_START && uid <= AID_ISOLATED_END) {

        uid_t appid = multiuser_get_app_id(uid);

        if (appid >= AID_ISOLATED_START && appid <= AID_ISOLATED_END) {

            return false;

        }

        break;