mirror of
https://github.com/Evolution-X-Devices/device_google_wahoo
synced 2026-01-29 14:38:00 +00:00
Merge "remove cameraHAL to perfd interface" into oc-dr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
7a7af08804
@@ -210,11 +210,11 @@ static int process_video_encode_hint(void *data)
|
|||||||
resource_values = getPowerhint(DEFAULT_VIDEO_ENCODE_HINT_ID, &resources);
|
resource_values = getPowerhint(DEFAULT_VIDEO_ENCODE_HINT_ID, &resources);
|
||||||
if (resource_values != NULL)
|
if (resource_values != NULL)
|
||||||
perform_hint_action(DEFAULT_VIDEO_ENCODE_HINT_ID, resource_values, resources);
|
perform_hint_action(DEFAULT_VIDEO_ENCODE_HINT_ID, resource_values, resources);
|
||||||
ALOGI("Video Encode hint start");
|
ALOGD("Video Encode hint start");
|
||||||
return HINT_HANDLED;
|
return HINT_HANDLED;
|
||||||
} else {
|
} else {
|
||||||
undo_hint_action(DEFAULT_VIDEO_ENCODE_HINT_ID);
|
undo_hint_action(DEFAULT_VIDEO_ENCODE_HINT_ID);
|
||||||
ALOGI("Video Encode hint stop");
|
ALOGD("Video Encode hint stop");
|
||||||
return HINT_HANDLED;
|
return HINT_HANDLED;
|
||||||
}
|
}
|
||||||
return HINT_NONE;
|
return HINT_NONE;
|
||||||
@@ -233,7 +233,7 @@ static int process_activity_launch_hint(void *data)
|
|||||||
launch_handle = process_boost(launch_handle, duration);
|
launch_handle = process_boost(launch_handle, duration);
|
||||||
if (launch_handle > 0) {
|
if (launch_handle > 0) {
|
||||||
launch_mode = 1;
|
launch_mode = 1;
|
||||||
ALOGI("Activity launch hint handled");
|
ALOGD("Activity launch hint handled");
|
||||||
return HINT_HANDLED;
|
return HINT_HANDLED;
|
||||||
} else {
|
} else {
|
||||||
return HINT_NONE;
|
return HINT_NONE;
|
||||||
|
|||||||
@@ -125,10 +125,10 @@ void power_hint(power_hint_t hint, void *data)
|
|||||||
case POWER_HINT_VSYNC:
|
case POWER_HINT_VSYNC:
|
||||||
break;
|
break;
|
||||||
case POWER_HINT_SUSTAINED_PERFORMANCE:
|
case POWER_HINT_SUSTAINED_PERFORMANCE:
|
||||||
ALOGI("Sustained perf power hint not handled in power_hint_override");
|
ALOGD("Sustained perf power hint not handled in power_hint_override");
|
||||||
break;
|
break;
|
||||||
case POWER_HINT_VR_MODE:
|
case POWER_HINT_VR_MODE:
|
||||||
ALOGI("VR mode power hint not handled in power_hint_override");
|
ALOGD("VR mode power hint not handled in power_hint_override");
|
||||||
break;
|
break;
|
||||||
case POWER_HINT_INTERACTION:
|
case POWER_HINT_INTERACTION:
|
||||||
{
|
{
|
||||||
@@ -164,7 +164,7 @@ void power_set_interactive(int on)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ALOGI("Got set_interactive hint");
|
ALOGD("Got set_interactive hint");
|
||||||
|
|
||||||
if (get_scaling_governor(governor, sizeof(governor)) == -1) {
|
if (get_scaling_governor(governor, sizeof(governor)) == -1) {
|
||||||
ALOGE("Can't obtain scaling governor.");
|
ALOGE("Can't obtain scaling governor.");
|
||||||
|
|||||||
@@ -169,8 +169,5 @@ int* getPowerhint(int hint_id, int *params) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*for (int j = 0; j < *params; j++)
|
return result;
|
||||||
ALOGI("Powerhal resource again%x = \n", result[j]);*/
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|||||||
6
sepolicy/vendor/hal_camera.te
vendored
6
sepolicy/vendor/hal_camera.te
vendored
@@ -1,7 +1,3 @@
|
|||||||
# communicate with perfd
|
|
||||||
allow hal_camera perfd:unix_stream_socket connectto;
|
|
||||||
allow hal_camera perfd_socket:sock_file write;
|
|
||||||
|
|
||||||
allow hal_camera self:capability sys_nice;
|
allow hal_camera self:capability sys_nice;
|
||||||
|
|
||||||
# communicate with camera
|
# communicate with camera
|
||||||
@@ -11,8 +7,6 @@ allow hal_camera self:capability sys_nice;
|
|||||||
|
|
||||||
allow hal_camera gpu_device:chr_file rw_file_perms;
|
allow hal_camera gpu_device:chr_file rw_file_perms;
|
||||||
|
|
||||||
allow hal_camera perfd_socket:sock_file w_file_perms;
|
|
||||||
|
|
||||||
# access to /dev/input/event{5,10}
|
# access to /dev/input/event{5,10}
|
||||||
allow hal_camera input_device:dir r_dir_perms;
|
allow hal_camera input_device:dir r_dir_perms;
|
||||||
allow hal_camera input_device:chr_file r_file_perms;
|
allow hal_camera input_device:chr_file r_file_perms;
|
||||||
|
|||||||
Reference in New Issue
Block a user