This CL has a couple of notable changes:
- Add communication layer between adbd, system server, and Settings UI
- Add system notification (Wireless debugging connected) when at least
one device is connected.
- Add trusted networks (BSSID) to the keystore.
- Changed the keystore format to:
<keyStore version="1">
<adbKey ... />
<wifiAP ... />
</keyStore>
- Currently, trusted networks don't have a expiration time. Also, only
way to clear it is by blowing up the keystore (revoke permissions).
- Add pairing mechanism:
- Using libadbwifi_pairing_connection C++ library to pair a device
using SPAKE2 protocol over TLS.
- Register MDNS service for client discovery.
- Removed ability to ctl.start/stop adbd from UsbDeviceManager
- AdbService now controls when to do this
Bug: 111434128, 119490154, 119492574
Test: Manual. From developer options:
1) USB debugging off, WiFi Debugging off
- Ensure both transports are disabled by trying to connect via WiFi and
USB.
2) USB debugging on, WiFi Debugging off
- Connections via USB are available, WiFi is disabled
3) USB debugging off, WiFi Debugging on
- Connections via WiFi are available (IP + port), USB is not available
4) USB debugging on, WiFi Debugging on
- Check both transports work
Change-Id: I9f87679d195da99a55b6faf7131da1f1af65fe01
Exempt-From-Owner-Approval: approved in aosp master
(cherry picked from commit a5969b5a1d)
122 lines
5.7 KiB
C++
122 lines
5.7 KiB
C++
/*
|
|
* Copyright (C) 2009 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <android/graphics/jni_runtime.h>
|
|
#include <nativehelper/JNIHelp.h>
|
|
#include "jni.h"
|
|
#include "utils/Log.h"
|
|
#include "utils/misc.h"
|
|
|
|
#include "BroadcastRadio/BroadcastRadioService.h"
|
|
#include "BroadcastRadio/Tuner.h"
|
|
|
|
namespace android {
|
|
int register_android_server_AlarmManagerService(JNIEnv* env);
|
|
int register_android_server_BatteryStatsService(JNIEnv* env);
|
|
int register_android_server_ConsumerIrService(JNIEnv *env);
|
|
int register_android_server_InputManager(JNIEnv* env);
|
|
int register_android_server_LightsService(JNIEnv* env);
|
|
int register_android_server_PowerManagerService(JNIEnv* env);
|
|
int register_android_server_storage_AppFuse(JNIEnv* env);
|
|
int register_android_server_SerialService(JNIEnv* env);
|
|
int register_android_server_SystemServer(JNIEnv* env);
|
|
int register_android_server_UsbAlsaJackDetector(JNIEnv* env);
|
|
int register_android_server_UsbDeviceManager(JNIEnv* env);
|
|
int register_android_server_UsbMidiDevice(JNIEnv* env);
|
|
int register_android_server_UsbHostManager(JNIEnv* env);
|
|
int register_android_server_vr_VrManagerService(JNIEnv* env);
|
|
int register_android_server_VibratorService(JNIEnv* env);
|
|
int register_android_server_location_GnssLocationProvider(JNIEnv* env);
|
|
int register_android_server_connectivity_Vpn(JNIEnv* env);
|
|
int register_android_server_TestNetworkService(JNIEnv* env);
|
|
int register_android_server_devicepolicy_CryptoTestHelper(JNIEnv*);
|
|
int register_android_server_hdmi_HdmiCecController(JNIEnv* env);
|
|
int register_android_server_tv_TvUinputBridge(JNIEnv* env);
|
|
int register_android_server_tv_TvInputHal(JNIEnv* env);
|
|
int register_android_server_PersistentDataBlockService(JNIEnv* env);
|
|
int register_android_server_Watchdog(JNIEnv* env);
|
|
int register_android_server_HardwarePropertiesManagerService(JNIEnv* env);
|
|
int register_android_server_SyntheticPasswordManager(JNIEnv* env);
|
|
int register_android_hardware_display_DisplayViewport(JNIEnv* env);
|
|
int register_android_server_net_NetworkStatsFactory(JNIEnv* env);
|
|
int register_android_server_net_NetworkStatsService(JNIEnv* env);
|
|
int register_android_server_security_VerityUtils(JNIEnv* env);
|
|
int register_android_server_am_CachedAppOptimizer(JNIEnv* env);
|
|
int register_android_server_am_LowMemDetector(JNIEnv* env);
|
|
int register_com_android_server_soundtrigger_middleware_AudioSessionProviderImpl(
|
|
JNIEnv* env);
|
|
int register_android_server_incremental_IncrementalManagerService(JNIEnv* env);
|
|
int register_android_server_com_android_server_pm_PackageManagerShellCommandDataLoader(JNIEnv* env);
|
|
int register_android_server_stats_pull_StatsPullAtomService(JNIEnv* env);
|
|
int register_android_server_AdbDebuggingManager(JNIEnv* env);
|
|
};
|
|
|
|
using namespace android;
|
|
|
|
extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
|
|
{
|
|
JNIEnv* env = NULL;
|
|
jint result = -1;
|
|
|
|
if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) {
|
|
ALOGE("GetEnv failed!");
|
|
return result;
|
|
}
|
|
ALOG_ASSERT(env, "Could not retrieve the env!");
|
|
|
|
register_android_server_broadcastradio_BroadcastRadioService(env);
|
|
register_android_server_broadcastradio_Tuner(vm, env);
|
|
register_android_server_PowerManagerService(env);
|
|
register_android_server_SerialService(env);
|
|
register_android_server_InputManager(env);
|
|
register_android_server_LightsService(env);
|
|
register_android_server_AlarmManagerService(env);
|
|
register_android_server_UsbDeviceManager(env);
|
|
register_android_server_UsbMidiDevice(env);
|
|
register_android_server_UsbAlsaJackDetector(env);
|
|
register_android_server_UsbHostManager(env);
|
|
register_android_server_vr_VrManagerService(env);
|
|
register_android_server_VibratorService(env);
|
|
register_android_server_SystemServer(env);
|
|
register_android_server_location_GnssLocationProvider(env);
|
|
register_android_server_connectivity_Vpn(env);
|
|
register_android_server_TestNetworkService(env);
|
|
register_android_server_devicepolicy_CryptoTestHelper(env);
|
|
register_android_server_ConsumerIrService(env);
|
|
register_android_server_BatteryStatsService(env);
|
|
register_android_server_hdmi_HdmiCecController(env);
|
|
register_android_server_tv_TvUinputBridge(env);
|
|
register_android_server_tv_TvInputHal(env);
|
|
register_android_server_PersistentDataBlockService(env);
|
|
register_android_server_HardwarePropertiesManagerService(env);
|
|
register_android_server_storage_AppFuse(env);
|
|
register_android_server_SyntheticPasswordManager(env);
|
|
register_android_graphics_GraphicsStatsService(env);
|
|
register_android_hardware_display_DisplayViewport(env);
|
|
register_android_server_net_NetworkStatsFactory(env);
|
|
register_android_server_net_NetworkStatsService(env);
|
|
register_android_server_security_VerityUtils(env);
|
|
register_android_server_am_CachedAppOptimizer(env);
|
|
register_android_server_am_LowMemDetector(env);
|
|
register_com_android_server_soundtrigger_middleware_AudioSessionProviderImpl(
|
|
env);
|
|
register_android_server_incremental_IncrementalManagerService(env);
|
|
register_android_server_com_android_server_pm_PackageManagerShellCommandDataLoader(env);
|
|
register_android_server_stats_pull_StatsPullAtomService(env);
|
|
register_android_server_AdbDebuggingManager(env);
|
|
return JNI_VERSION_1_4;
|
|
}
|