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

Merge "Fix blocked sensor chip to hide if settings change." into tm-qpr-dev am: 2b708c99c3

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

Change-Id: Ibd3a186752e514ab2a8b194a101486d25b9a18f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Victor Truong
2022-08-08 15:32:31 +00:00
committed by Automerger Merge Worker
parent b446de7503 2b708c99c3
commit 2761a05c33
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java
View File

@@ -215,16 +215,15 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve
final boolean cameraBlocked = mSensorPrivacyController final boolean cameraBlocked = mSensorPrivacyController
.isSensorBlocked(SensorPrivacyManager.Sensors.CAMERA); .isSensorBlocked(SensorPrivacyManager.Sensors.CAMERA);
@DreamOverlayStatusBarView.StatusIconType int iconType = Resources.ID_NULL; @DreamOverlayStatusBarView.StatusIconType int iconType = Resources.ID_NULL;
if (micBlocked && cameraBlocked) { showIcon(
iconType = DreamOverlayStatusBarView.STATUS_ICON_MIC_CAMERA_DISABLED; DreamOverlayStatusBarView.STATUS_ICON_CAMERA_DISABLED,
} else if (!micBlocked && cameraBlocked) { !micBlocked && cameraBlocked);
iconType = DreamOverlayStatusBarView.STATUS_ICON_CAMERA_DISABLED; showIcon(
} else if (micBlocked && !cameraBlocked) { DreamOverlayStatusBarView.STATUS_ICON_MIC_DISABLED,
iconType = DreamOverlayStatusBarView.STATUS_ICON_MIC_DISABLED; micBlocked && !cameraBlocked);
} showIcon(
if (iconType != Resources.ID_NULL) { DreamOverlayStatusBarView.STATUS_ICON_MIC_CAMERA_DISABLED,
showIcon(iconType, true); micBlocked && cameraBlocked);
}
} }
private String buildNotificationsContentDescription(int notificationCount) { private String buildNotificationsContentDescription(int notificationCount) {