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

Commit 30ead8d8 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Show privacy dialog on secondary user calls 

When calls are performed by a secondary user, the attribution is to UID
1000, so they don't match the current user. However, as they are marked
with isPhoneCall, show them anyway.

Test: atest PrivacyDialogControllerTest (fails without fix)
Fixes: 198552515
Change-Id: I11682eceb578ab3b9bf1b2573294af8ca418e6e2
parent caad2a3f

packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogController.kt

+6 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ class PrivacyDialogController( 
            val items = usage.mapNotNull {

                val type = filterType(permGroupToPrivacyType(it.permGroupName))

                val userInfo = userInfos.firstOrNull { ui -> ui.id == UserHandle.getUserId(it.uid) }

                userInfo?.let { ui ->

                if (userInfo != null || it.isPhoneCall) {

                    type?.let { t ->

                        // Only try to get the app name if we actually need it

                        val appName = if (it.isPhoneCall) {
@@ -171,10 +171,14 @@ class PrivacyDialogController( 
                                it.attribution,

                                it.lastAccess,

                                it.isActive,

                                ui.isManagedProfile,

                                // If there's no user info, we're in a phoneCall in secondary user

                                userInfo?.isManagedProfile ?: false,

                                it.isPhoneCall

                        )

                    }

                } else {

                    // No matching user or phone call

                    null

                }

            }

            uiExecutor.execute {

packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyDialogControllerTest.kt

+16 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Intent 
import android.content.pm.ApplicationInfo

import android.content.pm.PackageManager

import android.content.pm.UserInfo

import android.os.Process.SYSTEM_UID

import android.os.UserHandle

import android.permission.PermGroupUsage

import android.permission.PermissionManager
@@ -550,6 +551,21 @@ class PrivacyDialogControllerTest : SysuiTestCase() { 
        verify(dialog, never()).dismiss()

    }



    @Test

    fun testCallOnSecondaryUser() {

        // Calls happen in

        val usage = createMockPermGroupUsage(uid = SYSTEM_UID, isPhoneCall = true)

        `when`(permissionManager.getIndicatorAppOpUsageData(anyBoolean())).thenReturn(listOf(usage))

        `when`(userTracker.userProfiles).thenReturn(listOf(

                UserInfo(ENT_USER_ID, "", 0)

        ))



        controller.showDialog(context)

        exhaustExecutors()



        verify(dialog).show()

    }



    private fun exhaustExecutors() {

        FakeExecutor.exhaustExecutors(backgroundExecutor, uiExecutor)

    }