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

Commit 87f5a040 authored by Jyoti Bhayana's avatar Jyoti Bhayana Committed by Android (Google) Code Review
Browse files

Merge "Modify the API for camera privacy allowlist" into main

parents 7c20ba90 6424edee

libs/sensorprivacy/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ cc_library_shared { 
filegroup {

    name: "libsensorprivacy_aidl",

    srcs: [

        "aidl/android/hardware/CameraPrivacyAllowlistEntry.aidl",

        "aidl/android/hardware/ISensorPrivacyListener.aidl",

        "aidl/android/hardware/ISensorPrivacyManager.aidl",

    ],

libs/sensorprivacy/SensorPrivacyManager.cpp

+2 −3
Original line number Diff line number Diff line
@@ -155,10 +155,9 @@ int SensorPrivacyManager::getToggleSensorPrivacyState(int toggleType, int sensor 
    return DISABLED;

}



std::vector<hardware::CameraPrivacyAllowlistEntry>

        SensorPrivacyManager::getCameraPrivacyAllowlist(){

std::vector<String16> SensorPrivacyManager::getCameraPrivacyAllowlist(){

    sp<hardware::ISensorPrivacyManager> service = getService();

    std::vector<hardware::CameraPrivacyAllowlistEntry> result;

    std::vector<String16> result;

    if (service != nullptr) {

        service->getCameraPrivacyAllowlist(&result);

        return result;

libs/sensorprivacy/aidl/android/hardware/CameraPrivacyAllowlistEntry.aidl

deleted100644 → 0
+0 −22
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;



parcelable CameraPrivacyAllowlistEntry {

    String packageName;

    boolean isMandatory;

}

libs/sensorprivacy/aidl/android/hardware/ISensorPrivacyManager.aidl

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.hardware;



import android.hardware.CameraPrivacyAllowlistEntry;

import android.hardware.ISensorPrivacyListener;



/** @hide */
@@ -43,7 +42,7 @@ interface ISensorPrivacyManager { 


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



    List<CameraPrivacyAllowlistEntry> getCameraPrivacyAllowlist();

    List<String> getCameraPrivacyAllowlist();



    int getToggleSensorPrivacyState(int toggleType, int sensor);

libs/sensorprivacy/include/sensorprivacy/SensorPrivacyManager.h

+2 −4
Original line number Diff line number Diff line
@@ -45,9 +45,7 @@ public: 
    enum {

        ENABLED = 1,

        DISABLED = 2,

        AUTOMOTIVE_DRIVER_ASSISTANCE_HELPFUL_APPS = 3,

        AUTOMOTIVE_DRIVER_ASSISTANCE_REQUIRED_APPS = 4,

        AUTOMOTIVE_DRIVER_ASSISTANCE_APPS = 5

        ENABLED_EXCEPT_ALLOWLISTED_APPS = 3

    };



    SensorPrivacyManager();
@@ -62,7 +60,7 @@ public: 
    bool isToggleSensorPrivacyEnabled(int toggleType, int sensor);

    status_t isToggleSensorPrivacyEnabled(int toggleType, int sensor, bool &result);

    int getToggleSensorPrivacyState(int toggleType, int sensor);

    std::vector<hardware::CameraPrivacyAllowlistEntry> getCameraPrivacyAllowlist();

    std::vector<String16> getCameraPrivacyAllowlist();

    bool isCameraPrivacyEnabled(String16 packageName);



    status_t linkToDeath(const sp<IBinder::DeathRecipient>& recipient);