653597 Commits

Author SHA1 Message Date
Samiul Islam
bdbf40efd6 libbinder: split out PackageManagerNative aidl
Very few clients of libbinder use PackageManagerNative service, as such
it's a waste to couple them together. Now, user of PackageManagerNative
service need to add the corresponding aidl files as shared library.

Bug: 183654927
Test: builds + presubmit

Change-Id: Ie64fb3502d8e5164df4710feb2f525db7c4234a2
Merged-In: Ie64fb3502d8e5164df4710feb2f525db7c4234a2
2021-09-15 12:48:13 +00:00
Austin Shin
f3b6f05c6a Merge "Fix onStateChanged issue." am: 61c3d559c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822992

Change-Id: Ie729ef7defddbe3fd55699480f6f3cf63d32b8c8
2021-09-15 04:15:50 +00:00
Austin Shin
61c3d559c8 Merge "Fix onStateChanged issue." 2021-09-15 03:57:16 +00:00
Roopa Sattiraju
f46dea86b0 [automerger skipped] Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" am: 2ef5e10f45 -s ours
am skip reason: Merged-In I02b2e7e5e0be3b462f7c25b655e669e2c7fe47eb with SHA-1 ce1d2e1fb4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1804490

Change-Id: I84d8265b2cdbd6f5ed005d968f04b9f27f1aee79
2021-09-15 01:24:38 +00:00
Roopa Sattiraju
2ef5e10f45 Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" 2021-09-15 01:12:09 +00:00
Treehugger Robot
41bf6fa76f Merge "MediaCodecInfo: do not alter performance points for 32-bit processes (2)" am: a78fa61ba8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1787047

Change-Id: Ifb7b56c1e3088183cc2881a1b75b6b09ab549255
2021-09-14 23:35:17 +00:00
Treehugger Robot
a78fa61ba8 Merge "MediaCodecInfo: do not alter performance points for 32-bit processes (2)" 2021-09-14 23:21:32 +00:00
Treehugger Robot
7052180c60 Merge "Fix typos in IdentityCredential.java javadoc" am: 37677f40d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1826574

Change-Id: I9f59a551b33b3d030b2a4718ad48d29690875d15
2021-09-14 22:24:08 +00:00
Treehugger Robot
37677f40d0 Merge "Fix typos in IdentityCredential.java javadoc" 2021-09-14 22:06:33 +00:00
Treehugger Robot
4f564346de Merge "New API for getting enabledcomponent" am: bca93eafe5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818892

Change-Id: I46736aedc7df2d8e6926414adb9b48748386393d
2021-09-14 18:34:16 +00:00
Treehugger Robot
bca93eafe5 Merge "New API for getting enabledcomponent" 2021-09-14 18:18:30 +00:00
Seth Moore
fab34c1adc Fix typos in IdentityCredential.java javadoc
"byt" -> "but"
"readerAuth" -> "readerSignature"

Test: N/A
Change-Id: Ie8e8c4fa4479d3694871fe00bb0d99698fa05966
2021-09-14 11:01:28 -07:00
Elliott Hughes
76aa934468 Merge "Set $TMPDIR as well as java.io.tmpdir." am: 1353c41379
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1821337

Change-Id: Ib98b38571754781102093c67d15ac3364c5dc029
2021-09-14 17:08:20 +00:00
Elliott Hughes
1353c41379 Merge "Set $TMPDIR as well as java.io.tmpdir." 2021-09-14 16:49:24 +00:00
wescande
29dbede144 New API for getting enabledcomponent
Bluetooth can no longer call SystemConfig and need to use the manager.

Bug: 190440540
Bug: 199279027
Test: Manual
Tag: #refactor
Change-Id: I065ab407c83cd2edf2244e4170496b0979ac562c
2021-09-14 16:11:19 +00:00
Colin Cross
902b8e2df5 Merge "Update manifest to account for new startup library" into stage-aosp-master 2021-09-13 21:10:01 +00:00
Jakub Pawlowski
711025a464 [automerger skipped] Merge "csip: Add Coordinated Set Identification Profile" am: baea19f18f -s ours
am skip reason: Merged-In I67536ddcc32ace82d63e19426dce19f2bc69cdea with SHA-1 d35f8bcddc is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749722

Change-Id: I3cb1ce0008db08299e115c5244257f74a724e5a2
2021-09-13 20:56:29 +00:00
Jakub Pawlowski
baea19f18f Merge "csip: Add Coordinated Set Identification Profile" 2021-09-13 20:40:31 +00:00
Łukasz Rymanowski
58ad9295c7 csip: Add Coordinated Set Identification Profile
Tag: #feature
Test: atest CsipSetCoordinatorStateMachineTest CsipSetCoordinatorServiceTest
Bug: 150670922
Sponsor: jpawlowski@
Merged-In: I67536ddcc32ace82d63e19426dce19f2bc69cdea
Change-Id: I67536ddcc32ace82d63e19426dce19f2bc69cdea
2021-09-13 19:02:10 +00:00
Jakub Pawlowski
c258dbbb52 Merge "csip: Add Coordinated Set Identification Profile" into stage-aosp-master 2021-09-13 17:35:37 +00:00
Roopa Sattiraju
913ea0a167 Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" into stage-aosp-master 2021-09-13 16:47:57 +00:00
Łukasz Rymanowski
d35f8bcddc csip: Add Coordinated Set Identification Profile
Tag: #feature
Test: atest CsipSetCoordinatorStateMachineTest CsipSetCoordinatorServiceTest
Bug: 150670922
Sponsor: jpawlowski@
Change-Id: I67536ddcc32ace82d63e19426dce19f2bc69cdea
2021-09-11 08:55:01 +02:00
Treehugger Robot
17da84da54 Merge "Fix typo contail->contain" am: 49dcfea031
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824553

Change-Id: Ia965a1c5aaa32b55bcf1548ae1eba0470745ca33
2021-09-11 05:16:58 +00:00
Treehugger Robot
49dcfea031 Merge "Fix typo contail->contain" 2021-09-11 04:47:09 +00:00
Ray Essick
24ae84e900 Fix typo contail->contain
Bug: 199238217
Test: compilation
Change-Id: I401e590cd27bfab2d09c9e2552f11f6f16360b8c
2021-09-10 20:25:24 -07:00
Treehugger Robot
59622faba3 Merge "Deep copy service state object" am: d3f9cdd5be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822142

Change-Id: I158ae8044a82b59e74b8f9580ea7db0ac8d0fe69
2021-09-10 21:55:59 +00:00
Treehugger Robot
d3f9cdd5be Merge "Deep copy service state object" 2021-09-10 21:43:00 +00:00
Benedict Wong
24e038e8a4 Merge "Always trigger safe mode callbacks" am: 831f78825b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1811936

Change-Id: Ib8cf8010996f6eb52db438f5944af4b5ee66af7a
2021-09-10 18:56:56 +00:00
Benedict Wong
831f78825b Merge "Always trigger safe mode callbacks" 2021-09-10 18:39:27 +00:00
Dmitri Plotnikov
cc225325e3 Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: If3cc87baf6a2249634e3f35ea8683177d9ace1c9
2021-09-10 18:20:32 +00:00
Dmitri Plotnikov
a84bdc93a8 Merge "Add OWNERS for BatteryStats related files" 2021-09-10 18:04:36 +00:00
Dmitri Plotnikov
9fca835a97 Add OWNERS for BatteryStats related files
Test: N/A

Change-Id: I6b17062eaf538849389528619067504f18e7b2ab
2021-09-09 18:24:17 -07:00
Treehugger Robot
4c40734d1a [automerger skipped] Merge "Avoid Bluetooth gets turned on by enableBle" am: 99f31b981d -s ours
am skip reason: Merged-In Ic9df612ec0e396932df2fb3bf3a5874bd4e7443c with SHA-1 cc89e936cf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1821214

Change-Id: Id63ecfa681b29806b745b853952f7a3f1a0bdd39
2021-09-10 01:15:20 +00:00
Dmitri Plotnikov
a8231dae28 Merge "Add OWNERS for BatteryStats related JNI files" am: 542aace5fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823180

Change-Id: I9a2f43fbb0a661aa5ade073f66c06b665ddf5166
2021-09-10 01:14:07 +00:00
Treehugger Robot
99f31b981d Merge "Avoid Bluetooth gets turned on by enableBle" 2021-09-10 01:03:29 +00:00
Dmitri Plotnikov
542aace5fc Merge "Add OWNERS for BatteryStats related JNI files" 2021-09-10 00:37:10 +00:00
Jack Yu
aa150426de Deep copy service state object
The entire service state should be deep copied, instead of shallow
copied to the other object.

Fix: 174306612
Test: Manual
Merged-In: Ib6ad4ba26653ce5faad1e118a28d8be51435676c
Change-Id: Ib6ad4ba26653ce5faad1e118a28d8be51435676c
(cherry picked from commit 579f130ee349f5cf3663dc449a6dbfe06599f02d)
2021-09-09 16:23:39 -07:00
Roopa Sattiraju
943ac64f97 Changing BluetoothHeadset APIs from @hide to @SystemApi
For isInbandringing API - it is used in the call journey and would
change the behavior(undeterministic) of the call if not used.

Stop/StartScoUsingVirtualVoiceCall is used in the BluetoothShim layer
specifically for testing and mocking in the Android Apps. Seems
reasonable to keep this as a SystemAPI given that it has no params and
unlikely to be changed.

Bug: 195160939
Tag: #feature
Test: Manual
Merged-In: I02b2e7e5e0be3b462f7c25b655e669e2c7fe47eb
Change-Id: I02b2e7e5e0be3b462f7c25b655e669e2c7fe47eb
2021-09-09 15:48:15 -07:00
Dmitri Plotnikov
ce877b8474 Add OWNERS for BatteryStats related JNI files
Test: N/A
Change-Id: I2dee35c5b2e852c3abfcbcc4a52f0d7f245b43ca
2021-09-09 15:42:13 -07:00
Alan Viverette
ab4ee2825d Update manifest to account for new startup library
Change-Id: Ia896ab92921807a343482c080f8e45b117596ba2
Merged-In: Ia896ab92921807a343482c080f8e45b117596ba2
(cherry picked from commit e9c01cf1ae89a412e5b95ec6e45e3d2ba55263c2)
2021-09-09 14:40:53 -07:00
Bill Yi
4c4d27cd19 [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: 56cff2cee0 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822870

Change-Id: I59bf80a55f04fabceba05d89247fe1264d758f66
2021-09-09 21:39:31 +00:00
Bill Yi
56cff2cee0 Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" 2021-09-09 21:27:24 +00:00
Roopa Sattiraju
ce1d2e1fb4 Changing BluetoothHeadset APIs from @hide to @SystemApi
For isInbandringing API - it is used in the call journey and would
change the behavior(undeterministic) of the call if not used.

Stop/StartScoUsingVirtualVoiceCall is used in the BluetoothShim layer
specifically for testing and mocking in the Android Apps. Seems
reasonable to keep this as a SystemAPI given that it has no params and
unlikely to be changed.

Bug: 195160939
Tag: #feature
Test: Manual
Change-Id: I02b2e7e5e0be3b462f7c25b655e669e2c7fe47eb
2021-09-09 14:14:12 -07:00
Shawn Lien
c2d8e1d446 Merge "Support Free Shortcode for TracFone Customer Service" am: d673dddb01
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1821912

Change-Id: I0fe47b33a3763a55fb3319891d0446ff44b680f0
2021-09-09 18:13:26 +00:00
Shawn Lien
d673dddb01 Merge "Support Free Shortcode for TracFone Customer Service" 2021-09-09 17:58:27 +00:00
TreeHugger Robot
d9d1dd7c53 Merge "Avoid Bluetooth gets turned on by enableBle" into stage-aosp-master 2021-09-09 17:13:03 +00:00
Bernardo Rufino
075952fa51 Merge "Use appendFrom in LazyValue.writeToParcel()" am: 730b6cfbc1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1821492

Change-Id: I62192f0e179540552fec8e124581c717c867f09e
2021-09-09 10:06:40 +00:00
Bernardo Rufino
730b6cfbc1 Merge "Use appendFrom in LazyValue.writeToParcel()" 2021-09-09 09:48:13 +00:00
Ugo Yu
cc89e936cf Avoid Bluetooth gets turned on by enableBle
BluetoothHandler was not able to tell whether the MESSAGE_ENABLE was
from enable() or enableBle(), which sometimes lead to Bluetooth gets
turned to STATE_ON by an enableBle() call.

Fix this problem by adding a BLE specific argument in the message to
differ the calls.

Bug: 191404687
Test: Manual
Change-Id: Ic9df612ec0e396932df2fb3bf3a5874bd4e7443c
(cherry picked from commit e74d4835a15ff9ceeff1b8a4c1ebcf21f0b379ea)
2021-09-09 06:06:29 +00:00
Ping Fan
167d4a3c33 Fix onStateChanged issue.
[Description]
inputState will override by wrong state
when call onStateChaned directly.

[Test Report]
Test pass

Bug: 196189979

Change-Id: I13377407c9ea9f4f0727edea5d57135c6569cba0
2021-09-09 11:07:06 +08:00