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

[RESTRICT AUTOMERGE] Force enabling Notes role from developer options affects all users.

Browse Source 
Restricting merge due to conflicts; will manually CP this to master.

Bug: 276432652
Test: ForceEnableNotesRolePreferenceControllerTest
Change-Id: Ic0fa7f33dcb6509908008774c725eec386d0608b
This commit is contained in:
Vania Januar
2023-04-12 18:24:13 +01:00
parent 4d737d7813
commit a1b7888c30
2 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/development/ForceEnableNotesRolePreferenceController.java
View File

@@ -31,12 +31,12 @@
package com.android.settings.development;
import static android.os.UserHandle.USER_CURRENT;
import android.content.Context;
import android.content.om.IOverlayManager;
import android.content.pm.UserInfo;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
@@ -50,18 +50,22 @@ public class ForceEnableNotesRolePreferenceController
extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
@VisibleForTesting
static final String OVERLAY_PACKAGE_NAME =
"com.android.role.notes.enabled";
private static final String NOTES_ROLE_ENABLED_KEY =
"force_enable_notes_role";
private static final String OVERLAY_PACKAGE_NAME =
"com.android.role.notes.enabled";
private final IOverlayManager mOverlayManager;
private final UserManager mUserManager;
public ForceEnableNotesRolePreferenceController(Context context) {
super(context);
mOverlayManager = IOverlayManager.Stub.asInterface(
ServiceManager.getService(Context.OVERLAY_SERVICE));
mUserManager = context.getSystemService(UserManager.class);
}
@Override
@@ -95,7 +99,11 @@ public class ForceEnableNotesRolePreferenceController
@VisibleForTesting
protected void setEnabled(boolean enabled) {
try {
mOverlayManager.setEnabled(OVERLAY_PACKAGE_NAME, enabled, USER_CURRENT);
for (UserInfo user : mUserManager.getUsers()) {
if (user.isFull() || user.isProfile()) {
mOverlayManager.setEnabled(OVERLAY_PACKAGE_NAME, enabled, user.id);
}
}
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}