Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
707,971 Commits 3 Branches 0 Tags
92aa9daa10ba767cccead3b875d1251dcf2a2a6b
Commit Graph

126 Commits

Author SHA1 Message Date
TreeHugger Robot
f3fe4c2acc Merge "Change Owner" into sc-dev am: 5629eccbbc am: 73579f4d19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027119

Change-Id: I47b6a50f75ad7ef75ced3d0100ac3336f9160f81
 2021-06-24 18:21:58 +00:00
Evan Chen
08c4c64157 Change Owner 
Change Owner from Eugene to the people who are currently working
with CDM.
Better to change the owner file under sc-dev first since there's
no owner file in AOSP.
Source of truth: /core/java/android/companion/OWNERS
Fix: 191984480
Change-Id: I737246128ca25e5efe2bdf59361a83cd6dc54c6b
 2021-06-24 17:48:40 +00:00
TreeHugger Robot
0a1762022f Merge "Update associate API by adding certificate param" into sc-dev am: 06cd94a6de am: 9e7f3ba32a am: 6a290ccf9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14686826

Change-Id: I27cb2f5a9107fb36420778fd2ab7ee6283d4857b
 2021-05-24 21:54:25 +00:00
Guojing Yuan
cc4ffc849b Update associate API by adding certificate param 
Fix: 184264581

Test: N/A
Change-Id: Ie28a2e68826744c0f020113d1b85b5a4b2d54c7f
 2021-05-24 18:04:27 +00:00
Evan Chen
ad6ef1c7aa Merge "Allow skipping CDM dialog for same-oem" into sc-dev 2021-05-21 00:29:50 +00:00
Evan Chen
3da90a86a8 Merge "Allow skipping CDM dialog for same-oem" 2021-05-20 22:23:15 +00:00
Eugene Susla
8f935b73c3 Allow skipping CDM dialog for same-oem 
Used SHA256 from ADK to make the determination

Test: Manual
Bug: 165951651
Change-Id: I5ed42d1e67d5abaaaf24989b54dd8e95f04621e9
Merged-In: I5ed42d1e67d5abaaaf24989b54dd8e95f04621e9
 2021-05-20 22:22:54 +00:00
Rahul Sabnis
1fda5f6890 Merge "Update BluetoothDevice#setAlias based on API council feedback: now accepts null input and returns an int (with error codes). Update CompanionDeviceManager#canPairWithoutPrompt to take a UserHandle instead of an int. Adds BluetoothStatusCodes class for all new Bluetooth error / success codes. Moved OOB and hci disconnect constants to the new BluetoothStatusCodes class." into sc-dev am: b8cfbebbec am: 423ee1c59f am: 133f9e4da4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457502

Change-Id: I25073728ce8966671722951b265ee9a6132308d8
 2021-05-20 04:21:25 +00:00
Rahul Sabnis
d6b43bb520 Update BluetoothDevice#setAlias based on API council feedback: now 
accepts null input and returns an int (with error codes).
Update CompanionDeviceManager#canPairWithoutPrompt to take a
UserHandle instead of an int. Adds BluetoothStatusCodes class for all
new Bluetooth error / success codes. Moved OOB and hci disconnect
constants to the new BluetoothStatusCodes class.

Tag: #feature
Bug: 184714087
Test: atest BluetoothDeviceTest#test_setAlias_getAlias
Change-Id: Ife03506f2cf68800f5824cb5fa94fec8aa34a39c
 2021-05-17 16:47:55 -07:00
Eugene Susla
cde94194cf Allow skipping CDM dialog for same-oem 
Used SHA256 from ADK to make the determination

Test: Manual
Bug: 165951651
Change-Id: I5ed42d1e67d5abaaaf24989b54dd8e95f04621e9
Merged-In: I5ed42d1e67d5abaaaf24989b54dd8e95f04621e9
 2021-05-11 06:00:03 +00:00
Eugene Susla
88b7eb7662 Merge "Change associate return type to void" into sc-dev am: fc191ab4c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14068164

Change-Id: I3fbec9b94c98aff7dcb8c7d171343289c949035a
 2021-04-12 20:55:24 +00:00
Eugene Susla
c248630cff Change associate return type to void 
Per API council feedback, since result wasn't meaningfully used

Fixes: 184264581
Test: presubmit

Change-Id: I65f2df6c2ce346c52cfc3f70d0ed8b63c41546d5
 2021-04-12 12:01:45 -07:00
TreeHugger Robot
13d7be8e3f Merge "Add link to CDM profiles info to javadoc" into sc-dev am: 0e8b4aefd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13828991

Change-Id: Ie2ff54a7f7c0155663cdcdb491d76a934d912dbe
 2021-04-08 23:57:45 +00:00
TreeHugger Robot
0e8b4aefd8 Merge "Add link to CDM profiles info to javadoc" into sc-dev 2021-04-08 23:40:59 +00:00
Eugene Susla
5bde257a0e Add link to CDM profiles info to javadoc 
Bug: 165951651
Test: presubmit

Change-Id: I544d29af20edfd6bc4c94b2158aa7b5b34d6f122
 2021-04-08 19:26:32 +00:00
TreeHugger Robot
4de80d5cf8 Merge "Add clarifications to CDM javadoc" into sc-dev am: d465098b50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14113448

Change-Id: I74fe64269ad2ae7c9e7230cd2bd1abe31955876d
 2021-04-08 19:21:38 +00:00
Eugene Susla
e92753df23 Add clarifications to CDM javadoc 
- clarify modes of operations for different wireless transports
- add recommendation to use RPA in order to use the feature

Fixes: 183984032
Test: proofread

Change-Id: I7dc305890df5979278e198a25981a4876074082f
 2021-04-07 17:37:11 +00:00
Eugene Susla
ddf28b93a6 Merge "Provide CDM API to associate without prompt" into sc-dev am: 4af392fe39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13742443

Change-Id: I8d9c7e659112229ed40b09ca5767e911f941c101
 2021-03-24 21:15:57 +00:00
Eugene Susla
120de6c1c4 Provide CDM API to associate without prompt 
For use via FastPair(within GMSCore)

Bug: 165951651
Test: atest CompanionDeviceManagerTest
Change-Id: I7b94d52e59ad39e1d93360685cf64a3dc068d05e
 2021-03-24 09:24:51 -07:00
Rahul Sabnis
b40d4b14a8 Merge "Makes BluetoothDevice#setAlias a public API" into sc-dev am: 7030bd354f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13841713

Change-Id: I2da394088249341c5248bd5a66509bc657e77645
 2021-03-24 01:03:38 +00:00
Rahul Sabnis
c7635a46e7 Makes BluetoothDevice#setAlias a public API 
Tag: #feature
Bug: 181093329
Test: atest BluetoothDeviceTest
Change-Id: Ib94bedab5d6d4c63a19096f61187f58dd8937b55
 2021-03-22 16:07:37 -07:00
Eugene Susla
270e17dd06 Merge "Add creation time to CDM AssociationRequest" into sc-dev am: 8cd1b96510 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13790650

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6dba4dc02c8386e173458c1e5902d10106e93f1
 2021-03-07 04:17:10 +00:00
TreeHugger Robot
420d58d712 Merge "Guard CDM watch profile behind its permission" into sc-dev am: a14342934e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13775536

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic10224c147b7731e4b0ec7bec72394d7c61204fa
 2021-03-07 04:06:05 +00:00
TreeHugger Robot
8f8c8d6ba8 Merge "Add @RequiresPermission for CDM watch profile use" into sc-dev am: a807683a65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13789104

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfa56c67d325b265db2fd9184a24fa9dce2df56a
 2021-03-07 04:05:19 +00:00
Eugene Susla
8cd1b96510 Merge "Add creation time to CDM AssociationRequest" into sc-dev 2021-03-06 01:40:10 +00:00
TreeHugger Robot
a14342934e Merge "Guard CDM watch profile behind its permission" into sc-dev 2021-03-05 22:52:10 +00:00
Eugene Susla
689af3ece2 Add creation time to CDM AssociationRequest 
This will help differentiate distinct requests when analyzing logs

Bug: 181344542
Test: presubmit
Change-Id: I5b3e997b84c16a3b4f774f43cf5aed695bc8910e
 2021-03-05 13:53:08 -08:00
Eugene Susla
2db826decf Add @RequiresPermission for CDM watch profile use 
Bug: 165951651
Test: presubmit
Change-Id: Id1c3b2656875de07cfc3fd936d528d0410a62aee
 2021-03-05 12:34:50 -08:00
Eugene Susla
f31443e224 Guard CDM watch profile behind its permission 
Bug: 165951651
Test: manual
Change-Id: If6aa1c2513bc2f3edf4fd9c83f2f1090a2907bed
 2021-03-05 12:08:34 -08:00
Eugene Susla
081b780539 Merge "Address API council feedback" into sc-dev am: 9076840750 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743001

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1036f74d67ca7fefbb8cd87c2d24f94879dd72fb
 2021-03-04 19:55:51 +00:00
Eugene Susla
206e26a294 Address API council feedback 
Fixes: 181681395
Fixes: 181562406
Test: presubmit
Change-Id: I51fc6e1568a8fadf82c8c1c5b52c1356a94ce36d
 2021-03-02 12:46:51 -08:00
Eugene Susla
b9a7ef222c Merge "Address CDM API feedback" into sc-dev am: 098bd02d64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13693064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic390019970d24364b5f89ba1ad7b4dc5968675ed
 2021-02-25 18:40:30 +00:00
Eugene Susla
41d85c3ea1 Address CDM API feedback 
Fixes: 181175212
Test: atest CompanionDeviceManagerTest
Change-Id: I33c5b2ddaedd09a9f4fae29b247f42e2351b1a0f
 2021-02-24 17:56:34 -08:00
Eugene Susla
f89fcec4b7 [DO NOT MERGE] Provide CDM util to check if ok to pair BT without prompt 
Test: presubmit
Bug: 172006481
Merged-In: Ibc544466ccd8f1f24fc9899a740024e8c324e721
Change-Id: Ibc544466ccd8f1f24fc9899a740024e8c324e721
  (cherry picked from commit ff7c1ea572)
 2021-02-09 03:43:49 +00:00
Eugene Susla
6ce1f4109f [DO NOT MERGE] Scan and notify apps when their companion devices are nearby 
Test: manual
Bug: 168052577
Change-Id: Ib2187fb76e604878b1d4dd9c0cd6cea610b2a04d
(cherry picked from commit 017c2c4145)
 2021-02-08 22:50:57 +00:00
Eugene Susla
5dcc8b9798 Don't crash on unknown CDM profile name 
We should support the case of new profiles added in PermissionController

Test: manual
Bug: 165951651
Change-Id: Ia647dfbd815785c2ed5a45d0416816489b9d4914
(cherry picked from commit 5bd46ed2b3)
 2021-02-03 19:31:27 +00:00
Eugene Susla
be3bd3069e Merge "Don't crash on unknown CDM profile name" 2021-01-29 22:32:40 +00:00
Eugene Susla
5bd46ed2b3 Don't crash on unknown CDM profile name 
We should support the case of new profiles added in PermissionController

Test: manual
Bug: 165951651
Change-Id: Ia647dfbd815785c2ed5a45d0416816489b9d4914
 2021-01-29 19:47:06 +00:00
Eugene Susla
ff7c1ea572 Provide CDM util to check if ok to pair BT without prompt 
Test: presubmit
Change-Id: Ibc544466ccd8f1f24fc9899a740024e8c324e721
 2021-01-28 10:11:11 -08:00
Eugene Susla
017c2c4145 Scan and notify apps when their companion devices are nearby 
Test: manual
Bug: 168052577
Change-Id: Ib2187fb76e604878b1d4dd9c0cd6cea610b2a04d
 2021-01-19 14:09:28 -08:00
Eugene Susla
0da6fe5759 Replace CDM profiles hardcoded strings with real values 
Test: manual
Bug: 165951651
Change-Id: Ie3771df49dca43b9c91f64b32a6b56b211e754ad
 2021-01-12 11:30:24 -08:00
Eugene Susla
205637383c API for CDM wake-up opt-in 
Bug: 168052577
Test: presubmit
Change-Id: I1cd1728099ddf374db4cf0e59f748ea3b655e1ba
 2020-12-10 18:57:17 -08:00
Eugene Susla
151da5b2bc Store CDM device profile and apply role when device is connected 
Test: manual - ensure role privileges are granted/revoked when device is connected/disconnected
Bug: 165951651
Change-Id: Id24a4b3a3510781d9105763b1722f44583a7fd7c
 2020-12-04 15:56:50 -08:00
Eugene Susla
abe605b1da Add OWNERS to CDM and some utils I manitain 
Test: presubmit
Change-Id: I26a7f810c6edff8f96b32887acd6e4613a91c7ef
 2020-11-23 09:59:56 -08:00
Eugene Susla
1fc34a0784 Merge "CDM profile API" 2020-11-06 19:45:14 +00:00
Eugene Susla
df69bbaf29 Add API for CDM keep-awake service 
Test: presubmit
Bug: 168052577
Change-Id: I9adcd9b6a33f23564ce1b8cddad36a3df047ba3a
 2020-11-05 12:12:06 -08:00
Eugene Susla
10864c6764 CDM profile API 
This introduces API for devs to request a "watch" profile,
as well as an optional "persistent CDM grants", e.g. for devices
with wifi/LTE.

This also introduces a permission that will be mandatory for apps
to declare in the manifest when opting into the above

CTS-Coverage-Bug: 172290699
Bug: 165951651
Test: presubmit
Change-Id: Ie5016c92855f33edb46fa8eb7ae2a9226e29cdda
 2020-11-04 16:02:06 -08:00
Mathew Inwood
8e742f928e Add maxTargetSdk restriction to unused APIs. 
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

This is a resubmit of ag/12929664 with some APIs excluded that caused
test failures; see bugs 171886397, 171888296, 171864568.

APIs excluded:
Landroid/bluetooth/le/ScanRecord;->parseFromBytes([B)Landroid/bluetooth/le/ScanRecord;
Landroid/os/Process;->myPpid()I
Landroid/os/SharedMemory;->getFd()I
Landroid/hardware/input/InputManager;->INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH:I

Bug: 170729553
Test: Treehugger
Change-Id: I8285daa8530260251ecad6f3f38f98e263629ca7
 2020-10-29 11:51:12 +00:00
Hongwei Wang
286c33a5c5 Merge "Revert "Add maxTargetSdk restriction to unused APIs."" 2020-10-28 23:58:21 +00:00
Hongwei Wang
050275cd83 Revert "Add maxTargetSdk restriction to unused APIs." 
This reverts commit 72f07d6a8a.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?testMethod=testAppZygotePreload&testClass=android.app.cts.ServiceTest&atpConfigName=suite%2Ftest-mapping-presubmit-retry_cloud-tf&testModule=CtsAppTestCases&fkbb=6936597&lkbb=6936969&lkgb=6936551&testResults=true&branch=git_master&target=cf_x86_phone-userdebug>, bug b/171886397

Bug: 171886397
Change-Id: Ibe0f0430a3451477c1ee8ef56a596e91ea1e7672
 2020-10-28 20:16:22 +00:00