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

Commit bd098d4e authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'camera-hardening' 

* changes:
  Add cameraserver process
  Camera: update connect call
parents 45fbe46d 75cade0a

core/java/android/os/Process.java

+6 −0
Original line number Diff line number Diff line
@@ -149,6 +149,12 @@ public class Process { 
     */

    public static final int AUDIOSERVER_UID = 1041;



    /**

     * Defines the UID/GID for the cameraserver process

     * @hide

     */

    public static final int CAMERASERVER_UID = 1046;



    /**

     * Defines the start of a range of UIDs (and GIDs), going from this

     * number to {@link #LAST_APPLICATION_UID} that are reserved for assigning

core/jni/android_hardware_Camera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static jint android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, 
    if (halVersion == CAMERA_HAL_API_VERSION_NORMAL_CONNECT) {

        // Default path: hal version is don't care, do normal camera connect.

        camera = Camera::connect(cameraId, clientName,

                Camera::USE_CALLING_UID);

                Camera::USE_CALLING_UID, Camera::USE_CALLING_PID);

    } else {

        jint status = Camera::connectLegacy(cameraId, halVersion, clientName,

                Camera::USE_CALLING_UID, camera);

data/etc/platform.xml

+8 −2
Original line number Diff line number Diff line
@@ -136,6 +136,12 @@ 
    <assign-permission name="android.permission.UPDATE_DEVICE_STATS" uid="audioserver" />

    <assign-permission name="android.permission.UPDATE_APP_OPS_STATS" uid="audioserver" />



    <assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="cameraserver" />

    <assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="cameraserver" />

    <assign-permission name="android.permission.WAKE_LOCK" uid="cameraserver" />

    <assign-permission name="android.permission.UPDATE_DEVICE_STATS" uid="cameraserver" />

    <assign-permission name="android.permission.UPDATE_APP_OPS_STATS" uid="cameraserver" />



    <assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="graphics" />



    <!-- This is a list of all the libraries available for application

services/core/java/com/android/server/AppOpsService.java

+3 −0
Original line number Diff line number Diff line
@@ -1181,6 +1181,9 @@ public class AppOpsService extends IAppOpsService.Stub { 
                            } else if ("audioserver".equals(packageName)) {

                                pkgUid = Process.AUDIOSERVER_UID;

                                isPrivileged = false;

                            } else if ("cameraserver".equals(packageName)) {

                                pkgUid = Process.CAMERASERVER_UID;

                                isPrivileged = false;

                            }

                        }

                    } catch (RemoteException e) {