559 Commits

Author SHA1 Message Date
Philip P. Moltmann
8d6a0cb6af Merge "Remove me from OWNERS files" am: 25ee5a7fb7 am: bf8de269cb am: 39198ddd84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I429557a8537fb6417fcb9539978964ade75c8dee
2021-02-11 23:15:42 +00:00
Philip P. Moltmann
a8eb3d3e69 Remove me from OWNERS files
Test: n/a
Change-Id: I6113011e6ab0997285d5b7a86303fc60a3b98a2b
Exempt-From-Owner-Approval: Previously approved
2021-02-11 22:28:43 +00:00
Treehugger Robot
76b6d14f29 Merge "Increase debounce time for DISCONNECT processing" am: a1be0e120a am: 91c1b1c056 am: 49698f5cb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539944

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1beb97b73c67bb4e4b004c47f3ec8ce61296a460
2021-01-11 06:15:39 +00:00
Sriharsha Allenki
5a14ba6861 Increase debounce time for DISCONNECT processing
During composition switch, some host PCs are taking more
time in processing the disconnect of previous functions and
enumerating the new functions. This causes the delay in
receiving the CONNECTED uevent which triggers the fallback
to default composition. Prevent this by increasing the
debounce time from 1s to 3s (which is the average time
taken by these PCs to enumerate the new functions) for
device mode state update, while keeping the debounce time
for host mode as is at 1s.

Bug: 176779207
Test: Verified enumeration of device with the delay
Change-Id: I7ff58a1a9755939ccb26dad61969902ec91f2225
2021-01-08 05:12:13 +00:00
tengw
7c1f88023d Suppress USB sharing notification for wear
Bug: 159955492
Change-Id: I69ef3be40f0aed2175ffb37a6d1f7b57fb5d93db
(cherry picked from commit 945c267f8413f32623d58a394241326cea203555)
2020-11-25 03:23:19 +00:00
TreeHugger Robot
baf630d362 Merge changes from topic "USB-GADGET-HAL-v1.2"
* changes:
  Add methods for Usb Gadget Hal v1.2
  Support USB Gadget V1.2 HAL
2020-11-16 10:43:46 +00:00
Jeff Sharkey
8099e30b73 Mechanical refactoring to new XML resolvers.
Related changes are introducing new TypedXmlSerializer and
TypedXmlPullParser interfaces which offer efficient access to
primitive attributes.

This change is a purely mechanical refactoring to prepare for
upcoming data format shifts, and has no behavior changes.

Bug: 171832118
Test: manual
Exempt-From-Owner-Approval: trivial no-op refactoring
Change-Id: Ib8045ddba489c254641d6331b64355709c3f6dd7
2020-11-13 14:48:32 -07:00
raychi
88254a2b56 Support USB Gadget V1.2 HAL
USB Gadget V1.2 HAL include:
1. support NCM function
2. add api to inquiry USB speed
3. add api to inquiry HAL version

Bug: 168282708
Test: build pass and functions are working normally
Change-Id: Idd07c55f4610740c0cf9023391125a86ba39ddee
2020-11-12 10:59:40 +08:00
Jeff Sharkey
d23b5379c0 Enable Error Prone to detect obscure bugs.
We've been writing many new framework-specific Error Prone checkers
to help detect obscure platform bugs, and this change starts enabling
those checkers for more packages across the platform.

Bug: 155703208
Test: manual
Exempt-From-Owner-Approval: trivial blueprint changes
Change-Id: I1db3412b0be40f6f78c68331ae01756887192071
2020-10-23 16:55:30 -06:00
Jeff Sharkey
864524af17 Apply FLAG_IMMUTABLE to various PendingIntents.
Some careful spot-checking has revealed common cases where it's
reasonable to blanket apply the new FLAG_IMMUTABLE option to newly
created PendingIntents.  Specifically these situations:

-- Simple notification content clicks are immutable; there's no need
to communicate customized data back to the creator
-- Simple notification action clicks are immutable; there's no need
to communicate customized data back to the creator
-- Broadcast intents sent by AlarmManager are immutable; the system
dispatches them without customization.

Bug: 170165227, 170424283, 170425388, 170425877
Bug: 169791183, 170771965, 170226088, 170224928, 170767530
Test: none
Change-Id: I5ed68710d2ccad4635a30fd91136a9e6ad76a01d
2020-10-20 16:20:54 -06:00
Philip P. Moltmann
066479a2ad Merge "fix broadcast receivers overflow for system_server" am: 9ba1a0d576 am: ad9467332c am: ea66dd6ca5 am: a942c4780f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1339995

Change-Id: Ie0865afbb416da48da47650139eb72ce91543069
2020-10-14 22:46:30 +00:00
Jeff Sharkey
b93712f623 Tighten up Binder.clearCallingIdentity() usage.
This is a third CL in a chain that adjusts existing malformed code
to follow AndroidFrameworkBinderIdentity best-practices.

Specifically, if a thread clears an identity they need to restore it
to avoid obscure security vulnerabilities.  In addition, the relevant
"try" block must start immediately after the identity is cleared to
ensure that its restored if/when any exceptions are thrown.

Bug: 155703208
Test: make
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: I74cb958b68d55a647547aae21baff6ddc364859b
2020-10-07 21:24:05 -06:00
Jeff Sharkey
2d2e07e2ff Tighten up Binder.clearCallingIdentity() usage.
The recently added AndroidFrameworkBinderIdentity Error Prone checker
examines code to ensure that any cleared identities are restored to
avoid obscure security vulnerabilities.

This change is a purely mechanical refactoring that adds the "final"
keyword to the cleared identity to ensure that it's not accidentally
modified before eventually being cleared.  Here's the exact command
used to generate this CL:

$ find . -name "*.java" -exec sed -Ei \
    's/    (long \w+ = .+?clearCallingIdentity)/    final \1/' \
    {} \;

Bug: 155703208
Test: make
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: I832c9d70c3dfcd8d669cf71939d97837becc973a
2020-10-06 11:18:09 -06:00
Sergii Piatakov
302822b2dd fix broadcast receivers overflow for system_server
Every time when user is switched the `UsbSettingsManager` creates a new
instance of settings object for the new user. It leads to creating
several receivers and subscribing to some broadcast messages. Then
system is switched on other user, settings for the old user are removed
from the internal container, but receivers are not unsubscribed. As a
result, the number of receivers for the `system_server` process is
continuously increased and may exceed the allowed limit.

It is proposed to explicitly unscribe receivers before remove settings.

Test: flash a DUT with user build and then run:
      > run cts -m CtsDevicePolicyManagerTestCases
      at least two times, check that DUT is not in the recovery mode;
      or switch user ~1000 times:
      $ adb shell am switch-user 0
      $ adb shell am switch-user 10
      and check that logcat doesn't contain a line:
      E SystemServiceManager: java.lang.IllegalStateException: \
          Too many receivers, total of 1000, registered
Change-Id: I4bb9feb408ce7c321a56d0e573c45c8794ed6860
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2020-09-15 08:47:04 +03:00
Xin Li
628590d7ec Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07:00
Paul McLean
79de4d7ec9 Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance")
Author:     Paul McLean <pmclean@google.com>
AuthorDate: 2020-07-28 15:07:26 +0000
Commit:     Glenn Kasten <gkasten@android.com>
CommitDate: 2020-08-04 00:06:51 +0000

Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Bug: 162315796
Test: Build, flash...
Change-Id: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
Merged-in: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
2020-08-04 23:32:44 +00:00
TreeHugger Robot
54816b3c94 Merge "Remove "Blacklist" nomenclature from USB services classes." 2020-07-29 03:29:36 +00:00
Paul McLean
028ffa470b Remove "Blacklist" nomenclature from USB services classes.
Bug: 162315796
Test: Build, flash...
Change-Id: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
2020-07-28 19:37:53 +00:00
Treehugger Robot
6fdcc66bd0 Merge "Update language to comply with Android's inclusive language guidance" am: 296355cba3 am: a5958c2cba am: 36efe13de9 am: 35d1fb2ad2 am: 32af8b03ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373419

Change-Id: I7b36db878109464bcdc47201986b852cfd6371ce
2020-07-28 17:19:59 +00:00
Treehugger Robot
36efe13de9 Merge "Update language to comply with Android's inclusive language guidance" am: 296355cba3 am: a5958c2cba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373419

Change-Id: I3a82e2d9f8d567ab4773fe96903cf5413f9321eb
2020-07-28 16:42:25 +00:00
Jiabin Huang
48019860b0 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference


BUG=161896447

Change-Id: Id81a8592b54f38f4af4ce0ccfc67ce00448dc1ae
2020-07-27 20:44:38 +00:00
James Wei
0f33cf2dde Merge "USB: Refine misleading error message" 2020-07-08 03:10:09 +00:00
James Wei
0cfdab1577 USB: Refine misleading error message
Bug: 154684729
Test: adb shell dumpsys usb; (check logcat)
Change-Id: Icc9b2b14569b61cf9e9eec1e99c6f928a187ecda
2020-07-03 18:16:32 +08:00
rickyniu
e62f703e4c Broadcast events for AOA handshake
Broadcast intents on below control request

Log both the request and response for 51 control request (Get Protocol)
Log both the request and response for 52 control request (Identifying information)
Log both the request and response for 53 control request (Start accessory mode)

bug: 139264039

Test: Check the broadcast intent could be received
Change-Id: I7c8db41ee05398200e235cf10dde96ba89b306e8
2020-07-01 21:19:09 +08:00
Jeff Sharkey
8eea9f2c34 Merge "Add custom Error Prone check for SDK comparisons." into rvc-dev am: 559130df3f am: a182ebd85f
Change-Id: Ifd39a3a3c78d2cb6475c66694fc514e9a9d96453
2020-05-04 23:44:25 +00:00
Jeff Sharkey
be0925c721 Merge "Add custom Error Prone check for SDK comparisons." into rvc-dev am: 559130df3f
Change-Id: Id79940001da5a23c492a3f4854a9e12caee8cbfe
2020-05-04 23:29:46 +00:00
Jeff Sharkey
4d1d7b56cd Add custom Error Prone check for SDK comparisons.
Over the years we've had several obscure bugs related to how SDK level
comparisons are performed, specifically during the window of time
where we've started distributing the "frankenbuild" to developers.

Consider the case where a framework developer shipping release "R"
wants to only grant a specific behavior to modern apps; they could
write this in two different ways:

1. if (targetSdkVersion > Build.VERSION_CODES.Q) {
2. if (targetSdkVersion >= Build.VERSION_CODES.R) {

The safer of these two options is (2), which will ensure that
developers only get the behavior when *both* the app and the
platform concur on the specific SDK level having shipped.

Consider the breakage that would happen with option (1) if we
started shipping APKs that are based on the final R SDK, but are
then installed on earlier preview releases which still consider R
to be CUR_DEVELOPMENT; they'd risk crashing due to behaviors that
were never part of the official R SDK.

Bug: 64412239
Test: ./build/soong/soong_ui.bash --make-mode services RUN_ERROR_PRONE=true
Exempt-From-Owner-Approval: trivial blueprint changes
Change-Id: Ia20181f8602451ac9a719ea488d148e160708592
2020-05-04 23:09:48 +00:00
Joshua Duong
4aba2d8def Merge "Fix PendingIntent hijacking for adb notifications." into rvc-dev am: 9a419cda53 am: c249f77f0a
Change-Id: Icb078474dec821c18fcb929fccb4c52d1af65319
2020-04-17 16:26:52 +00:00
Joshua Duong
c5724f3543 Merge "Fix PendingIntent hijacking for adb notifications." into rvc-dev am: 9a419cda53
Change-Id: I8f96b2aa8ca127380891f9a0a790224f092e9118
2020-04-17 16:17:42 +00:00
Joshua Duong
ec1980f86b Fix PendingIntent hijacking for adb notifications.
Use an explicit intent and set PendingIntent.FLAG_IMMUTABLE to prevent
someone from modifying the intent from PendingIntent.send(...).

Bug: 153356209

Test: atest AdbNotificationsTest
Test: In bug, install and launch the PoC apk and give it notification
permissions. Then, with USB/Wifi debugging enabled, disconnect and connect
the device to create the adb notification. the PoC apk should not have
permission to display information from
content://com.android.settings.files/my_cache/NOTICE.html.

Change-Id: Ie49aa3cf9b33168cf1435fc2427e95aac7f4609b
(cherry picked from commit 2c038814591d7e3d73b2b277db504a5555732456)
Exempt-From-Owner-Approval: approved in master
2020-04-17 16:08:39 +00:00
Puma Hsu
24ee251045 Merge "Fix function setting failed in Developer options" into rvc-dev am: 1324df73de am: 8b2e3b6026
Change-Id: I873af5acc8aa8a1ff7249f791f93f4581e4202dd
2020-03-18 02:18:45 +00:00
Puma Hsu
ea62bf633c Merge "Fix function setting failed in Developer options" into rvc-dev am: 1324df73de
Change-Id: Ic3d1ab5df7781341bae4be8d9036f06e6ef8e997
2020-03-18 02:01:24 +00:00
Automerger Merge Worker
46d3b43dd6 Merge "USB: Add OWNERS for USB functionality" am: cc13533098 am: 9613717da2
Change-Id: I8df10c3a282703e95947649cb8cf39a0d4471f77
2020-03-16 05:06:33 +00:00
James Wei
2688557ea7 USB: Add OWNERS for USB functionality
Add and update active owners

Bug: 151289514
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: Ifed67825df464b86e12c63193b6b54692ac4de7c
2020-03-12 17:12:17 +08:00
Puma Hsu
e177e7bd42 Fix function setting failed in Developer options
One can select USB function in Settings->System->
Developer options->Default USB configuration without
a cable connected, and the selected function will be
the default function after re-connecting. However, this
function might be restored to NONE due to ENUMERATION_TIMEOUT
if one selected the function without a cable connected.

When the device is not connected to a host, we should not
queue the ENUMERATION_TIMEOUT while switching function.
Fix it by checking connected status and also make it switch
to corresponding function if an user has selected one in the
Default USB configuration.

Bug: 150422683
Test: Switch functions from Default USB configuration for the
both cases cable connecting and disconnecting. And also try it
while there is the secure lock.
Signed-off-by: Puma Hsu <pumahsu@google.com>
Change-Id: I1933c098e47496b8d6813a5a4e295bcf12027401
2020-03-10 17:36:16 +08:00
Automerger Merge Worker
721f99b99f Merge changes I36c6ef4b,I3c31394e am: be0d76d382
Change-Id: I60549c067c76bd2755150e1f920c4bd5624ce741
2020-02-26 21:52:13 +00:00
Joshua Duong
eb6e5bc47b Allow UsbDeviceManager to start adbd again.
There's some weird state where if persist.sys.usb.config=none,adb, then
adbd won't get started. Give back adbd start permissions to
UsbDeviceManager to see if that fixes the issue.

Bug: 150130503

Test: adb shell su 0 setprop persist.sys.usb.config none,adb; adb reboot
adb should be online after.

Change-Id: I36c6ef4b20d58570a2d51ed70088ae5c54d6687d
Merged-In: I36c6ef4b20d58570a2d51ed70088ae5c54d6687d
Exempt-From-Owner-Approval: Fix adbd offline failure
2020-02-26 08:33:19 -08:00
Joshua Duong
ac29885a0e Allow UsbDeviceManager to start adbd again.
There's some weird state where if persist.sys.usb.config=none,adb, then
adbd won't get started. Give back adbd start permissions to
UsbDeviceManager to see if that fixes the issue.

Bug: 150130503
Bug: 150116813

Test: adb shell su 0 setprop persist.sys.usb.config none,adb; adb reboot
adb should be online after.

Change-Id: I36c6ef4b20d58570a2d51ed70088ae5c54d6687d
Exempt-From-Owner-Approval: Fix adbd offline failure
(cherry picked from commit 7a3800993df55f87ce6493bf304730b9ffd91ad5)
2020-02-26 16:26:39 +00:00
Felipe Leme
339b7149af Improved user callbacks on SystemService:
* Renamed:

  onStartUser() -> onUserStarting()
  onStopUser() -> onUserStopping()
  onSwitchUser() -> onUserSwitching()
  onUnlockUser() -> onUserUnlocking()
  onCleanupUser() -> onUserStopped()
  isSupportedUser() -> isUserSupported()

* Added:

  onUserUnlocked()

Tested on automotive, which uses the callbacks to dump user metrics:

$ adb shell dumpsys car_service --user-metrics
adb shell dumpsys car_service --user-metrics
* User Metrics *
  no users starting
  no users stopping
Last 10 started users
  2020-02-21T19:44:47.101 - user=0 start=2020-02-21 19:44:45.357 unlocking=+885ms unlocked=+1s122ms
  2020-02-21T19:44:56.376 - user=10 start=2020-02-21 19:44:47.380 switch=+209ms unlocking=+8s262ms unlocked=+8s994ms
  2020-02-21T20:00:08.792 - user=11 start=2020-02-21 20:00:04.634 switch(from 10)=+351ms unlocking=+4s44ms unlocked=+4s156ms
Last 10 stopped users
  2020-02-21T20:00:48.323 - user=10 stop=2020-02-21 20:00:16.741 shutdown=+31s581ms

Test: m update-api
Test: atest BackupManagerServiceTest
Test: manual verification (see above)
Fixes: 150001654

Exempt-From-Owner-Approval: approved on master right before rvc split

Merged-In: I8774c57620030b9aa8e7ec039a6a758ad56db368
Change-Id: I8774c57620030b9aa8e7ec039a6a758ad56db368
(cherry picked from commit 58e7458ac7204992c5408eb2d6420d767afc4eb8)
2020-02-24 16:44:52 +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
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 a5969b5a1d9fe08783c32ea23bead56252a74383)
2020-02-22 15:15:10 +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
Automerger Merge Worker
4471500ebe Merge "Add AdbTransportType.aidl. Add AdbWifi internal API stubs." am: c5cb13899d am: 44cf122df0 am: 21e272d52e
Change-Id: Ic09de8f7f6a064ccfa11654f7a5833b1ebfa490a
2020-02-19 23:07:19 +00:00
Automerger Merge Worker
44cf122df0 Merge "Add AdbTransportType.aidl. Add AdbWifi internal API stubs." am: c5cb13899d
Change-Id: I362b91ae3dd8cd2b696525e23ede9f3cb6c2f5d9
2020-02-19 02:52:39 +00:00
Joshua Duong
b401e0a8bb Add AdbTransportType.aidl. Add AdbWifi internal API stubs.
Since wireless debugging can be enabled without usb debugging enabled,
we'll need to differentiate between which transport is enabled.

Also added the internal AdbManager stubs for wireless debugging. Adding
implementation in separate CL to get around merge conflict with a SysUI
CL in the stack.

BUG: b/111434128

Test: make
Exempt-From-Owner-Approval: already approved
Change-Id: I4e1ae6398f291f321e61e7eb119564ebd5e54c2e
2020-02-19 02:41:21 +00:00
Howard Ro
8ac84650bd Merge "Use FrameworkStatsLog instead of StatsLog" 2020-01-30 21:47:48 +00:00
Paul Mclean
e37a75ccae Merge "Replace parsing error stack dump with a more terse message" 2020-01-30 18:38:13 +00:00
Muhammad Qureshi
d0cbebc8fe Use FrameworkStatsLog instead of StatsLog
As part of statsd becoming a Mainline module in R, autogenerated
StatsLog.write() calls are going away and replaced by
*StatsLog.java
that is autogenerated for each module.
This CL replaces some usages of StatsLog with
FrameworkStatsLog.

Bug: 145952197
Test: m
Change-Id: Ic3b9d02ee33e8d94fdbe4e324ceb6db13fe3d2dc
2020-01-29 17:21:16 -08:00
Paul McLean
c9b7cb2fc2 Replace parsing error stack dump with a more terse message
Bug: 147608995
Test: boot, connect PreSonus AudioBox 22VSL, pull log and examine.
Change-Id: I49629267c91cea5d6ba8a76af956cd3306c1d8b1
2020-01-29 15:58:57 -07:00
Evan Severson
64a3827f3a Fix usb not working for work profile
Fixes: 148283143
Test: Manual
Change-Id: Ib478b57e58bd162da92cf3e1829d05f4943c0be1
2020-01-24 10:03:32 -08:00