summaryrefslogtreecommitdiff
path: root/proto
diff options
context:
space:
mode:
authorJoshua Duong <joshuaduong@google.com>2018-12-03 15:21:46 -0800
committerJoshua Duong <joshuaduong@google.com>2020-02-22 16:06:53 +0000
commitb06dc6aa5b0a118cc8c836b64f661c7aa89a6631 (patch)
treec5f9538e9ed0b474dbca511429126321a65defa0 /proto
parent2909ce319d472221d78b1d469fff2933d5cb05a0 (diff)
[adbwifi] Make AdbManager changes for adb over WiFi.
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 a5969b5a1d9fe08783c32ea23bead56252a74383)
Diffstat (limited to 'proto')
-rw-r--r--proto/src/system_messages.proto4
1 files changed, 4 insertions, 0 deletions
diff --git a/proto/src/system_messages.proto b/proto/src/system_messages.proto
index ef071a43aa3e..2c7ea31043a2 100644
--- a/proto/src/system_messages.proto
+++ b/proto/src/system_messages.proto
@@ -230,6 +230,10 @@ message SystemMessage {
// Package: android
NOTE_TEST_HARNESS_MODE_ENABLED = 54;
+ // Display the Android Debug Protocol status
+ // Package: android
+ NOTE_ADB_WIFI_ACTIVE = 62;
+
// ADD_NEW_IDS_ABOVE_THIS_LINE
// Legacy IDs with arbitrary values appear below
// Legacy IDs existed as stable non-conflicting constants prior to the O release