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

Commit 527024a3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't obtain parent user when not necessary in native permission helper"

parents 754121f1 9d573a34

android/app/jni/permission_helpers.cc

+5 −3
Original line number Original line Diff line number Diff line
@@ -63,6 +63,10 @@ bool isCallerActiveUserOrManagedProfile() { 
  uid_t callingUser = callingUid / PER_USER_RANGE;

  uid_t callingUser = callingUid / PER_USER_RANGE;

  // if (!callingUid) return true;  // It's a local call

  // if (!callingUid) return true;  // It's a local call





  if ((foregroundUserId == callingUser) || (systemUiUid == callingUid) ||

      (SYSTEM_UID == callingUid))

    return true;



  uid_t parentUser = callingUser;

  uid_t parentUser = callingUser;





  sp<IServiceManager> sm = defaultServiceManager();

  sp<IServiceManager> sm = defaultServiceManager();
@@ -75,9 +79,7 @@ bool isCallerActiveUserOrManagedProfile() { 
    ipcState->restoreCallingIdentity(ident);

    ipcState->restoreCallingIdentity(ident);

  }

  }





  return (foregroundUserId == callingUser) ||

  return foregroundUserId == parentUser;

         (foregroundUserId == parentUser) || (systemUiUid == callingUid) ||

         (SYSTEM_UID == callingUid);

}

}





}  // namespace bluetooth

}  // namespace bluetooth