Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Gate work profile code path in StylusDeviceController." into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-08-27 20:06:14 +00:00
committed by Android (Google) Code Review
parent d0ea9bc2bc e987816eed
commit c96571371c
2 changed files with 92 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
View File

@@ -79,6 +79,8 @@ public class StylusDevicesController extends AbstractPreferenceController implem
private static final String TAG = "StylusDevicesController";
private final boolean mConfigEnableDefaultNotesForWorkProfile;
@Nullable
private final InputDevice mInputDevice;
@@ -97,6 +99,8 @@ public class StylusDevicesController extends AbstractPreferenceController implem
mInputDevice = inputDevice;
mCachedBluetoothDevice = cachedBluetoothDevice;
lifecycle.addObserver(this);
mConfigEnableDefaultNotesForWorkProfile = mContext.getResources().getBoolean(
android.R.bool.config_enableDefaultNotesForWorkProfile);
}
@Override
@@ -317,25 +321,27 @@ public class StylusDevicesController extends AbstractPreferenceController implem
final List<UserHandle> userProfiles = new ArrayList<>();
userProfiles.add(currentUser);
final List<UserInfo> userInfos = um.getProfiles(currentUser.getIdentifier());
for (UserInfo userInfo : userInfos) {
if (userInfo.isManagedProfile()
|| (android.os.Flags.allowPrivateProfile()
&& android.multiuser.Flags.enablePrivateSpaceFeatures()
&& android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()
&& userInfo.isPrivateProfile())) {
userProfiles.add(userInfo.getUserHandle());
if (mConfigEnableDefaultNotesForWorkProfile) {
final List<UserInfo> userInfos = um.getProfiles(currentUser.getIdentifier());
for (UserInfo userInfo : userInfos) {
if (userInfo.isManagedProfile()) {
userProfiles.add(userInfo.getUserHandle());
}
}
}
return userProfiles;
}
private UserHandle getDefaultNoteTaskProfile() {
final int userId = Secure.getInt(
mContext.getContentResolver(),
Secure.DEFAULT_NOTE_TASK_PROFILE,
UserHandle.myUserId());
return UserHandle.of(userId);
final int currentUserId = UserHandle.myUserId();
if (mConfigEnableDefaultNotesForWorkProfile) {
final int userId = Secure.getInt(
mContext.getContentResolver(),
Secure.DEFAULT_NOTE_TASK_PROFILE,
currentUserId);
return UserHandle.of(userId);
}
return UserHandle.of(currentUserId);
}
@VisibleForTesting