Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
610,098 Commits 3 Branches 0 Tags
8eeeef38d296be06f731a8fc2d9fbbe409cb08ef
Commit Graph

1730 Commits

Author SHA1 Message Date
Automerger Merge Worker
9f2fd7efc7 Merge "Merge "Introduce a BluetoothConnectionCallback that will fire off events when a device is connected or disconnected." am: 917b0a4488 am: 4d0e0a264b am: a85edfaf40" into rvc-qpr-dev-plus-aosp am: 9ee26c4355 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478819

Change-Id: Ic5579ebc90f8a23b799c96704756938ca667a23e
 2020-10-30 04:09:25 +00:00
Treehugger Robot
a85edfaf40 Merge "Introduce a BluetoothConnectionCallback that will fire off events when a device is connected or disconnected." am: 917b0a4488 am: 4d0e0a264b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478819

Change-Id: I05b230a04ccc2ca43e06246bbab68e6c173a1183
 2020-10-30 03:29:31 +00:00
Treehugger Robot
917b0a4488 Merge "Introduce a BluetoothConnectionCallback that will fire off events when a device is connected or disconnected." 2020-10-30 02:34:25 +00:00
Rahul Sabnis
79ce82f840 Introduce a BluetoothConnectionCallback that will fire off events when a 
device is connected or disconnected.

Tag: #feature
Bug: 171902843
Test: Manual
Change-Id: I194a35a69fe0c5d960ea88a1a0fa52c8df7738e2
 2020-10-29 16:51:26 -07: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
Treehugger Robot
0207b41506 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." am: 5ba504f179 am: 09b112ff93 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444676

Change-Id: I0eee659fed87c632038e976f5a592515fe4b54e3
 2020-10-29 01:22:31 +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
Treehugger Robot
5ba504f179 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." 2020-10-28 19:44:40 +00:00
Rahul Sabnis
57835f979c Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from 
the non-SDK API list to the blocklist in Android 11 back to the non-SDK
API list.

Tag: #feature
Bug: 168812851
Test: atest BluetoothHostTest#testCodecMethodsAccessible
Merged-In: I29983284b1a1c271d983c99b286e204604abdc72
Change-Id: I29983284b1a1c271d983c99b286e204604abdc72
 2020-10-28 18:35:25 +00:00
Mathew Inwood
72f07d6a8a 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.

Bug: 170729553
Test: Treehugger
Change-Id: I4c8fd0006f950de9955242e93968fb0996ceb372
 2020-10-27 15:46:07 +00:00
Kevin Hufnagle
41f955e8b6 Merge "docs: Use correct profile for intent" into rvc-dev am: b7eef50878 am: dc4f87a3ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12879988

Change-Id: Ia29277f79e0235194c592a6f60cec35bd59f9442
 2020-10-22 09:46:41 +00:00
Kevin Hufnagle
c841e87526 Merge "docs: Use correct profile for intent" into rvc-dev am: b7eef50878 am: 63314714e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12879988

Change-Id: Ifb153b103c7a0a014f05e3b5d38fe91da1e29d38
 2020-10-22 08:01:16 +00:00
Kevin Hufnagle
63314714e0 Merge "docs: Use correct profile for intent" into rvc-dev am: b7eef50878 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12879988

Change-Id: If6942c2427842d2445e02a3e3281c41fb4d16fe1
 2020-10-22 06:13:43 +00:00
Kevin Hufnagle
fcd519fde9 docs: Use correct profile for intent 
The ACTION_AUDIO_STATE_CHANGED intent action uses the HDP profile,
not the A2DP profile.

Bug: 158742305
Test: m ds-docs-java
Exempt-From-Owner-Approval: Docs-only change
Change-Id: I4358aac8c8aa9fc8b36e517e568e5a9db538555e
 2020-10-19 21:08:17 -04:00
Roman Kalukiewicz
24403f7ef2 Add @Nullable annotation to the parameter of Object.equals() methods. 
Those annotations could be inferred by some tools (like Kotlin), but the
https://checkerframework.org/ doesn't check inherited annotations
complaining about all equals() invocations that get nullable argument.

The change was generated by running

find . -name \*.java | xargs sed -i 's/public boolean equals(Object /public boolean equals(@Nullable Object /'

in the frameworks/base directory and by automatically adding and
formatting required imports if needed. No manual edits.

Bug: 170883422
Test: Annotation change only. Should have not impact.
Exempt-From-Owner-Approval: Mechanical change not specific to any component.
Change-Id: I5eedb571c9d78862115dfdc5dae1cf2a35343580
 2020-10-15 10:48:01 -07:00
Jeff Sharkey
f76ffeaff1 Merge changes from topic "oct6" 
* changes:
  Upgrade AndroidFrameworkBinderIdentity to fatal.
  Tighten up Binder.clearCallingIdentity() usage.
  Tighten up Binder.clearCallingIdentity() usage.
  Tighten up Binder.clearCallingIdentity() usage.
 2020-10-08 18:50:22 +00:00
Jakub Pawlowski
0e2a4d0164 Merge "Bluetooth: make it possible to advertise service solicitation UUID" am: 60ccba0c52 am: 272efa5606 am: a32477e77e am: e4b95b5419 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453036

Change-Id: Ic32ac86ce3833b8fb5ecb02ad6fbd399160533c7
 2020-10-08 12:03:00 +00:00
Jakub Pawlowski
e4b95b5419 Merge "Bluetooth: make it possible to advertise service solicitation UUID" am: 60ccba0c52 am: 272efa5606 am: a32477e77e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453036

Change-Id: I30f2113445c6bc72554351a4187166db8ff5e2c2
 2020-10-08 11:48:51 +00:00
Jakub Pawlowski
9b46151ead Bluetooth: make it possible to advertise service solicitation UUID 
Bug: 159827149
Tag: #feature
Test: called the API in test app, verified advertisement content
Change-Id: I3ab43e39bb7fd8fef97e141eeb981419aa3ec35a
 2020-10-08 07:26:01 +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
Treehugger Robot
c861b286f1 Merge "Bluetooth: Spell mandatory correctly" am: e7899bcd32 am: e17c4e0003 am: 438264485d am: d55aea0c0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449262

Change-Id: I78d8b4f3572d172cda209bfe98edd8f3e5f560b0
 2020-10-05 21:38:30 +00:00
Treehugger Robot
d55aea0c0d Merge "Bluetooth: Spell mandatory correctly" am: e7899bcd32 am: e17c4e0003 am: 438264485d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449262

Change-Id: Ifeb448aa4ec158309cc8d86d05c13aeac9706b3f
 2020-10-05 21:17:34 +00:00
Myles Watson
70b5ba179c Bluetooth: Spell mandatory correctly 
Bug: 169654068
Test: compilation
Change-Id: Ibb0046180760e27d6991ae17849a7405738b6f01
 2020-10-05 11:23:24 -07:00
Jakub Pawlowski
da0e253c5b Merge "Make BluetoothGattCallback.onServiceChanged public" am: 802503736d am: 531993dca1 am: 23c923d197 am: 41e6915dcd am: d69656a0b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1439193

Change-Id: If481ce4165216b93c0c78ed070c757e9fc632d91
 2020-09-27 07:35:49 +00:00
Jakub Pawlowski
d69656a0b7 Merge "Make BluetoothGattCallback.onServiceChanged public" am: 802503736d am: 531993dca1 am: 23c923d197 am: 41e6915dcd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1439193

Change-Id: Id9945a11865c9e4ae0155eccc19cbbdc90dd5d48
 2020-09-26 17:10:25 +00:00
Jakub Pawlowski
2c1d2c21cf Make BluetoothGattCallback.onServiceChanged public 
Bug: 154056389
Test: proper CTS test will be provided
Change-Id: I2c9264910b65d62124c75c3ee3fd0b5bd18a2006
 2020-09-26 15:50:37 +00:00
HsingYuan Lo
57c801d839 Merge "Expose service changed event to application (2/3)" am: 199d2c7384 am: 90fd6a303f am: b9fadf6916 am: 0e73bae3af am: b784e06bb0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433925

Change-Id: I803a9b4ef0dcc5ce05b3803e01b558571de16cd8
 2020-09-25 06:43:38 +00:00
HsingYuan Lo
b784e06bb0 Merge "Expose service changed event to application (2/3)" am: 199d2c7384 am: 90fd6a303f am: b9fadf6916 am: 0e73bae3af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433925

Change-Id: If6b1bd5ee1e3719c1f803ad06eb5e5fa931398df
 2020-09-25 06:19:51 +00:00
HsingYuan Lo
762a05f057 Expose service changed event to application (2/3) 
Handle service changed event from GattService

Bug: 154056389
Tag: #feature
Test: test service changed scenario
Change-Id: If56dcbd7cf17b23c88cceb9c67c5d75b21320965
 2020-09-24 09:27:58 +08:00
TreeHugger Robot
8e8eaa8624 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." into rvc-qpr-dev am: 79a1219925 am: 46bc536504 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12657859

Change-Id: Ia9b8b3de2944bc971eaca463c8cb12c137911a9c
 2020-09-22 21:14:26 +00:00
TreeHugger Robot
46bc536504 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." into rvc-qpr-dev am: 79a1219925 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12657859

Change-Id: I4533f23095a2546d31d941d721c6766ad9bbdcda
 2020-09-22 21:04:29 +00:00
Rahul Sabnis
4bbbfaa6ec Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from 
the non-SDK API list to the blocklist in Android 11 back to the non-SDK
API list.

Tag: #feature
Bug: 168812851
Test: atest BluetoothHostTest#testCodecMethodsAccessible
Change-Id: I29983284b1a1c271d983c99b286e204604abdc72
 2020-09-22 04:10:46 +00:00
Treehugger Robot
8f78267409 Merge "Add action for Bluetooth tethering state changed" am: cf44a015e8 am: 773810d198 am: f03a18b7ab am: eca1afc382 am: e6b1120635 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422889

Change-Id: Ib554a97fd7293c872690407ca791482c1d4ad56e
 2020-09-18 03:56:01 +00:00
Treehugger Robot
cf44a015e8 Merge "Add action for Bluetooth tethering state changed" 2020-09-17 02:01:00 +00:00
Ted Wang
47558ca2b2 Add action for Bluetooth tethering state changed 
Add new action for Bluetooth tethering state changed and extra for
broadcasting Bluetooth tethering state changed.

Tag: #feature
Bug: 138688805
Test: Manual
Change-Id: Ie0f848448f9717a6a1233d0dbb0785da7d30dc81
 2020-09-16 10:31:25 +08:00
Jeff Sharkey
4b5b0174d0 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570 am: 487d394296 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: Id01f468b43fd5b2aada78608010625b392c1b647
 2020-09-15 21:01:48 +00:00
Jeff Sharkey
a8cec413b6 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I245b8d9cac722da76ea67983738a3cbb9deb68df
 2020-09-14 10:00:07 -06:00
Jeff Sharkey
16dd960d6f Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Id1a0f2a38e41badee3a34bd71af240511f273a7b
 2020-09-14 10:00:05 -06:00
Makoto Onuki
2e6c621454 Remove unnecessarily @System/TestApi annotations 
We can't expose APIs if the enclosing class is hidden, so these
annotations are redundant. We need to remove them so that we can enable the
check.

Exempt-From-Owner-Approval: Cherry-pick from goog/master
Bug: 159121253
Test: treehugger (i.e. this shouldn't trigger "API has changed" error.)
Merged-in: Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2
Change-Id: Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2
 2020-09-01 08:52:31 -07: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
Zach Johnson
1d7b632b7a Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 am: e32671c74d am: dc08329ee9 am: 8f73278804 am: 99666c4572 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404838

Change-Id: I20e64adddf20667dc2abbfd5582a8cb34e3f0285
 2020-08-20 03:45:02 +00:00
Zach Johnson
dc08329ee9 Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 am: e32671c74d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404838

Change-Id: Idcfc40762221d456374fdf7ee3f96123a137a793
 2020-08-20 02:44:09 +00:00
Zach Johnson
f2a8b85026 Remove listenUsingEncryptedRfcommOn & listenUsingScoOn 
both are hidden and not @UnsupportedAppUsage, so are safe to remove

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I58acb4160207fc0eeaeb7875bfd61f3bd442ad9a
 2020-08-19 16:53:06 -07:00
TreeHugger Robot
27b4cb6bb7 Merge "Do not log sensitive information in AudioService." 2020-08-01 01:48:34 +00:00
jiabin
bacecee90b Do not log sensitive information in AudioService. 
Sensitive information, such as IP and MAC address, should not be logged.
In AudioService, only log the last 3 octets of BT device address.

Test: make, connect BT device and log
Bug: 162299985
Change-Id: I99db812efc327e6f3ebe791274998291a140a5b6
 2020-07-31 15:41:38 -07:00
Treehugger Robot
b3838bbbb0 Merge "Update language to comply with Android's inclusive language guidance" am: cc2d51fcef am: ed914ce683 am: 512c1c5ab9 am: e7d2991fb2 am: c08b68d049 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374017

Change-Id: Ife7a9e5dbd75d0bbe6d40ee257e50ea998df4822
 2020-07-29 13:33:29 +00:00
Treehugger Robot
512c1c5ab9 Merge "Update language to comply with Android's inclusive language guidance" am: cc2d51fcef am: ed914ce683 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374017

Change-Id: Ib2aa56b08e4cf507a5c878295114091ce600eae0
 2020-07-29 12:40:20 +00:00
Alice Kuo
9922d8cc9d Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

#inclusivefixit

Bug: 161896447
Test: NA (Comment only)

Change-Id: Id4f72f98d5a5def26d42d112aeb1b67217d38af0
 2020-07-29 04:00:34 +00:00
Treehugger Robot
3d0dca5cab Merge "Bluetooth: MCE: Add new API to set message read status or deleted status" am: ab98549022 am: 5cdec2e9d1 am: e63b8e9c80 am: 3b61eb972d am: 411a126070 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1212983

Change-Id: Ibd790358305b25a922a0ffe6e4b1323a90759022
 2020-07-14 22:29:10 +00:00
Treehugger Robot
e63b8e9c80 Merge "Bluetooth: MCE: Add new API to set message read status or deleted status" am: ab98549022 am: 5cdec2e9d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1212983

Change-Id: Ie09a4b1e54288b88bc829c6713172c1dbe1608a2
 2020-07-14 21:39:51 +00:00