OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "services/device/device_service.h" | 5 #include "services/device/device_service.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
11 #include "device/battery/battery_monitor.mojom.h" | |
12 #include "device/battery/battery_monitor_impl.h" | |
13 #include "device/battery/battery_status_service.h" | |
11 #include "device/power_monitor/power_monitor_message_broadcaster.h" | 14 #include "device/power_monitor/power_monitor_message_broadcaster.h" |
12 #include "device/time_zone_monitor/time_zone_monitor.h" | 15 #include "device/time_zone_monitor/time_zone_monitor.h" |
16 #include "mojo/public/cpp/system/message_pipe.h" | |
13 #include "services/service_manager/public/cpp/connection.h" | 17 #include "services/service_manager/public/cpp/connection.h" |
14 #include "services/service_manager/public/cpp/interface_registry.h" | 18 #include "services/service_manager/public/cpp/interface_registry.h" |
15 | 19 |
20 #if defined(OS_ANDROID) | |
21 #include "base/android/context_utils.h" | |
22 #include "base/android/jni_android.h" | |
23 #include "jni/InterfaceRegistrar_jni.h" | |
24 #endif | |
25 | |
16 namespace device { | 26 namespace device { |
17 | 27 |
18 std::unique_ptr<service_manager::Service> CreateDeviceService( | 28 std::unique_ptr<service_manager::Service> CreateDeviceService( |
19 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) { | 29 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) { |
20 return base::MakeUnique<DeviceService>(std::move(file_task_runner)); | 30 return base::MakeUnique<DeviceService>(std::move(file_task_runner)); |
21 } | 31 } |
22 | 32 |
23 DeviceService::DeviceService( | 33 DeviceService::DeviceService( |
24 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) | 34 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) |
25 : file_task_runner_(std::move(file_task_runner)) {} | 35 : file_task_runner_(std::move(file_task_runner)) { |
36 } | |
26 | 37 |
27 DeviceService::~DeviceService() {} | 38 DeviceService::~DeviceService() { |
39 #if !defined(OS_ANDROID) | |
40 { device::BatteryStatusService::GetInstance()->Shutdown(); } | |
41 #endif | |
42 } | |
28 | 43 |
29 void DeviceService::OnStart() {} | 44 void DeviceService::OnStart() {} |
30 | 45 |
31 bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info, | 46 bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info, |
32 service_manager::InterfaceRegistry* registry) { | 47 service_manager::InterfaceRegistry* registry) { |
33 registry->AddInterface<mojom::PowerMonitor>(this); | 48 registry->AddInterface<mojom::PowerMonitor>(this); |
34 registry->AddInterface<mojom::TimeZoneMonitor>(this); | 49 registry->AddInterface<mojom::TimeZoneMonitor>(this); |
50 | |
51 #if defined(OS_ANDROID) | |
52 InitializeJavaInterfaceProviderIfNeeded(); | |
Sam McNally
2017/01/25 05:53:06
I'd prefer this as a getter for |java_interface_pr
blundell
2017/01/25 15:00:34
Done.
| |
53 | |
54 registry->AddInterface<BatteryMonitor>( | |
Sam McNally
2017/01/25 05:53:06
The <BatteryMonitor> is unnecessary.
blundell
2017/01/25 15:00:34
Done.
| |
55 java_interface_provider_.CreateInterfaceFactory<BatteryMonitor>()); | |
56 #else | |
57 registry->AddInterface<BatteryMonitor>(this); | |
58 #endif | |
59 | |
35 return true; | 60 return true; |
36 } | 61 } |
37 | 62 |
63 #if !defined(OS_ANDROID) | |
64 void DeviceService::Create(const service_manager::Identity& remote_identity, | |
65 BatteryMonitorRequest request) { | |
66 device::BatteryMonitorImpl::Create(std::move(request)); | |
67 } | |
68 #endif | |
69 | |
38 void DeviceService::Create(const service_manager::Identity& remote_identity, | 70 void DeviceService::Create(const service_manager::Identity& remote_identity, |
39 mojom::PowerMonitorRequest request) { | 71 mojom::PowerMonitorRequest request) { |
40 PowerMonitorMessageBroadcaster::Create(std::move(request)); | 72 PowerMonitorMessageBroadcaster::Create(std::move(request)); |
41 } | 73 } |
42 | 74 |
43 void DeviceService::Create(const service_manager::Identity& remote_identity, | 75 void DeviceService::Create(const service_manager::Identity& remote_identity, |
44 mojom::TimeZoneMonitorRequest request) { | 76 mojom::TimeZoneMonitorRequest request) { |
45 if (!time_zone_monitor_) | 77 if (!time_zone_monitor_) |
46 time_zone_monitor_ = device::TimeZoneMonitor::Create(file_task_runner_); | 78 time_zone_monitor_ = device::TimeZoneMonitor::Create(file_task_runner_); |
47 time_zone_monitor_->Bind(std::move(request)); | 79 time_zone_monitor_->Bind(std::move(request)); |
48 } | 80 } |
49 | 81 |
82 #if defined(OS_ANDROID) | |
83 void DeviceService::InitializeJavaInterfaceProviderIfNeeded() { | |
84 if (java_interface_registry_.obj()) | |
85 return; | |
86 | |
87 service_manager::mojom::InterfaceProviderPtr provider; | |
88 JNIEnv* env = base::android::AttachCurrentThread(); | |
89 java_interface_registry_.Reset( | |
90 Java_InterfaceRegistrar_createInterfaceRegistryForContext( | |
91 env, mojo::MakeRequest(&provider).PassMessagePipe().release().value(), | |
92 base::android::GetApplicationContext())); | |
93 java_interface_provider_.Bind(std::move(provider)); | |
94 } | |
95 #endif | |
96 | |
50 } // namespace device | 97 } // namespace device |
OLD | NEW |