Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9823c691 authored by Jyoti Bhayana's avatar Jyoti Bhayana
Browse files

Implement camera privacy allowlist. 

This feature enables the user to access the camera for certain
driver assistance applications regardless of the device-wide global
camera privacy toggle in order to preserve user safety and meet
safety regulations.

Flag: ACONFIG com.android.internal.camera.flags.privacy_allowlist DEVELOPMENT
Bug: 300986585
Test: Build and test using  kitchensink.
API-Coverage-Bug: 319517749
Change-Id: I292e9de82e3b6c00ab5ee42547b69d6e73ab5e88
parent 00632d5d

core/api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ package android { 
    field public static final String CAMERA_DISABLE_TRANSMIT_LED = "android.permission.CAMERA_DISABLE_TRANSMIT_LED";

    field @FlaggedApi("com.android.internal.camera.flags.camera_hsum_permission") public static final String CAMERA_HEADLESS_SYSTEM_USER = "android.permission.CAMERA_HEADLESS_SYSTEM_USER";

    field public static final String CAMERA_OPEN_CLOSE_LISTENER = "android.permission.CAMERA_OPEN_CLOSE_LISTENER";

    field @FlaggedApi("com.android.internal.camera.flags.privacy_allowlist") public static final String CAMERA_PRIVACY_ALLOWLIST = "android.permission.CAMERA_PRIVACY_ALLOWLIST";

    field public static final String CAPTURE_AUDIO_HOTWORD = "android.permission.CAPTURE_AUDIO_HOTWORD";

    field public static final String CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD = "android.permission.CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD";

    field public static final String CAPTURE_MEDIA_OUTPUT = "android.permission.CAPTURE_MEDIA_OUTPUT";
@@ -4517,11 +4518,15 @@ package android.hardware { 
    method @RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY) public void addSensorPrivacyListener(@NonNull android.hardware.SensorPrivacyManager.OnSensorPrivacyChangedListener);

    method @RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY) public void addSensorPrivacyListener(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.SensorPrivacyManager.OnSensorPrivacyChangedListener);

    method @RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY) public boolean areAnySensorPrivacyTogglesEnabled(int);

    method @FlaggedApi("com.android.internal.camera.flags.privacy_allowlist") @NonNull @RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY) public java.util.Map<java.lang.String,java.lang.Boolean> getCameraPrivacyAllowlist();

    method @FlaggedApi("com.android.internal.camera.flags.privacy_allowlist") @RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY) public int getSensorPrivacyState(int, int);

    method @FlaggedApi("com.android.internal.camera.flags.privacy_allowlist") @RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY) public boolean isCameraPrivacyEnabled(@NonNull String);

    method @Deprecated @RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY) public boolean isSensorPrivacyEnabled(int);

    method @RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY) public boolean isSensorPrivacyEnabled(int, int);

    method @RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY) public void removeSensorPrivacyListener(int, @NonNull android.hardware.SensorPrivacyManager.OnSensorPrivacyChangedListener);

    method @RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY) public void removeSensorPrivacyListener(@NonNull android.hardware.SensorPrivacyManager.OnSensorPrivacyChangedListener);

    method @RequiresPermission(android.Manifest.permission.MANAGE_SENSOR_PRIVACY) public void setSensorPrivacy(int, boolean);

    method @FlaggedApi("com.android.internal.camera.flags.privacy_allowlist") @RequiresPermission(android.Manifest.permission.MANAGE_SENSOR_PRIVACY) public void setSensorPrivacyState(int, int);

  }















  public static interface SensorPrivacyManager.OnSensorPrivacyChangedListener {









@@ -4531,6 +4536,7 @@ package android.hardware {



























  public static class SensorPrivacyManager.OnSensorPrivacyChangedListener.SensorPrivacyChangedParams {















    method public int getSensor();













    method @FlaggedApi("com.android.internal.camera.flags.privacy_allowlist") public int getState();















    method public int getToggleType();















    method public boolean isEnabled();















  }

























core/api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -1523,6 +1523,7 @@ package android.hardware {





























  public final class SensorPrivacyManager {















    method @RequiresPermission(android.Manifest.permission.MANAGE_SENSOR_PRIVACY) public void setSensorPrivacy(int, int, boolean);













    method @FlaggedApi("com.android.internal.camera.flags.privacy_allowlist") @RequiresPermission(android.Manifest.permission.MANAGE_SENSOR_PRIVACY) public void setSensorPrivacyState(int, int, int);















  }































  public static class SensorPrivacyManager.Sources {

































core/java/android/hardware/CameraPrivacyAllowlistEntry.aidl
0 → 100644



+24
−0




























Original line number
Diff line number
Diff line













/**













 * Copyright (c) 2024, The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *     http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.hardware;



























/** @hide */













parcelable CameraPrivacyAllowlistEntry {













    String packageName;













    boolean isMandatory;













}





































core/java/android/hardware/ISensorPrivacyListener.aidl



+1
−0




























Original line number
Diff line number
Diff line








@@ -25,5 +25,6 @@ oneway interface ISensorPrivacyListener {













    //   frameworks/native/libs/sensorprivacy/aidl/android/hardware/ISensorPrivacyListener.aidl















    // =============== Beginning of transactions used on native side as well ======================















    void onSensorPrivacyChanged(int toggleType, int sensor, boolean enabled);













    void onSensorPrivacyStateChanged(int toggleType, int sensor, int state);















    // =============== End of transactions used on native side as well ============================















}
























core/java/android/hardware/ISensorPrivacyManager.aidl



+18
−1




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.hardware;





























import android.hardware.CameraPrivacyAllowlistEntry;















import android.hardware.ISensorPrivacyListener;































/** @hide */










@@ -45,6 +46,22 @@ interface ISensorPrivacyManager {













    void setToggleSensorPrivacy(int userId, int source, int sensor, boolean enable);































    void setToggleSensorPrivacyForProfileGroup(int userId, int source, int sensor, boolean enable);



























    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY)")













    List<CameraPrivacyAllowlistEntry> getCameraPrivacyAllowlist();



























    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY)")













    int getToggleSensorPrivacyState(int toggleType, int sensor);



























    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_SENSOR_PRIVACY)")













    void setToggleSensorPrivacyState(int userId, int source, int sensor, int state);



























    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_SENSOR_PRIVACY)")













    void setToggleSensorPrivacyStateForProfileGroup(int userId, int source, int sensor, int  state);



























    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.OBSERVE_SENSOR_PRIVACY)")













    boolean isCameraPrivacyEnabled(String packageName);





























    // =============== End of transactions used on native side as well ============================































    void suppressToggleSensorPrivacyReminders(int userId, int sensor, IBinder token,