Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
825,736 Commits 3 Branches 0 Tags
fb650289802d360ca8091a074cbcf5ec3ffb75fc
Commit Graph

825736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Murray
fb65028980 Merge "RemoteViews: fix BitmapCache after immutable Bitmap switch" into tm-dev am: 5c7bab4ccb am: aa1d52a989 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570391

Change-Id: Ifdfeb81a0b408d33b456325862f2c91c7a5c3179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 23:53:43 +00:00
Tim Murray
aa1d52a989 Merge "RemoteViews: fix BitmapCache after immutable Bitmap switch" into tm-dev am: 5c7bab4ccb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570391

Change-Id: I902b8b068c843e7e516135d8ba2a47ad91ade34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 23:35:35 +00:00
Tim Murray
5c7bab4ccb Merge "RemoteViews: fix BitmapCache after immutable Bitmap switch" into tm-dev 2022-08-17 23:14:46 +00:00
Jean-Michel Trivi
f20f2779db Merge "AudioService: properties for configuring ring/notif steps/default vol" into tm-qpr-dev am: fc1f09ff31 am: ac030295ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19606525

Change-Id: I087210725d905e36ef710b4395e0c5afe12c08c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 20:11:18 +00:00
Jean-Michel Trivi
ac030295ba Merge "AudioService: properties for configuring ring/notif steps/default vol" into tm-qpr-dev am: fc1f09ff31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19606525

Change-Id: I208da962f61bd766a7dd43fdd0688506d30b8b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:52:02 +00:00
Mady Mellor
2a1fdce412 Merge "Add a method in IDreamManager to check if dreaming OR in dream preview" into tm-qpr-dev am: 3448c2fe1c am: dfe71854c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19603443

Change-Id: I225c0ae9494b996f13631b0c8723da735ea64637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:46:56 +00:00
Jean-Michel Trivi
fc1f09ff31 Merge "AudioService: properties for configuring ring/notif steps/default vol" into tm-qpr-dev 2022-08-17 19:37:45 +00:00
Mady Mellor
dfe71854c4 Merge "Add a method in IDreamManager to check if dreaming OR in dream preview" into tm-qpr-dev am: 3448c2fe1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19603443

Change-Id: I003dde1065c5d16c44bd63d7693b593d157fe47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:25:56 +00:00
Mady Mellor
3448c2fe1c Merge "Add a method in IDreamManager to check if dreaming OR in dream preview" into tm-qpr-dev 2022-08-17 18:51:28 +00:00
Joe Bolinger
64fce1104d Merge "Revert "Copy startup & callback mechanism from fingerprint to face service."" 2022-08-17 18:29:32 +00:00
András Kurucz
5f8a3113f6 Merge "Resolve target SDK from Notification extras" into tm-qpr-dev am: a53fd2a5cd am: a580f8137c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641195

Change-Id: Iae2aea8e0ce0ab544eb80518ab628a4ea12fe693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:23:04 +00:00
Yuri Lin
b84665e845 Merge "Write to Zen Log for recording callers & when checking on repeat callers" into tm-qpr-dev am: 403a135645 am: e18b857c29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19633079

Change-Id: I5d2b573f77384936a55d332d83454f6239a9fa5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:22:03 +00:00
Joe Bolinger
8f5bb9d31c Revert "Copy startup & callback mechanism from fingerprint to face service." 
This reverts commit 294f4a1e79.

Reason for revert: b/242845336 (a few cts tests seem to pass on device locally but fail on cf postsubmit)

Change-Id: Icf36d403f96fc7a24d5191e7f43f43354a32b54f
 2022-08-17 18:16:40 +00:00
András Kurucz
a580f8137c Merge "Resolve target SDK from Notification extras" into tm-qpr-dev am: a53fd2a5cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641195

Change-Id: I568a834a35540bb8d35c5a03d3e5dcb5f152ddf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:55:45 +00:00
Yuri Lin
e18b857c29 Merge "Write to Zen Log for recording callers & when checking on repeat callers" into tm-qpr-dev am: 403a135645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19633079

Change-Id: Ib396b5b35a0722a273b8e30b53c07b6f90098610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:54:41 +00:00
András Kurucz
a53fd2a5cd Merge "Resolve target SDK from Notification extras" into tm-qpr-dev 2022-08-17 17:45:08 +00:00
TreeHugger Robot
ceaaf3f4f6 Merge "Add missing lock." into tm-qpr-dev am: 1db328df8a am: c83d275401 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19631981

Change-Id: Ic2864b8df663b8e2372e4c8ef755598cf3567c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:38:37 +00:00
Yuri Lin
403a135645 Merge "Write to Zen Log for recording callers & when checking on repeat callers" into tm-qpr-dev 2022-08-17 17:29:45 +00:00
TreeHugger Robot
c83d275401 Merge "Add missing lock." into tm-qpr-dev am: 1db328df8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19631981

Change-Id: I8897c836d8fad7981c6c35fb84dd0a55ae4df12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:11:59 +00:00
Jeff Nainaparampil
bda6edb414 Merge "Fix unbounded number of uncached shortcuts" into tm-qpr-dev am: 0082587393 am: 57cc8e039d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19571392

Change-Id: I624e5a3d7047a5e9206f1c18b9cbac1212253271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:03:26 +00:00
Riddle Hsu
ba7b3e60f1 Fix build failure by method signature change am: d8ebffe476 am: 01189009b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19632592

Change-Id: I2d867f06fbb6f1c3abef27d680299526aaa42261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:00:22 +00:00
Riddle Hsu
da018adead Merge "Do not set mAnimatingExit on invisible window" into tm-qpr-dev am: 5dd3c9d4c1 am: 33ff9fb4c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19604236

Change-Id: I408a22edafaea630cd08c4c396bedef7ba699d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:54:31 +00:00
Rambo Wang
ad1cf5500f Merge "Expose metered APN types carrier config keys" 2022-08-17 16:50:41 +00:00
Chandru S
acc7ed5aff Merge "Avoid IPCs to check for checking enrollment status of face and fp." into tm-qpr-dev am: 90095be831 am: 8f817cc262 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19581389

Change-Id: Ia7263dd0402d2ec43766c772d6661cec3e9b3838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:47:16 +00:00
TreeHugger Robot
1db328df8a Merge "Add missing lock." into tm-qpr-dev 2022-08-17 16:42:27 +00:00
Fiona Campbell
457a7c5031 Merge "Prevent race condition by foregroundAppPackageName" into tm-qpr-dev am: 4a20c7361a am: 7ee93d37c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19638255

Change-Id: I1b5667c970c5bd2c419e71c42f256f47b8584945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:39:24 +00:00
Hani Kazmi
d350936eba [automerger skipped] Merge "Add logging for activity starts to be blocked as part of go/activity-security" into tm-qpr-dev am: 6f8ed2256e am: 7655195df2 -s ours 
am skip reason: Merged-In I5228cd9afbc1567bb5e3d245fa7f2701bf2a78d3 with SHA-1 8df42f50dd is already in history

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

Change-Id: I1195dd915c1a4f7a30ddf62f4a50c13e9900943d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:33:47 +00:00
Treehugger Robot
ea6ed02f75 [automerger skipped] Merge "usb: Don't show the notification when no USB device is connected" am: e648d3cb91 am: 40f45bddd3 am: 3161749b06 am: 12699672b5 am: eb55c4e567 -s ours 
am skip reason: Merged-In Ie4c67c639d8633361e5a3675502283cae4e35bd9 with SHA-1 eae5eacdd6 is already in history

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

Change-Id: Ieaf834c9455c04a81b9d87a9f1f2a58bfc516a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:31:32 +00:00
Automerger Merge Worker
9a4f396566 Merge "[automerger skipped] Merge "Do not create starting window if there is no task." into tm-dev am: 33e3f60e06 am: 1748ccf3de -s ours" into tm-d1-dev-plus-aosp am: 536e72f5fb -s ours am: f278de2b75 -s ours 
am skip reason: Merged-In Iea264cd8b605443c695165c1136d56b86ffd4eb1 with SHA-1 f590915600 is already in history

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

Change-Id: I8cd1e65beada22d391ebde0e67ee7d0b02bd50a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:30:53 +00:00
Wei Sheng Shih
9e0333177c [automerger skipped] Merge "Do not create starting window if there is no task." into tm-dev am: 33e3f60e06 am: 1748ccf3de -s ours am: 33778e7224 -s ours am: 1037ecdb59 -s ours 
am skip reason: Merged-In Iea264cd8b605443c695165c1136d56b86ffd4eb1 with SHA-1 ea100e579e is already in history

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

Change-Id: I821ae1936c73c0100f260de98da3e5da2f4f930b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:30:13 +00:00
Wei Sheng Shih
2d10651a2a [automerger skipped] Merge "Do not create starting window if there is no task." into tm-dev am: 33e3f60e06 -s ours am: d12824391e -s ours am: a11f5e88dd -s ours am: 5294c3e4bb -s ours 
am skip reason: Merged-In Iea264cd8b605443c695165c1136d56b86ffd4eb1 with SHA-1 ea100e579e is already in history

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

Change-Id: I1cb18dc2bb85c5feabb0a3489cc6aa27048e2b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:29:38 +00:00
wilsonshih
f3e531685c [automerger skipped] Do not create starting window if there is no task. am: f590915600 -s ours am: 83a5c90c67 -s ours am: 5405d8d2c8 -s ours am: a669698ea1 -s ours 
am skip reason: Merged-In Iea264cd8b605443c695165c1136d56b86ffd4eb1 with SHA-1 ea100e579e is already in history

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

Change-Id: I2666b5de26b110e3f792387ca87c33c2e6823d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:29:17 +00:00
Wei Sheng Shih
1c54caf91d [automerger skipped] Merge "Do not create starting window if there is no task." into tm-dev am: 33e3f60e06 -s ours am: d12824391e -s ours am: 10c2f36424 -s ours am: 45edde0ccf -s ours 
am skip reason: Merged-In Iea264cd8b605443c695165c1136d56b86ffd4eb1 with SHA-1 ea100e579e is already in history

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

Change-Id: Ibd51cee06330a3ff7b71c9ff3099bcbf42c4418a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:28:45 +00:00
wilsonshih
274de41c50 [automerger skipped] Do not create starting window if there is no task. am: f590915600 -s ours am: 83a5c90c67 -s ours am: f93ce104f9 -s ours am: 2876104fcb -s ours 
am skip reason: Merged-In Iea264cd8b605443c695165c1136d56b86ffd4eb1 with SHA-1 ea100e579e is already in history

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

Change-Id: I35632959d7dae95cdb071fdabf7c88a5a3e7f96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:28:12 +00:00
Automerger Merge Worker
a6a9b179e9 Merge "Merge "Make ResolverActivity default allow being launched on remote display" into tm-qpr-dev am: 9e7bf1bcc3 am: 7d05aa6cf9" 2022-08-17 16:28:06 +00:00
Jeremy Meyer
9a8dbf26be Merge "Store string frros in a string pool and copy that pool to the idmap" 2022-08-17 16:27:48 +00:00
Iris Yang
28f7299c9c Merge "Make ResolverActivity default allow being launched on remote display" into tm-qpr-dev am: 9e7bf1bcc3 am: 7d05aa6cf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19600071

Change-Id: Ice71068ded3501234a7799911e6e4476244e4a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:27:16 +00:00
Louis Chang
33979d57b1 Merge "Adding comments and removes unnecessary parameter" into tm-qpr-dev am: 36f670f63f am: 3f73e57d6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19647134

Change-Id: I62168f9719be19e4f5539290c12e976f96443ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:26:13 +00:00
Yunfan Chen
1dd39efa12 Merge "Fix display size calculations in large screen (2/3)" into tm-qpr-dev am: 13255a0a50 am: a71995dd93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19565191

Change-Id: Ib43d81e5563f22f1399f28bed5dad5dae6e04f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:25:10 +00:00
Mateusz Cicheński
7c51d5e11f Merge "Always invoke show on the dismiss target for pip." into tm-qpr-dev am: b8c7133078 am: ca26ac9161 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19638851

Change-Id: I2c8e453ad96926298e494a5ccf09ab3128edb2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:23:39 +00:00
Jason Hsu
82de430206 [automerger skipped] Merge "Add getTitle() for ButtonPreference" into tm-qpr-dev am: f568c59b88 am: 40274bf8bf -s ours 
am skip reason: Merged-In Ie2f24879bce026e5bc3d7fedfcb3a6475ab7d404 with SHA-1 fa6acf364f is already in history

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

Change-Id: Id9d6e7c8f87733ccc8c6de31a26fa3a1263309b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:06:51 +00:00
Automerger Merge Worker
c68eb7041f [automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 647c3191c9 -s ours am: e36fb6e5f5 -s ours am: 81cdd5c929 -s ours am: aa8a18b4d3 -s ours 
am skip reason: Merged-In I2d525d59c24df63429ef090e41e45952506c1c59 with SHA-1 718fd088eb is already in history

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

Change-Id: I1fa3776be53cb1734ddc197bc4a8e116408ea1af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:02:33 +00:00
Xin Li
c33c02ee22 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 258ded61cd -s ours am: 6a89e38418 -s ours am: 3940a8d10b -s ours am: 32b0f2e157 -s ours am: 527ce1a318 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51fb822a847aae8d9b979f270df8906f787f9af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:01:15 +00:00
Jeff Nainaparampil
57cc8e039d Merge "Fix unbounded number of uncached shortcuts" into tm-qpr-dev am: 0082587393 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19571392

Change-Id: I7a7886dc4e30fb821bccff416bdaa96fba21856c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 15:59:34 +00:00
Tyler Gunn
7516cf76e4 Merge "Update API docs for TelephonyManager#registerTelephonyCallback." am: c4cfeaf45f am: 5f8a8ad5ff am: 7b7155e281 am: 6ba37fe3b4 am: 28ac11efe2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152934

Change-Id: Id27f83271e533bfa9d19e5b9921bf00e088e1666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 15:50:33 +00:00
Automerger Merge Worker
7a9619cd78 Merge changes from topic "am-78846876a9074356b4ffd487d7925656" into tm-qpr-dev-plus-aosp am: 4ba5ab35e5 -s ours 
am skip reason: Merged-In I2d525d59c24df63429ef090e41e45952506c1c59 with SHA-1 718fd088eb is already in history

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

Change-Id: I69b118882cfb46c58d514b74b6c1813aa26ae24d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 15:45:15 +00:00
Xin Li
f29f31851f [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 258ded61cd -s ours am: 2fbdfb26dd -s ours am: 4c67ab98dd -s ours am: 1b3a1e230a -s ours am: 78be9317e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84e5217503e2a247dfb714a966eb79906035dfb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 15:44:17 +00:00
Jeff Nainaparampil
0082587393 Merge "Fix unbounded number of uncached shortcuts" into tm-qpr-dev 2022-08-17 15:41:48 +00:00
Chaohui Wang
a9a5146653 Merge "Rename SpaLib Codelab to SpaLib Gallery" 2022-08-17 15:39:48 +00:00
Jeff Nainaparampil
59b2f1743d Fix unbounded number of uncached shortcuts 
There is a consistency issue in which some cached conversations in
People Service do not get cleaned up because they are missing a event
timestamp. For those cases, we use the creation timestamp to order by
recency and still clean up those conversations.

This change will enforce that at most `MAX_CACHED_RECENT_SHORTCUTS` are
cached by People Service for uncustomized conversations as expected.

Test: Manually with app that creates cached shortcuts and unit tests
Bug: 233926836
Change-Id: Ia017917ea56f2e233fdb837e574a8bd7c0d69e3b
 2022-08-17 15:04:51 +00:00