Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
652,283 Commits 3 Branches 0 Tags
034e400da19bcd464441fbe16ca71d40c48d6bca
Commit Graph

652283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
034e400da1 Merge "Add framework-media to sdk" into sc-dev am: 70dedcf388 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14936978

Change-Id: I28cad6af2aec470bf14a11b79e67c5e76566899c
 2021-06-11 15:24:39 +00:00
Anton Hansson
70dedcf388 Merge "Add framework-media to sdk" into sc-dev 2021-06-11 15:11:03 +00:00
TreeHugger Robot
2be116c0f9 Merge "Fix margins around tiles in QSCustomizer" into sc-dev am: 4b12edf91e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14844992

Change-Id: I7e726ef750337669e7e7b6da8f5213947c81ed18
 2021-06-11 14:03:21 +00:00
TreeHugger Robot
4b12edf91e Merge "Fix margins around tiles in QSCustomizer" into sc-dev 2021-06-11 13:47:15 +00:00
Bernardo Rufino
e9abe0092d Merge "Expand toast javadoc to include rate limiting info." into sc-dev am: 0245b5cbce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14916753

Change-Id: I39ef4792d1190b7a4081de2770b6087ab9f9d189
 2021-06-11 12:38:51 +00:00
Bernardo Rufino
0245b5cbce Merge "Expand toast javadoc to include rate limiting info." into sc-dev 2021-06-11 12:28:08 +00:00
Anton Hansson
1ca6fa3b38 Add framework-media to sdk 
This was removed in Iff38291b964de4116bcdefe4fd74136c4878c543 in favor
of using the bootclasspath fragment. However the bootclasspath fragment
for media does not contain the API tracking files, so it back for now
to make sure we can finalize the media API files.

This CL may be revertable in the future if we can get the
java_sdk_library into the bootclasspath_fragment somehow.

Bug: 190807367
Bug: 188427719
Test: m media-module-sdk and inspect the zip for api tracking files
Change-Id: Ia01c32d4c6c6bad734df053da0024a139a808a54
 2021-06-11 13:16:39 +01:00
Jorim Jaggi
13ce2be211 [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours am: ffdad637f3 -s ours am: dd894ae859 -s ours am: 9196f5c84a -s ours am: d8254cd71e -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1692babe5e is already in history

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

Change-Id: I1c512d7323c8756f53d4894054f90ec4d16cf4b0
 2021-06-11 11:33:28 +00:00
TreeHugger Robot
16146da1b6 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours am: aff0172222 -s ours am: 333f5c979b -s ours am: 2e0a01f48f -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1692babe5e is already in history

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

Change-Id: Idb443fd575ea829ca365ca3fed6e7330eca0d068
 2021-06-11 11:33:21 +00:00
Jorim Jaggi
f5d0d61e3f [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours am: ffdad637f3 -s ours am: dd894ae859 -s ours am: 48840f512b -s ours am: 579a6a2fbb -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I70541fb05d2a6f7bc01c6d894ad176d93422e954
 2021-06-11 11:32:58 +00:00
TreeHugger Robot
c3676684f1 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours am: aff0172222 -s ours am: 9271a1731c -s ours am: e4d72e40d6 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: Ic8a414bb8be41bbeb4a9bc94974c7b1923e027b3
 2021-06-11 11:32:39 +00:00
Jorim Jaggi
d8254cd71e [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours am: ffdad637f3 -s ours am: dd894ae859 -s ours am: 9196f5c84a -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1692babe5e is already in history

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

Change-Id: I59d23cf97a4e8e2d0025cda4ce4e1011932f9406
 2021-06-11 11:19:29 +00:00
TreeHugger Robot
2e0a01f48f [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours am: aff0172222 -s ours am: 333f5c979b -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1692babe5e is already in history

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

Change-Id: I1cffaf405c843438da21d6de7356ee26ef557508
 2021-06-11 11:19:18 +00:00
Jorim Jaggi
579a6a2fbb [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours am: ffdad637f3 -s ours am: dd894ae859 -s ours am: 48840f512b -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I6670cd8546b89cf5964be9040c9bd21059912ab8
 2021-06-11 11:15:17 +00:00
TreeHugger Robot
e4d72e40d6 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours am: aff0172222 -s ours am: 9271a1731c -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: Iffcc6c412f7e4e1f5c85eb98e2870bc892e775b5
 2021-06-11 11:14:54 +00:00
Jorim Jaggi
48840f512b [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours am: ffdad637f3 -s ours am: dd894ae859 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I3528472bffe27da1a0844f14d59b1416138db062
 2021-06-11 11:00:33 +00:00
TreeHugger Robot
9271a1731c [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours am: aff0172222 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I50e114eba417ae73e9439f93e31f7a55d79b253f
 2021-06-11 11:00:22 +00:00
Jorim Jaggi
9196f5c84a [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours am: ffdad637f3 -s ours am: dd894ae859 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: If401b293daa18bf577d7476901ddc9e07f8aa310
 2021-06-11 11:00:01 +00:00
TreeHugger Robot
333f5c979b [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours am: aff0172222 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: Ibb0187f711beb849cf41682cd3bed3ac5050696c
 2021-06-11 10:59:52 +00:00
Jorim Jaggi
dd894ae859 [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours am: ffdad637f3 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I47c940c34f0f0859b37cfb26848b758d7e09a3fd
 2021-06-11 10:48:39 +00:00
TreeHugger Robot
aff0172222 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I4094450dc15f3ad37cdecd329f3d5b234224e9c3
 2021-06-11 10:48:25 +00:00
Jorim Jaggi
ffdad637f3 [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: Icbb28d30efd5a6f9fe3a02cb895030d860beaf70
 2021-06-11 10:34:48 +00:00
TreeHugger Robot
c9c9886577 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I3cd073fac31b45437ebcd1a43084f0675e2151eb
 2021-06-11 10:34:30 +00:00
Jorim Jaggi
e8f110352b [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I6c9236eb0273d1e7d07b05f39d768c51d07c0904
 2021-06-11 10:25:20 +00:00
TreeHugger Robot
c3d061d3c6 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours 
am skip reason: skipped by user jjaggi

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

Change-Id: Id3394c9a610df9c2551ccfddad1126862ab9d393
 2021-06-11 10:25:08 +00:00
Jeff DeCew
330f2d4f2c Merge "Fix cropping by allowing layerType to be reset regardless of height." into sc-dev am: 466698f9af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921771

Change-Id: Ieaa27cf774dec7e9294fe06aeb67d5a86572eb75
 2021-06-10 20:58:22 +00:00
Jeff DeCew
466698f9af Merge "Fix cropping by allowing layerType to be reset regardless of height." into sc-dev 2021-06-10 20:41:43 +00:00
Ryan Mitchell
03a41e3520 Merge "Fix RRO handleConfigurationChanged race condition" into sc-dev am: 55128109d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14923667

Change-Id: Iaf6479b9961004bdd2c4390f567459e2c38ad29f
 2021-06-10 19:51:55 +00:00
Matt Casey
c0d1070a2d Merge "Swith long screenshot UI to colorAccentPrimary" into sc-dev am: 29ce722f16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937001

Change-Id: I0c38d94adb685609e4988780b024a59e168d4e0f
 2021-06-10 19:51:40 +00:00
Ryan Mitchell
55128109d9 Merge "Fix RRO handleConfigurationChanged race condition" into sc-dev 2021-06-10 19:49:40 +00:00
Matt Casey
29ce722f16 Merge "Swith long screenshot UI to colorAccentPrimary" into sc-dev 2021-06-10 19:38:13 +00:00
Harry Zhang
83603fb34d Merge "Create platformtestprotos." into sc-dev am: e76529cb29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14824140

Change-Id: I9f113d7ce9610f552d1bc91b662077237a03b29c
 2021-06-10 19:22:53 +00:00
Harry Zhang
e76529cb29 Merge "Create platformtestprotos." into sc-dev 2021-06-10 18:35:51 +00:00
Ahaan Ugale
1eea819631 Merge "Grant HotwordDetectionService RECORD_AUDIO and CAPTURE_AUDIO_HOTWORD." into sc-dev am: 40069e8943 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14427323

Change-Id: I6f718a4e49b5795d11bb1174c4b8ce97c77bc810
 2021-06-10 18:07:32 +00:00
Ahaan Ugale
40069e8943 Merge "Grant HotwordDetectionService RECORD_AUDIO and CAPTURE_AUDIO_HOTWORD." into sc-dev 2021-06-10 17:53:56 +00:00
Jorim Jaggi
208512ae75 [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1d31270fd2 is already in history

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

Change-Id: I434f0068024f61af13d68bd42bdcdcf93be27afb
 2021-06-10 17:50:27 +00:00
Alex Salo
19328a4524 Merge "Adds protection level 'role' to SYSTEM_CAMERA permission" into sc-dev am: 4e46adb808 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14705677

Change-Id: Ia986a46ae0131d16c68f56c0fa2669fe57fb8cf0
 2021-06-10 16:17:13 +00:00
Alex Salo
4e46adb808 Merge "Adds protection level 'role' to SYSTEM_CAMERA permission" into sc-dev 2021-06-10 16:00:43 +00:00
Ryan Mitchell
119a7f5591 Fix RRO handleConfigurationChanged race condition 
Retrieval of the system and system UI themes should be done with the
ResourcesManager lock held to ensure the theme retrieved has the new
overlays applied.

Bug: 189100984
Test: manual
Change-Id: Ibe27ec745ea5a914d3d05e393598a336d96a55e6
 2021-06-10 08:41:17 -07:00
Pavel Grafov
f74b5d16c6 Merge "Don't reset user VPN without reason" into sc-dev am: c0115519f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717702

Change-Id: Ib9708489a707efb6c46d1aabcfdada69b4850e9f
 2021-06-10 15:39:13 +00:00
Daniel Sandler
5596a97dbf [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours am: 51855b1f12 -s ours am: be14ed4870 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: Ibcd863a88013ec0aac0ad31e88360948ab76f97d
 2021-06-10 15:39:05 +00:00
Daniel Sandler
be3c6baaeb [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours am: 6d4c20323b -s ours am: 99c8d90be8 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: I8e3444929bdf05b2dd935fed380be802bd7352ae
 2021-06-10 15:38:47 +00:00
Lucas Dupin
1cd707af56 Merge "Do not post color event, run it directly" into sc-dev am: 7926715151 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14925937

Change-Id: I87a1fcb39e367f38361d0be5438938da8ceecbb6
 2021-06-10 15:38:22 +00:00
Lucas Dupin
8ff7535522 Merge "Apply colors when a non managed user is added" into sc-dev am: 0af4538527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14929555

Change-Id: I2a3f326cf02eba523d7876da82585231ec8caad6
 2021-06-10 15:35:30 +00:00
Soonil Nagarkar
163c3969c4 Merge "Add more logging around extra attribution tags" into sc-dev am: f1f0b2e333 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921910

Change-Id: I31265d1e0d9bc48743a01475207b88db3f3c1181
 2021-06-10 15:33:26 +00:00
Pavel Grafov
2de81fc252 Merge "Don't leak AccessibilityManager binder proxy." into sc-dev am: 1142e5e8cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919141

Change-Id: I5f5336d678367a8f6db3e0dd34828ab8ea22db6f
 2021-06-10 15:32:46 +00:00
Pavel Grafov
c0115519f6 Merge "Don't reset user VPN without reason" into sc-dev 2021-06-10 15:31:04 +00:00
Daniel Sandler
be14ed4870 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours am: 51855b1f12 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I4c514ab3bdfa661d5995084ebab4cf003b945086
 2021-06-10 15:27:37 +00:00
Daniel Sandler
99c8d90be8 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours am: 6d4c20323b -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: I1d51594476b2a30d582c4c0a6ce94a0fa46ff2ac
 2021-06-10 15:27:11 +00:00
Lucas Dupin
7926715151 Merge "Do not post color event, run it directly" into sc-dev 2021-06-10 15:23:55 +00:00