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

Merge "Properly handle HSUM no-user in the ContextHubService" into udc-qpr-dev am: 66224219ba

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23519828

Change-Id: Ifb744404b06a85c8ab276463209fcea2f2bb11ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matthew Sedam
2023-06-02 15:23:50 +00:00
committed by Automerger Merge Worker
parent 807cebe9e4 66224219ba
commit 0dad20a508
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/location/contexthub/ContextHubService.java
View File

@@ -52,6 +52,7 @@ import android.os.ResultReceiver;
import android.os.ShellCallback; import android.os.ShellCallback;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
@@ -169,6 +170,8 @@ public class ContextHubService extends IContextHubService.Stub {
private SensorPrivacyManagerInternal mSensorPrivacyManagerInternal; private SensorPrivacyManagerInternal mSensorPrivacyManagerInternal;
private UserManager mUserManager = null;
private final Map<Integer, AtomicLong> mLastRestartTimestampMap = new HashMap<>(); private final Map<Integer, AtomicLong> mLastRestartTimestampMap = new HashMap<>();
/** /**
@@ -491,6 +494,14 @@ public class ContextHubService extends IContextHubService.Stub {
return; return;
} }
if (mUserManager == null) {
mUserManager = mContext.getSystemService(UserManager.class);
if (mUserManager == null) {
Log.e(TAG, "Unable to get the UserManager service");
return;
}
}
sendMicrophoneDisableSettingUpdateForCurrentUser(); sendMicrophoneDisableSettingUpdateForCurrentUser();
if (mSensorPrivacyManagerInternal == null) { if (mSensorPrivacyManagerInternal == null) {
Log.e(TAG, "Unable to add a sensor privacy listener for all users"); Log.e(TAG, "Unable to add a sensor privacy listener for all users");
@@ -499,8 +510,9 @@ public class ContextHubService extends IContextHubService.Stub {
mSensorPrivacyManagerInternal.addSensorPrivacyListenerForAllUsers( mSensorPrivacyManagerInternal.addSensorPrivacyListenerForAllUsers(
SensorPrivacyManager.Sensors.MICROPHONE, (userId, enabled) -> { SensorPrivacyManager.Sensors.MICROPHONE, (userId, enabled) -> {
if (userId == getCurrentUserId()) { // If we are in HSUM mode, any user can change the microphone setting
Log.d(TAG, "User: " + userId + "mic privacy: " + enabled); if (mUserManager.isHeadlessSystemUserMode() || userId == getCurrentUserId()) {
Log.d(TAG, "User: " + userId + " mic privacy: " + enabled);
sendMicrophoneDisableSettingUpdate(enabled); sendMicrophoneDisableSettingUpdate(enabled);
} }
}); });