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

Merge "Let the contrast API support multiple users" into udc-dev

Browse Source
This commit is contained in:
Aurélien Pomini
2023-04-25 16:25:50 +00:00
committed by Android (Google) Code Review
parent e618d251ac 34dbe68990
commit ff92cb0df3
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/UiModeManagerService.java
View File

@@ -28,6 +28,7 @@ import static android.app.UiModeManager.MODE_NIGHT_YES;
import static android.app.UiModeManager.PROJECTION_TYPE_AUTOMOTIVE;
import static android.app.UiModeManager.PROJECTION_TYPE_NONE;
import static android.os.UserHandle.USER_SYSTEM;
import static android.os.UserHandle.getCallingUserId;
import static android.provider.Settings.Secure.CONTRAST_LEVEL;
import static android.util.TimeUtils.isTimeBetween;
@@ -199,8 +200,8 @@ final class UiModeManagerService extends SystemService {
private PowerManagerInternal mLocalPowerManager;
@GuardedBy("mLock")
private final RemoteCallbackList<IUiModeManagerCallback> mUiModeManagerCallbacks =
new RemoteCallbackList<IUiModeManagerCallback>();
private final SparseArray<RemoteCallbackList<IUiModeManagerCallback>> mUiModeManagerCallbacks =
new SparseArray<>();
@GuardedBy("mLock")
@Nullable
@@ -371,8 +372,9 @@ final class UiModeManagerService extends SystemService {
synchronized (mLock) {
if (updateContrastLocked()) {
float contrast = getContrastLocked();
mUiModeManagerCallbacks.broadcast(ignoreRemoteException(callback ->
callback.notifyContrastChanged(contrast)));
mUiModeManagerCallbacks.get(mCurrentUser, new RemoteCallbackList<>())
.broadcast(ignoreRemoteException(
callback -> callback.notifyContrastChanged(contrast)));
}
}
}
@@ -664,8 +666,12 @@ final class UiModeManagerService extends SystemService {
private final IUiModeManager.Stub mService = new IUiModeManager.Stub() {
@Override
public void addCallback(IUiModeManagerCallback callback) {
int userId = getCallingUserId();
synchronized (mLock) {
mUiModeManagerCallbacks.register(callback);
if (!mUiModeManagerCallbacks.contains(userId)) {
mUiModeManagerCallbacks.put(userId, new RemoteCallbackList<>());
}
mUiModeManagerCallbacks.get(userId).register(callback);
}
}