PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide private space settings app post setup" into main

Browse Source
This commit is contained in:
Jigar Thakkar
2024-06-05 11:44:42 +00:00
committed by Android (Google) Code Review
parent 591c3a3f5d b48a4469ac
commit d9b417cd72
4 changed files with 74 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/unit/src/com/android/settings/privatespace/PrivateSpaceMaintainerTest.java
View File

@@ -33,8 +33,10 @@ import static org.mockito.Mockito.when;
import android.app.ActivityManager;
import android.app.IActivityManager;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Flags;
import android.os.RemoteException;
import android.os.UserManager;
@@ -432,6 +434,36 @@ public class PrivateSpaceMaintainerTest {
assertThat(getSecureSkipFirstUseHints()).isEqualTo(1);
}
@Test
public void createPrivateSpace_psDoesNotExist_setsPrivateSpaceSettingsComponentDisabled() {
mSetFlagsRule.enableFlags(
android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());
PrivateSpaceMaintainer privateSpaceMaintainer =
PrivateSpaceMaintainer.getInstance(mContext);
privateSpaceMaintainer.createPrivateSpace();
assertThat(privateSpaceMaintainer.getPrivateProfileHandle()).isNotNull();
Context privateSpaceUserContext = mContext.createContextAsUser(
privateSpaceMaintainer.getPrivateProfileHandle(),
/* flags */ 0);
// Assert that private space settings launcher app icon is disabled
ComponentName settingsComponentName = new ComponentName(privateSpaceUserContext,
com.android.settings.Settings.class);
int settingsComponentEnabledSetting = privateSpaceUserContext.getPackageManager()
.getComponentEnabledSetting(settingsComponentName);
assertThat(settingsComponentEnabledSetting)
.isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
// Assert that private space settings create shortcut activity is disabled
ComponentName shortcutPickerComponentName = new ComponentName(privateSpaceUserContext,
com.android.settings.Settings.CreateShortcutActivity.class);
int settingsShortcutPickerEnabledSetting = privateSpaceUserContext.getPackageManager()
.getComponentEnabledSetting(shortcutPickerComponentName);
assertThat(settingsShortcutPickerEnabledSetting)
.isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
}
@Test
public void createPrivateSpace_pSExists_doesNotChangeSkipFirstUseHints() {
mSetFlagsRule.enableFlags(