Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
654,758 Commits 3 Branches 0 Tags
343e36ebe78cd2215decdbda2dd45eb702278e2a
Commit Graph

654758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Louis Chang
343e36ebe7 Merge "Continue the pausing process after automatically entering pip" am: d88101f7a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849218

Change-Id: Ifd0958280d91156ca71481a6f0a76e8c78424f9c
 2021-10-12 06:28:55 +00:00
Louis Chang
d88101f7a4 Merge "Continue the pausing process after automatically entering pip" 2021-10-12 06:16:31 +00:00
Jakub Pawlowski
929d2e04ee Merge "bluetooth: Set special delay for LeAudio auto connect" am: a457cb6f90 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1830517

Change-Id: Ie7b274afcae17c39de6e2cbd19f881dc7803d28d
 2021-10-11 19:46:06 +00:00
Jakub Pawlowski
a457cb6f90 Merge "bluetooth: Set special delay for LeAudio auto connect" 2021-10-11 19:25:13 +00:00
Grzegorz Kołodziejczyk
f08b1a5ce6 bluetooth: Set special delay for LeAudio auto connect 
Timer fires when there is more GATT services to discover on a peer
devices. In such case, Android don't even start connecting profiles.

Increasing timeout solves a problem, but probably some other solution
is needed.

Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual
Change-Id: If28247836690a209b9dc45b297aa889029a14abb
 2021-10-11 16:13:15 +00:00
Anton Hansson
58ae8524f5 Merge "Rename merged services.txt module" am: 74b15ca3c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850198

Change-Id: I2be3208da5e0b7887debfdc1d3062e82050b551f
 2021-10-11 16:10:56 +00:00
Anton Hansson
74b15ca3c5 Merge "Rename merged services.txt module" 2021-10-11 15:57:02 +00:00
Ben Miles
d27b7d3952 Merge "Add empty package + OWNERS file for critical event protos" am: ae99d9ba9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850197

Change-Id: I69f5db03773597d635102b91b606d462fe316fc0
 2021-10-11 10:37:57 +00:00
Ben Miles
ae99d9ba9c Merge "Add empty package + OWNERS file for critical event protos" 2021-10-11 10:24:42 +00:00
Jakub Pawlowski
bea8d8d265 Merge "leaudio: Remove not needed group status" am: 6e897f9eb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850202

Change-Id: I0e2514c542bff3725a97ed0c5d4af2d5d56f03d0
 2021-10-10 11:30:24 +00:00
Jakub Pawlowski
6e897f9eb6 Merge "leaudio: Remove not needed group status" 2021-10-10 11:11:00 +00:00
Jakub Pawlowski
05dd4fbc03 Merge "leaudio: Add set volume API" am: b49456ff77 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850201

Change-Id: I99b76b0a92a1ea5e737f10e0166c1c7f9d3fa0be
 2021-10-10 08:58:28 +00:00
Jakub Pawlowski
b49456ff77 Merge "leaudio: Add set volume API" 2021-10-10 08:44:04 +00:00
Jakub Pawlowski
5e7527dbd5 Merge changes I7782f95c,I7e553bd9 am: b6cf963be9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850200

Change-Id: I39fcf101bb54781c199a97b15b26982ef12cfa6c
 2021-10-09 07:23:51 +00:00
Jakub Pawlowski
b6cf963be9 Merge changes I7782f95c,I7e553bd9 
* changes:
  leaudio: Fix link to intent
  leaudio: update UUID
 2021-10-09 07:05:09 +00:00
Treehugger Robot
355d9d3d56 Merge "Update doc of ServiceState.getChannelNumber about NR" am: bbed692810 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845282

Change-Id: I3b3c7724913750cbec9df33561d6ba44a8c0cf4a
 2021-10-08 23:44:05 +00:00
Treehugger Robot
bbed692810 Merge "Update doc of ServiceState.getChannelNumber about NR" 2021-10-08 23:24:56 +00:00
Łukasz Rymanowski
60466ee623 leaudio: Remove not needed group status 
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: Id9145e6e2631d0eae102bcc502ae4aa233b61d7b
 2021-10-08 21:59:05 +00:00
Łukasz Rymanowski
bc3859a482 leaudio: Add set volume API 
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: Icb2e7681e4b5e7ba2e796671ff6f4c59bbff29d7
 2021-10-08 21:59:04 +00:00
Łukasz Rymanowski
9a745d0f01 leaudio: Fix link to intent 
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: I7782f95cca7478dcd585d435f585bba6a453f1ab
 2021-10-08 21:08:50 +00:00
Łukasz Rymanowski
42ee6a1e29 leaudio: update UUID 
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: I7e553bd9ffec52c1a2f70e80a194ad7214fe905a
 2021-10-08 21:08:50 +00:00
Treehugger Robot
f41c8ad7ab Merge changes Ic6e60752,I2b8b7e74 am: 70e7dd44b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845996

Change-Id: I6014b12fd060fae30ac28a429a69338cb3f56265
 2021-10-08 15:48:44 +00:00
Janis Danisevskis
03118ee103 Keystore 2.0 SPI: Fix contract between equals and hashCode 2 am: e36fe6bf46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845995

Change-Id: I72f5719d480cd0f68bac07261b298543e94aeb45
 2021-10-08 15:48:23 +00:00
Treehugger Robot
70e7dd44b4 Merge changes Ic6e60752,I2b8b7e74 
* changes:
  Test for contract between AndroidKeyStoreKey hash and equals.
  Keystore 2.0 SPI: Fix contract between equals and hashCode 2
 2021-10-08 15:31:03 +00:00
Anton Hansson
abce6f0784 Rename merged services.txt module 
This makes it follow the same naming pattern as other modules
in this directory, which makes it easier to auto-generate.

Bug: 169103987
Test: m
Change-Id: I1c68a433808c034e83049239a72c9b505546bf20
 2021-10-08 16:14:25 +01:00
Janis Danisevskis
3a2461cca8 Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." am: 2eef723ced 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849773

Change-Id: Ic23558b8a3df74daf589968a2629ecb42e02ba3a
 2021-10-08 15:13:53 +00:00
Ben Miles
a2e7ea5f62 Add empty package + OWNERS file for critical event protos 
Bug: 200263868
Test: Untested
Change-Id: Iea5795098bbe3eee57049a8ede0c0c4e94efa7e2
 2021-10-08 16:10:34 +01:00
Janis Danisevskis
2eef723ced Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." 2021-10-08 14:57:47 +00:00
Ben Miles
297e52a036 Merge "Add empty package for critical event log with OWNERS" am: 53e8b03bae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1843420

Change-Id: Ia77575637ae1dcb000f21d9c6a14d815f87874b4
 2021-10-08 12:27:18 +00:00
Ben Miles
53e8b03bae Merge "Add empty package for critical event log with OWNERS" 2021-10-08 12:13:23 +00:00
Louis Chang
664ec39fd3 Continue the pausing process after automatically entering pip 
Or the activity remained in PAUSING state and prevents the
activity to stop after screen off until stop timeout.

Bug: 202345179
Test: atest PinnedStackTests
Change-Id: Ibb8b3c48d483dcb96207ec2395a87b31d8eb107e
Merged-In: Ibb8b3c48d483dcb96207ec2395a87b31d8eb107e
 2021-10-08 07:48:19 +00:00
Xin Li
c259e66801 [automerger skipped] Merge "Merge Android 12" am: c03b0fa033 -s ours 
am skip reason: Merged-In Iba1443da42161f4a41830081f2e1985b30444cc0 with SHA-1 ee05ff24d8 is already in history

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

Change-Id: I4c150a36e0a922121b6905844e5c400b96d67bc2
 2021-10-08 01:19:56 +00:00
Xin Li
c03b0fa033 Merge "Merge Android 12" 2021-10-07 23:50:15 +00:00
Janis Danisevskis
5fe5f2def0 Test for contract between AndroidKeyStoreKey hash and equals. 
Test: atest KeystoreTests
Bug: 196118021

Merged-In: Ic6e60752faa986debe3d325f54242cffaa03b336
Change-Id: Ic6e60752faa986debe3d325f54242cffaa03b336
 2021-10-07 16:39:39 -07:00
Janis Danisevskis
e36fe6bf46 Keystore 2.0 SPI: Fix contract between equals and hashCode 2 
This fixes the contract between equals and hashCode in
AndroidKeystorePublicKey. The previous fix made only a reference
comparisson between certificate blobs. In this patch java.util.Arrays is
used to compare and compute the hash of the array.

Bug: 196118021
Test: See following CL.
Change-Id: I2b8b7e740fb377de39fd21f763e15cb00024b2fc
 2021-10-07 16:24:46 -07:00
Treehugger Robot
75c39b2515 Merge "Allow readability-identifier-length warnings" am: 8cc0f40cf2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1844656

Change-Id: I947247fecc4195a37d708f74e7efe763d86ab77e
 2021-10-07 17:38:54 +00:00
Treehugger Robot
8cc0f40cf2 Merge "Allow readability-identifier-length warnings" 2021-10-07 17:34:24 +00:00
Ray Essick
a5145aaf30 Merge "Update media's mainline OWNERS" am: 6297dd2771 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1844556

Change-Id: I94482bb3dae50577a301833a722e34995f609d59
 2021-10-07 17:06:19 +00:00
Ray Essick
6297dd2771 Merge "Update media's mainline OWNERS" 2021-10-07 16:46:24 +00:00
Ben Miles
77b236e715 Add empty package for critical event log with OWNERS 
Bug: 200263868
Test: Untested
Change-Id: Ib99594481754f2ebf48dc2adaa139f7d913b944d
 2021-10-07 17:18:46 +01:00
Tyler Gunn
86da26a494 Merge "IMS: Propagate RTT capability of the called party to UI" am: 57704bd7a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/696027

Change-Id: Ia408690d5a0f4969572757d2c4c7ebe7bbe72739
 2021-10-07 15:51:05 +00:00
Tyler Gunn
57704bd7a3 Merge "IMS: Propagate RTT capability of the called party to UI" 2021-10-07 15:35:35 +00:00
Janis Danisevskis
4ff6274fa7 Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry. 
Fix a NullPointerException when trying to insert SecretKey that already
exists.

Bug: 202146009
Test: atest android.keystore.cts.AndroidKeyStoreTest#testKeyStore_SetKeyEntry_ReplacedWithSameGeneratedSecretKey
Change-Id: If3a4bd6677ab3173c5c1a7c921ba567b7981662b
 2021-10-07 08:24:42 -07:00
Treehugger Robot
509a70ea06 Merge "Improve Bundle/PersistableBundle docs" am: 9a2a261abd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1846255

Change-Id: I22cff9303a22273617bce75ddc361f59d4799e9d
 2021-10-07 14:29:04 +00:00
Treehugger Robot
9a2a261abd Merge "Improve Bundle/PersistableBundle docs" 2021-10-07 14:13:40 +00:00
Xin Li
531b8f4f26 Merge Android 12 
Bug: 202323961
Merged-In: Iba1443da42161f4a41830081f2e1985b30444cc0
Change-Id: I2bebe60bb7114706a3ba6af35522268cdf031f41
 2021-10-06 22:53:28 +00:00
Sarah Chin
ee05ff24d8 [automerger skipped] Merge "Update constructors for IRadioData classes" am: fa565ffc48 -s ours 
am skip reason: Merged-In I8480df1164548dde491c6ae6251bbc2725c3eadf with SHA-1 80b8c7f128 is already in history

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

Change-Id: Iba1443da42161f4a41830081f2e1985b30444cc0
 2021-10-06 19:21:11 +00:00
Sarah Chin
fa565ffc48 Merge "Update constructors for IRadioData classes" 2021-10-06 19:03:08 +00:00
Sarah Chin
958f299826 Merge "Update constructors for IRadioData classes" into stage-aosp-master 2021-10-06 16:38:18 +00:00
Bernardo Rufino
40e22dc991 Improve Bundle/PersistableBundle docs 
around equals(), hashCode(), toString()

Test: TH passes
Bug: 122589814
Bug: 62611412
Bug: 122589479
Change-Id: Ia644e437f9b5642228c2a7138b0518f73ef2996c
 2021-10-06 15:25:33 +00:00