Commit Graph

468570 Commits

Author SHA1 Message Date
Automerger Merge Worker
3e26945392 [automerger skipped] Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 81673c7f5a am: 2461d89f10 -s ours
am skip reason: Change-Id I36cf007a4813027721dfb6389e10cf95085f85e4 with SHA-1 6656c50d92 is in history

Change-Id: I728a40b68c6b16736d7b537883a0ea9206af585d
2020-02-22 17:54:33 +00:00
Automerger Merge Worker
a10022f157 Merge "Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 8736469373" into rvc-d1-dev-plus-aosp am: 604719b900
Change-Id: Idd3e780002264163be64bfe757ea56532b915eb7
2020-02-22 17:54:27 +00:00
Automerger Merge Worker
5861a29830 [adbwifi] Make AdbManager changes for adb over WiFi. am: f24fb19dbf am: 5528d58343 am: 295824aca1
Change-Id: I3128ea9735a1d74c7a851f3b63fe75f0e0bbcd0e
2020-02-22 17:54:18 +00:00
Automerger Merge Worker
c1b30740e0 [adbwifi] Make AdbManager changes for adb over WiFi. am: f24fb19dbf am: 9cb23f9830 am: a6e0847da8
Change-Id: If38d959aceb73fce1caf1a47e53c8bcb2dd44f7e
2020-02-22 17:54:13 +00:00
Automerger Merge Worker
76c35e8960 [adbwifi] Make AdbManager changes for adb over WiFi. am: f24fb19dbf am: 5528d58343 am: fbca254844
Change-Id: Ia40280d00b341fef29852b8aeefea7367d3b51da
2020-02-22 17:54:07 +00:00
Automerger Merge Worker
2461d89f10 Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 81673c7f5a
Change-Id: Ib37e75e06b9a6bc6690e701652c659d8ed0fc580
2020-02-22 17:46:17 +00:00
Automerger Merge Worker
604719b900 Merge "Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 8736469373" into rvc-d1-dev-plus-aosp 2020-02-22 17:46:11 +00:00
Automerger Merge Worker
739ee86e1c Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 8736469373
Change-Id: I9ed8840ffeeedf61610a4e61ab63542781f21f1b
2020-02-22 17:46:08 +00:00
Automerger Merge Worker
a6e0847da8 [adbwifi] Make AdbManager changes for adb over WiFi. am: f24fb19dbf am: 9cb23f9830
Change-Id: I3fde8a02865df1bf05ef7a2c814629d59f89ca8f
2020-02-22 17:46:04 +00:00
Automerger Merge Worker
295824aca1 [adbwifi] Make AdbManager changes for adb over WiFi. am: f24fb19dbf am: 5528d58343
Change-Id: Ic17dc1da1f528613c9bc98b43a85ca13d3e72693
2020-02-22 17:46:03 +00:00
Automerger Merge Worker
fbca254844 [adbwifi] Make AdbManager changes for adb over WiFi. am: f24fb19dbf am: 5528d58343
Change-Id: I3c36a378e9319a80565a5aba903f495ddc852589
2020-02-22 17:45:57 +00:00
Automerger Merge Worker
81673c7f5a Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0
Change-Id: I5a5940bb2737607166cdfccbce521a67e8afcaa8
2020-02-22 17:36:36 +00:00
Automerger Merge Worker
8736469373 Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0
Change-Id: I20f758027884debf502b59321226464b9e1e7b05
2020-02-22 17:36:26 +00:00
Automerger Merge Worker
9cb23f9830 [adbwifi] Make AdbManager changes for adb over WiFi. am: f24fb19dbf
Change-Id: Icf3e45e016364c5921f68cab7e5b162439792f44
2020-02-22 17:36:24 +00:00
Automerger Merge Worker
5528d58343 [adbwifi] Make AdbManager changes for adb over WiFi. am: f24fb19dbf
Change-Id: Ib6c589857f55f335eece4279d1aa79cc3a451373
2020-02-22 17:36:08 +00:00
Anton Hansson
b629d69db0 Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev 2020-02-22 17:25:40 +00:00
Automerger Merge Worker
06e7586106 [automerger skipped] Merge "[adbwifi] Make AdbManager changes for adb over WiFi." am: b9f266d97c am: b42dfed0f4 -s ours am: 6683393d9c am: 6b081c4f0a
Change-Id: I724ba968df8e914f67c34714e3b74166135cb599
2020-02-22 16:31:44 +00:00
Automerger Merge Worker
6b081c4f0a [automerger skipped] Merge "[adbwifi] Make AdbManager changes for adb over WiFi." am: b9f266d97c am: b42dfed0f4 -s ours am: 6683393d9c
Change-Id: I420b10b85f255d87e368737acaa21b059fbd8cf5
2020-02-22 16:15:55 +00:00
Automerger Merge Worker
6683393d9c [automerger skipped] Merge "[adbwifi] Make AdbManager changes for adb over WiFi." am: b9f266d97c am: b42dfed0f4 -s ours
am skip reason: skipped by user joshuaduong

Change-Id: I1b02f79c7ea6323544017b404ce1ed1fe02b95c2
2020-02-22 16:03:00 +00:00
Automerger Merge Worker
2d69a58727 Merge "[automerger skipped] Remove FrameworksCoreTests dep on framework-all am: a1fb6f5b1d am: 2ef8e2eeb1 am: 6982042cfc -s ours am skip reason: Change-Id Ic819b90911220032130c3f8a01b612edd7fa3ecc with SHA-1 a1fb6f5b1d is in history" into rvc-qpr-dev-plus-aosp 2020-02-22 15:35:37 +00:00
Automerger Merge Worker
6492426854 [automerger skipped] Remove FrameworksCoreTests dep on framework-all am: a1fb6f5b1d am: 2ef8e2eeb1 am: 6982042cfc -s ours
am skip reason: Change-Id Ic819b90911220032130c3f8a01b612edd7fa3ecc with SHA-1 a1fb6f5b1d is in history

Change-Id: I698104d41d7655514fb99037405015106899554c
2020-02-22 15:35:33 +00:00
Automerger Merge Worker
58664abb8b [automerger skipped] Merge "Remove FrameworksCoreTests dep on framework-all am: a1fb6f5b1d am: 9345f8663a" into rvc-d1-dev-plus-aosp am: 460ceeeb1d -s ours
am skip reason: Change-Id Ic819b90911220032130c3f8a01b612edd7fa3ecc with SHA-1 a1fb6f5b1d is in history

Change-Id: Id5cc8cc5e906fc17d3328543d5dc255bd7e49481
2020-02-22 15:35:29 +00:00
Automerger Merge Worker
368877ad9e Remove FrameworksCoreTests dep on framework-all am: a1fb6f5b1d am: 2ef8e2eeb1 am: a929d694e0
Change-Id: Iae4e9c95cf8e516fd3af0ac9a94238b4dad4592f
2020-02-22 15:35:23 +00:00
Automerger Merge Worker
b42dfed0f4 Merge "[adbwifi] Make AdbManager changes for adb over WiFi." am: b9f266d97c
Change-Id: Id8571a8db96770cd699a71c5fcb50fb58c8e511b
2020-02-22 15:30:26 +00:00
Automerger Merge Worker
460ceeeb1d Merge "Remove FrameworksCoreTests dep on framework-all am: a1fb6f5b1d am: 9345f8663a" into rvc-d1-dev-plus-aosp 2020-02-22 15:25:51 +00:00
Automerger Merge Worker
6982042cfc Remove FrameworksCoreTests dep on framework-all am: a1fb6f5b1d am: 2ef8e2eeb1
Change-Id: I4fce4cc34f4a692b29ae1b883bb037ef73d3ea86
2020-02-22 15:25:46 +00:00
Automerger Merge Worker
c2efe936d6 Remove FrameworksCoreTests dep on framework-all am: a1fb6f5b1d am: 9345f8663a
Change-Id: I2fa7f8519e61b2fc371c41d94211d8ef4735c1c6
2020-02-22 15:25:45 +00:00
Automerger Merge Worker
a929d694e0 Remove FrameworksCoreTests dep on framework-all am: a1fb6f5b1d am: 2ef8e2eeb1
Change-Id: Ie35042ca55e994a4ff1d6a7c159bac842dc9309b
2020-02-22 15:25:34 +00:00
Joshua Duong
b9f266d97c Merge "[adbwifi] Make AdbManager changes for adb over WiFi." 2020-02-22 15:18:38 +00:00
Joshua Duong
f24fb19dbf [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 a5969b5a1d)
2020-02-22 15:15:10 +00:00
Automerger Merge Worker
9345f8663a Remove FrameworksCoreTests dep on framework-all am: a1fb6f5b1d
Change-Id: I5a033eebd44bb91405be33497b699be1214c2576
2020-02-22 15:15:07 +00:00
Automerger Merge Worker
2ef8e2eeb1 Remove FrameworksCoreTests dep on framework-all am: a1fb6f5b1d
Change-Id: If46fc54b17f40a5ec467e1f7671a6b24b6b909c8
2020-02-22 15:14:54 +00:00
Automerger Merge Worker
9caf3adf27 Merge "Remove liblog from Tethering jni_libs" am: 044edce140 am: 00f848a922 am: ac1fd34780 am: cde357accc
Change-Id: Ia29b918afed1256232204fa33472f780bbf10495
2020-02-22 12:38:01 +00:00
Automerger Merge Worker
cde357accc Merge "Remove liblog from Tethering jni_libs" am: 044edce140 am: 00f848a922 am: ac1fd34780
Change-Id: If87a6319e73e9feabbdd469ff3505ce6a823baf9
2020-02-22 12:23:05 +00:00
Automerger Merge Worker
ac1fd34780 Merge "Remove liblog from Tethering jni_libs" am: 044edce140 am: 00f848a922
Change-Id: Ied050a4ace8ede214e10e842c44bbdebb0f875ed
2020-02-22 12:11:26 +00:00
Automerger Merge Worker
00f848a922 Merge "Remove liblog from Tethering jni_libs" am: 044edce140
Change-Id: Ia3d3ba3b8740309fd0b213af1ac00ddb2685ce45
2020-02-22 11:56:31 +00:00
Treehugger Robot
044edce140 Merge "Remove liblog from Tethering jni_libs" 2020-02-22 11:38:09 +00:00
Anton Hansson
6656c50d92 Re-submit "Create all variants of stubs for wifi"
Use sdk_version: module_current instead.

This reverts commit d20f03011f.

Bug: 147768409
Test: m
Test: build/soong/soong_ui.bash --make-mode dist ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Exempt-From-Owner-Approval: clean cp
Change-Id: I36cf007a4813027721dfb6389e10cf95085f85e4
Merged-In: I36cf007a4813027721dfb6389e10cf95085f85e4
(cherry picked from commit 21f0ed2a0a)
2020-02-22 11:05:37 +00:00
Anton Hansson
a1fb6f5b1d Remove FrameworksCoreTests dep on framework-all
Make it use framework-statsd directly rather than framework-all.
Note that this is a problem on its own: the problematic tests
should be separated from the monolith tests and moved into the statsd
dir.

Also clamp down on framework-all visibility to avoid anyone else
addinga dependency on this problematic library.

Bug: 149928788
Bug: 149906971
Test: m
Exempt-From-Owner-Approval: clean cp
Change-Id: Ic819b90911220032130c3f8a01b612edd7fa3ecc
Merged-In: Ic819b90911220032130c3f8a01b612edd7fa3ecc
(cherry picked from commit 7c2f73b4ac)
2020-02-22 11:01:41 +00:00
Joshua Duong
6f3aaaa5f7 [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
Merged-In: I9f87679d195da99a55b6faf7131da1f1af65fe01
Exempt-From-Owner-Approval: already approved
2020-02-22 01:37:05 +00:00
Yi Jiang
3f9ddc30d9 Merge "Ensures only one result is logged per attention check" 2020-02-21 23:41:27 +00:00
Andy Hung
a4a2a71ad3 Merge "media: Do not use forward declaration for AudioPlaybackRate" 2020-02-21 23:37:34 +00:00
TreeHugger Robot
d566d02ff3 Merge "Rename full and reduced scale configs" 2020-02-21 23:28:35 +00:00
Evan Severson
2aa3230ca0 Merge "Add method to give a permission revoke a reason" 2020-02-21 23:16:09 +00:00
Julius D'souza
4358010076 Merge "Add background thread notes for package restriction serialisation." 2020-02-21 23:08:52 +00:00
Ashwini Oruganti
b06c32f68a Merge "Resolve conflicting values of usesCleartextTraffic for shared processes" 2020-02-21 23:07:41 +00:00
Winson Chung
c4d8bcad86 Merge "Ensure task description icon resources are loaded from the right package" 2020-02-21 22:59:44 +00:00
Ned Burns
6a989fbffe Merge changes from topic "migrate-dump"
* changes:
  Migrate DumpController -> DumpManager
  Add service for dumping at NORMAL priority
  Introduce DumpManager
2020-02-21 22:54:49 +00:00
Automerger Merge Worker
904621ba1b [automerger skipped] Merge "Expose getLteOnCdmaMode as isGlobalModeEnabled" am: b3a20cbfff am: 96c4a23176 am: 435c4d6186 -s ours
am skip reason: Change-Id I2c5727bcc5fd0263acfe669177f43fda17650f41 with SHA-1 0b1078bd3c is in history

Change-Id: I9727e194c6785ab16204969b796afa8e8f0d3c7f
2020-02-21 22:54:23 +00:00
Colin Cross
bbe126cf5a Remove liblog from Tethering jni_libs
Tethering's JNI libraries use the NDK version of liblog, it should
not package the platform version of liblog into the APK.

Bug: 149591340
Test: m checkbuild
Change-Id: If208c1078d2755907f57d7853a5c545bf12458c2
2020-02-21 14:49:40 -08:00