-
Notifications
You must be signed in to change notification settings - Fork 15k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: remove usage of setapplicationisdaemon in MAS builds
- Loading branch information
1 parent
86aa9ca
commit d229583
Showing
1 changed file
with
52 additions
and
0 deletions.
There are no files selected for viewing
52 changes: 52 additions & 0 deletions
52
patches/common/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Samuel Attard <sattard@slack-corp.com> | ||
Date: Mon, 4 Mar 2019 14:51:45 -0800 | ||
Subject: fix: disable usage of SetApplicationIsDaemon and | ||
_LSSetApplicationLaunchServicesServerConnectionStatus in MAS builds | ||
|
||
|
||
diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc | ||
index 4450cc711772c600f138acb5458eb8ab0801ecf5..58e81aac8f8c97e5a3b3cd32b4d95789e14d2d31 100644 | ||
--- a/content/utility/utility_service_factory.cc | ||
+++ b/content/utility/utility_service_factory.cc | ||
@@ -195,7 +195,7 @@ void UtilityServiceFactory::RunNetworkServiceOnIOThread( | ||
std::unique_ptr<service_manager::Service> | ||
UtilityServiceFactory::CreateAudioService( | ||
service_manager::mojom::ServiceRequest request) { | ||
-#if defined(OS_MACOSX) | ||
+#if defined(OS_MACOSX) && !defined(MAS_BUILD) | ||
// Don't connect to launch services when running sandboxed | ||
// (https://crbug.com/874785). | ||
if (base::FeatureList::IsEnabled( | ||
diff --git a/sandbox/mac/system_services.cc b/sandbox/mac/system_services.cc | ||
index caa30bb378b30331f90057fe7ce3aec724104bf8..a766daa808495f7872051e129c6ad9f76f54e4fe 100644 | ||
--- a/sandbox/mac/system_services.cc | ||
+++ b/sandbox/mac/system_services.cc | ||
@@ -9,16 +9,19 @@ | ||
|
||
#include "base/mac/mac_logging.h" | ||
|
||
+#if !defined(MAS_BUILD) | ||
extern "C" { | ||
OSStatus SetApplicationIsDaemon(Boolean isDaemon); | ||
void _LSSetApplicationLaunchServicesServerConnectionStatus( | ||
uint64_t flags, | ||
bool (^connection_allowed)(CFDictionaryRef options)); | ||
} // extern "C" | ||
+#endif | ||
|
||
namespace sandbox { | ||
|
||
void DisableLaunchServices() { | ||
+ #if !defined(MAS_BUILD) | ||
// Allow the process to continue without a LaunchServices ASN. The | ||
// INIT_Process function in HIServices will abort if it cannot connect to | ||
// launchservicesd to get an ASN. By setting this flag, HIServices skips | ||
@@ -32,6 +35,7 @@ void DisableLaunchServices() { | ||
0, ^bool(CFDictionaryRef options) { | ||
return false; | ||
}); | ||
+ #endif | ||
} | ||
|
||
} // namespace sandbox |