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

Commit a4be3a43 authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Revert "Implement camera privacy allowlist." 

Revert submission 25847276-camera_privacy_allowlist

Reason for revert: Culprit for b/324646239. 

Reverted changes: /q/submissionid:25847276-camera_privacy_allowlist

Change-Id: Idcddee78d5bf6df7274bd1ecf0c6089e54e4935d
parent 9823c691

core/api/system-current.txt

+0 −6
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ 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";
@@ -4518,15 +4517,11 @@ 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 {









@@ -4536,7 +4531,6 @@ 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



+0
−1




























Original line number
Diff line number
Diff line








@@ -1523,7 +1523,6 @@ 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
deleted100644 → 0



+0
−24




























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



+0
−1




























Original line number
Diff line number
Diff line








@@ -25,6 +25,5 @@ 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



+1
−18




























Original line number
Diff line number
Diff line








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





























package android.hardware;





























import android.hardware.CameraPrivacyAllowlistEntry;















import android.hardware.ISensorPrivacyListener;































/** @hide */










@@ -46,22 +45,6 @@ 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,