Merge "Use parent user for checking if sensor dialog needs to be suppressed" into sc-qpr1-dev

2021-09-22 22:59:12 +00:00
parent 4f23ccd8e0 13699d06cf
commit ea07bec30f
1 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/SensorPrivacyService.java
+++ b/services/core/java/com/android/server/SensorPrivacyService.java
@@ -420,9 +420,12 @@ public final class SensorPrivacyService extends SystemService {
            }

            synchronized (mLock) {
-                if (mSuppressReminders.containsKey(new Pair<>(sensor, user))) {
+                UserHandle parentUser = UserHandle.of(mUserManagerInternal
+                        .getProfileParentId(user.getIdentifier()));
+                if (mSuppressReminders.containsKey(new Pair<>(sensor, parentUser))) {
                    Log.d(TAG,
-                            "Suppressed sensor privacy reminder for " + packageName + "/" + user);
+                            "Suppressed sensor privacy reminder for " + packageName + "/"
+                                    + parentUser);
                    return;
                }
            }