diff options
| author | Joshua Duong <joshuaduong@google.com> | 2018-12-03 15:21:46 -0800 |
|---|---|---|
| committer | Joshua Duong <joshuaduong@google.com> | 2020-02-22 15:15:10 +0000 |
| commit | f24fb19dbf0ea4305de79cfddeb45ca1f7baa41f (patch) | |
| tree | 5b515fe15368fd58f7b8742fd92c210d811d2efa /proto | |
| parent | a1fb6f5b1d9c93f9aeb4086beed753e644ca1a47 (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.proto | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/proto/src/system_messages.proto b/proto/src/system_messages.proto index cff55046fc2b..c5a5d34ff30a 100644 --- a/proto/src/system_messages.proto +++ b/proto/src/system_messages.proto @@ -255,6 +255,10 @@ message SystemMessage { // Inform the user a foreground service while-in-use permission is restricted. NOTE_FOREGROUND_SERVICE_WHILE_IN_USE_PERMISSION = 61; + // 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 |