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

Commit bb9bfbb6 authored by Daniel Nicoara's avatar Daniel Nicoara Committed by android-build-merger
Browse files

Merge changes from topic 'allow-vrcore' into oc-dev am: f2a4bd80 

am: 15e928b0

Change-Id: Iadd164e096f4a744522ecd6f7926636f50ba1ad9
parents f8016153 15e928b0

services/vr/virtual_touchpad/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ cc_binary { 
    cppflags: ["-std=c++11"],

    cflags: [

        "-DLOG_TAG=\"VrVirtualTouchpad\"",

        "-DSELINUX_ACCESS_CONTROL",

    ],

    host_ldlibs: ["-llog"],

    name: "virtual_touchpad",

services/vr/virtual_touchpad/VirtualTouchpadService.cpp

+0 −4
Original line number Diff line number Diff line
@@ -122,9 +122,6 @@ bool VirtualTouchpadService::CheckPermissions() { 
bool VirtualTouchpadService::CheckTouchPermission(pid_t* out_pid) {

  const android::IPCThreadState* ipc = android::IPCThreadState::self();

  *out_pid = ipc->getCallingPid();

#ifdef SELINUX_ACCESS_CONTROL

  return true;

#else

  const uid_t uid = ipc->getCallingUid();

  const bool permission = PermissionCache::checkPermission(kTouchPermission, *out_pid, uid);

  if (!permission) {
@@ -132,7 +129,6 @@ bool VirtualTouchpadService::CheckTouchPermission(pid_t* out_pid) { 
          static_cast<long>(uid));

  }

  return permission;

#endif

}



}  // namespace dvr