Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
656,116 Commits 3 Branches 0 Tags
1af321ae5b6e74526f1998b35dc617feb2ccf0f2
Commit Graph

656116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Janis Danisevskis
1af321ae5b Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." am: 2eef723ced am: 3a2461cca8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849773

Change-Id: I1eed49289e7ee696d5509bccfe54ed3dad21f461
 2021-10-08 15:14:51 +00: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
Janis Danisevskis
2eef723ced Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." 2021-10-08 14:57:47 +00:00
Ben Miles
88ab377c71 Merge "Add empty package for critical event log with OWNERS" am: 53e8b03bae am: 297e52a036 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1843420

Change-Id: I94ab829d74294d9e1e33c00b44e9ccb5b3c597c6
 2021-10-08 12:44:25 +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
Xin Li
d8cfdda3a9 [automerger skipped] Merge "Merge Android 12" am: c03b0fa033 -s ours am: c259e66801 -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: Ie051fa26cd626cb4d9a5a9e54ca3e42a340dc024
 2021-10-08 01:39:21 +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
Treehugger Robot
be3d5337e6 Merge "Allow readability-identifier-length warnings" am: 8cc0f40cf2 am: 75c39b2515 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1844656

Change-Id: Ie46eff6343f68dfbc68f172bd8a86a2527a5cd20
 2021-10-07 17:45:38 +00: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
f2bef0817d Merge "Update media's mainline OWNERS" am: 6297dd2771 am: a5145aaf30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1844556

Change-Id: I93e5fa2cbb3a781f03b42d904147cac067ece138
 2021-10-07 17:21:09 +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
Collin Fijalkovich
28647a85bc [automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 am: 157dea0ce9 -s ours am: 99338cc865 -s ours 
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60bea7 is already in history

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

Change-Id: I5869eaf77de43453b58fa0705fcd792a8f33da4b
 2021-10-07 16:44:59 +00:00
Collin Fijalkovich
aede81ce6c [automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 -s ours am: 893ce3e09c -s ours am: 80a149a827 -s ours 
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60bea7 is already in history

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

Change-Id: Ie8967d27597fa4d4bf727064786b2b40c3859f7e
 2021-10-07 16:44:37 +00:00
Collin Fijalkovich
99338cc865 [automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 am: 157dea0ce9 -s ours 
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60bea7 is already in history

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

Change-Id: I87fa81662b5ae027fa6e93c77687148238046fd0
 2021-10-07 16:24:12 +00:00
Collin Fijalkovich
80a149a827 [automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 -s ours am: 893ce3e09c -s ours 
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60bea7 is already in history

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

Change-Id: I7eb9f97e1d814a7bad4bba8f626c46991fe63c27
 2021-10-07 16:23:10 +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
Collin Fijalkovich
157dea0ce9 Disallow overlays for ResolverActivity am: 978809e428 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960136

Change-Id: I9471eb991a13b20969cdca2e704e1d13bba7643f
 2021-10-07 16:09:18 +00:00
Collin Fijalkovich
893ce3e09c [automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 -s ours 
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60bea7 is already in history

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

Change-Id: I86cc973ba4b3c05e826ba55af139b9beaef3fb01
 2021-10-07 16:08:32 +00:00
Collin Fijalkovich
fdca2ddbbe [automerger skipped] Disallow overlays for ResolverActivity am: 718c60bea7 -s ours am: 4f30365204 -s ours 
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 34534e1fd2 is already in history

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

Change-Id: Ie652ea462e776351940dc757398b6f7e1e69a98e
 2021-10-07 16:08:29 +00:00
Tyler Gunn
bbdfc69dee Merge "IMS: Propagate RTT capability of the called party to UI" am: 57704bd7a3 am: 86da26a494 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/696027

Change-Id: I389a90e671bea7920f20e97ca4335cfc6e938fea
 2021-10-07 16:05:50 +00:00
Collin Fijalkovich
4f30365204 [automerger skipped] Disallow overlays for ResolverActivity am: 718c60bea7 -s ours 
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 34534e1fd2 is already in history

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

Change-Id: I9264b4babd72f7bf4606f04c7760c6294d800147
 2021-10-07 15:55:46 +00: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
ab6e8374b5 Merge "Improve Bundle/PersistableBundle docs" am: 9a2a261abd am: 509a70ea06 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1846255

Change-Id: I76949a83786bebd0cb6d8d10e22648533cf21c49
 2021-10-07 14:44:31 +00: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
Collin Fijalkovich
978809e428 Disallow overlays for ResolverActivity 
Prevents non-system apps from placing a window over the app selection
screen.

Bug: 143559931
Test: Installed test app and attempted to overlay
Change-Id: Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674
Merged-In: Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674
(cherry picked from commit 34534e1fd2)
 2021-10-07 14:24:33 +00:00
Collin Fijalkovich
718c60bea7 Disallow overlays for ResolverActivity 
Prevents non-system apps from placing a window over the app selection
screen.

Bug: 143559931
Test: Installed test app and attempted to overlay
Change-Id: Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674
Merged-In: Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674
(cherry picked from commit 34534e1fd2)
 2021-10-07 14:24:07 +00:00
Treehugger Robot
9a2a261abd Merge "Improve Bundle/PersistableBundle docs" 2021-10-07 14:13:40 +00:00
TreeHugger Robot
ae829d25d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3651700d32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I53e7f6c4a20b68396aa277e47bed73094e18e8ea
 2021-10-07 08:56:01 +00:00
TreeHugger Robot
3651700d32 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-07 08:42:07 +00:00
TreeHugger Robot
60763f6650 Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fafe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I74541f7e7c1ce3ecdafdeb805bb35277d3220c32
 2021-10-07 04:08:32 +00:00
Josh Tsuji
ba860f3f98 [DO NOT MERGE] Fix DozeScreenBrightnessTest. am: 20d85a91d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I674c6d8ccbce26a406bbe0a8e669de6c2174cd3b
 2021-10-07 04:08:08 +00:00
TreeHugger Robot
82fe00fafe Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev 2021-10-07 03:56:02 +00:00
Bill Yi
705739f428 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib9a15b025d63f846245bba128958ff38eabf0463
 2021-10-07 01:43:47 +00:00
Xin Li
531b8f4f26 Merge Android 12 
Bug: 202323961
Merged-In: Iba1443da42161f4a41830081f2e1985b30444cc0
Change-Id: I2bebe60bb7114706a3ba6af35522268cdf031f41
 2021-10-06 22:53:28 +00:00
TreeHugger Robot
0cd4b1c9f8 [automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: b8f14a7db5 -s ours am: 3df34b9f6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08e4920a28b94ab47e08ba619a9c35d11518d4b4
 2021-10-06 21:22:49 +00:00
Janis Danisevskis
8542a4c9ad [automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: b7c5457ce8 -s ours am: 908d3fae61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73283231f78ee3c53a14b12a8563673874e1583b
 2021-10-06 21:22:39 +00:00
TreeHugger Robot
ba311d620c [automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: a68d603483 -s ours am: 80dc50df37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4150b87507d7dfdfcaec394a300e252ea0e2f907
 2021-10-06 21:22:29 +00:00
Janis Danisevskis
584ac26b3b [automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: 9c6bc472e1 -s ours am: 65cf394942 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b0e7bc59094f9465905c035cdd7f84f431f33c0
 2021-10-06 21:22:10 +00:00
TreeHugger Robot
3df34b9f6a [automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: b8f14a7db5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15882b5679ea2b5bbdd319b2f61cb97b9321a6cf
 2021-10-06 21:08:55 +00:00
Janis Danisevskis
908d3fae61 [automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: b7c5457ce8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibafe7a8f3c80ff808de2cf0f564003b3db99d174
 2021-10-06 21:08:46 +00:00
TreeHugger Robot
80dc50df37 [automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: a68d603483 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe9799152f258ff19a103abc2311b72a8b6f3552
 2021-10-06 21:08:34 +00:00
Janis Danisevskis
65cf394942 [automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: 9c6bc472e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78a3aa4927d3116b35816f4d94347c2519f90128
 2021-10-06 21:08:12 +00:00
TreeHugger Robot
a68d603483 Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956

Change-Id: I107df5d3381fed5ffb729ee814ad3e1172abb1db
 2021-10-06 20:54:22 +00:00
TreeHugger Robot
b8f14a7db5 Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956

Change-Id: Ifd4c6e1bcdd0e5c100786bf21c0868a309db75b1
 2021-10-06 20:54:18 +00:00