commit | 41f6cdbc0c75f82b8cac8d767ac10df52ccafb8a | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Thu Mar 25 23:04:51 2021 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 25 23:04:51 2021 +0000 |
tree | 1c1076f7483e839ecc2e47724ecdf13bcea8cff6 | |
parent | 01af039be893ebbd9e3053fcb16129f3711c3c9d [diff] | |
parent | 5a94e30073039adfc7ef7abe9056db183f4715fb [diff] |
Merge changes from topic "mar24b" into sc-dev * changes: Preserve implicit split-permissions on clear. Replace BLUETOOTH and BLUETOOTH_ADMIN permission checks in BluetoothManagerService.