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

Commit 93e7f12a authored by josephpv's avatar josephpv Committed by Joseph Vincent
Browse files

Handle listing of private space apps in Recent Location Access page 

Handing of private space apps in Interleaved settings this change
takes care to not show apps from private space when in quiet mode in
Settings > Location > Recent access

Recording Link:
b/329570205#comment4

Bug: 329570205
Test: atest RecentAppOpsAccessesTest
Change-Id: I14ac060bc1284c7b3bb2c76be5c58aae32802307
parent c3b1804d

packages/SettingsLib/src/com/android/settingslib/applications/RecentAppOpsAccess.java

+14 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.PermissionChecker; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.UserProperties;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.os.UserManager;
@@ -132,8 +133,9 @@ public class RecentAppOpsAccess { 
            int uid = ops.getUid();

            UserHandle user = UserHandle.getUserHandleForUid(uid);



            // Don't show apps belonging to background users except managed users.

            if (!profiles.contains(user)) {

            // Don't show apps belonging to background users except for profiles that shouldn't

            // be shown in quiet mode.

            if (!profiles.contains(user) || isHideInQuietEnabledForProfile(um, user)) {

                continue;

            }
@@ -192,6 +194,16 @@ public class RecentAppOpsAccess { 
        return accesses;

    }



    private boolean isHideInQuietEnabledForProfile(UserManager userManager, UserHandle userHandle) {

        if (android.multiuser.Flags.enablePrivateSpaceFeatures()

                && android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()) {

            return userManager.isQuietModeEnabled(userHandle)

                    && userManager.getUserProperties(userHandle).getShowInQuietMode()

                            == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN;

        }

        return false;

    }



    /**

     * Creates a Access entry for the given PackageOps.

     *

packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/RecentAppOpsAccessesTest.java

+59 −0
Original line number Diff line number Diff line
@@ -32,14 +32,17 @@ import android.content.PermissionChecker; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.UserProperties;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.platform.test.flag.junit.SetFlagsRule;

import android.util.LongSparseArray;



import com.android.settingslib.testutils.shadow.ShadowPermissionChecker;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -58,6 +61,8 @@ import java.util.concurrent.TimeUnit; 
@Config(shadows = {ShadowPermissionChecker.class})

public class RecentAppOpsAccessesTest {



    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();

    private static final int TEST_UID = 1234;

    private static final long NOW = 1_000_000_000;  // Approximately 9/8/2001

    private static final long ONE_MIN_AGO = NOW - TimeUnit.MINUTES.toMillis(1);
@@ -73,6 +78,8 @@ public class RecentAppOpsAccessesTest { 
    @Mock

    private UserManager mUserManager;

    @Mock

    private UserProperties mUserProperties;

    @Mock

    private Clock mClock;

    private Context mContext;

    private int mTestUserId;
@@ -131,6 +138,58 @@ public class RecentAppOpsAccessesTest { 
        assertThat(requests.get(1).accessFinishTime).isEqualTo(TWENTY_THREE_HOURS_AGO);

    }



    @Test

    public void testGetAppList_quietModeDisabled_shouldFilterRecentAccesses() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_HANDLE_INTERLEAVED_SETTINGS_FOR_PRIVATE_SPACE);

        when(mUserManager.isQuietModeEnabled(any())).thenReturn(false);



        List<RecentAppOpsAccess.Access> requests = mRecentAppOpsAccess.getAppList(false);

        // Only two of the apps have requested location within 15 min.

        assertThat(requests).hasSize(2);

        // Make sure apps are ordered by recency

        assertThat(requests.get(0).packageName).isEqualTo(TEST_PACKAGE_NAMES[0]);

        assertThat(requests.get(0).accessFinishTime).isEqualTo(ONE_MIN_AGO);

        assertThat(requests.get(1).packageName).isEqualTo(TEST_PACKAGE_NAMES[1]);

        assertThat(requests.get(1).accessFinishTime).isEqualTo(TWENTY_THREE_HOURS_AGO);

    }



    @Test

    public void testGetAppList_quietModeEnabledShowInQuietDefault_shouldFilterRecentAccesses() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_HANDLE_INTERLEAVED_SETTINGS_FOR_PRIVATE_SPACE);

        when(mUserManager.isQuietModeEnabled(any())).thenReturn(true);

        when(mUserManager.getUserProperties(any())).thenReturn(mUserProperties);

        when(mUserProperties.getShowInQuietMode())

                .thenReturn(UserProperties.SHOW_IN_QUIET_MODE_DEFAULT);



        List<RecentAppOpsAccess.Access> requests = mRecentAppOpsAccess.getAppList(false);

        // Only two of the apps have requested location within 15 min.

        assertThat(requests).hasSize(2);

        // Make sure apps are ordered by recency

        assertThat(requests.get(0).packageName).isEqualTo(TEST_PACKAGE_NAMES[0]);

        assertThat(requests.get(0).accessFinishTime).isEqualTo(ONE_MIN_AGO);

        assertThat(requests.get(1).packageName).isEqualTo(TEST_PACKAGE_NAMES[1]);

        assertThat(requests.get(1).accessFinishTime).isEqualTo(TWENTY_THREE_HOURS_AGO);

    }



    @Test

    public void testGetAppList_quietModeEnabledShowInQuietHidden_shouldNotFilterRecentAccesses() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_HANDLE_INTERLEAVED_SETTINGS_FOR_PRIVATE_SPACE);

        when(mUserManager.isQuietModeEnabled(any())).thenReturn(true);

        when(mUserManager.getUserProperties(any())).thenReturn(mUserProperties);

        when(mUserProperties.getShowInQuietMode())

                .thenReturn(UserProperties.SHOW_IN_QUIET_MODE_HIDDEN);



        List<RecentAppOpsAccess.Access> requests = mRecentAppOpsAccess.getAppList(false);

        // Apps doesn't show up in the list of apps.

        assertThat(requests).hasSize(0);

    }



    @Test

    public void testGetAppList_shouldNotShowAndroidOS() throws NameNotFoundException {

        // Add android OS to the list of apps.