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

Commit 0b998c2a authored by Jaewan Kim's avatar Jaewan Kim
Browse files

[DO NOT MERGE] Verify package name and UID for trusted app check

Bug: 179783181
Test: Run CTS
Change-Id: I19e52fef310762dc1d4193901cfc6c23370115b6
parent bef7c4f0
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -2128,6 +2128,23 @@ public class MediaSessionService extends SystemService implements Monitor {
                // Enabled notification listener only works within the same user.
                return false;
            }
            // Verify whether package name and controller UID.
            // It will indirectly check whether the caller has obtained the package name and UID
            // via ControllerInfo or with the valid package name visibility.
            try {
                int actualControllerUid = mContext.getPackageManager().getPackageUidAsUser(
                        controllerPackageName,
                        UserHandle.getUserId(controllerUid));
                if (controllerUid != actualControllerUid) {
                    Log.w(TAG, "Failed to check enabled notification listener. Package name and"
                            + " UID doesn't match");
                    return false;
                }
            } catch (PackageManager.NameNotFoundException e) {
                Log.w(TAG, "Failed to check enabled notification listener. Package name doesn't"
                        + " exist");
                return false;
            }

            if (mNotificationManager.hasEnabledNotificationListener(controllerPackageName,
                    UserHandle.getUserHandleForUid(controllerUid))) {