Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
488,041 Commits 3 Branches 0 Tags
ee7aaa52b9a736584c636f3e5fda2e4c07140d60
Commit Graph

488041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Hung
ee7aaa52b9 Merge "SoundPool: Fix verbose logging compilation" into rvc-dev am: 7360685765 
Original change: undetermined

Change-Id: Ia6dbb8dbf71292f31ebb95446379ab905a541db5
 2020-06-01 21:35:33 +00:00
Andy Hung
7360685765 Merge "SoundPool: Fix verbose logging compilation" into rvc-dev 2020-06-01 21:04:33 +00:00
Steven Thomas
cf89cad345 Merge "Clarify FRAME_RATE_COMPATIBILITY_* params" into rvc-dev am: 061dec3e8d 
Original change: undetermined

Change-Id: I125d7c28abd8049036c02479ea2a5245689f9caf
 2020-06-01 20:58:32 +00:00
Beverly Tai
070b368446 Merge "Don't announce dnd intercepted notfications" into rvc-dev am: d464849e58 
Original change: undetermined

Change-Id: Ib6aada2f2b0552066c87663aff5fa0cfb359cc8c
 2020-06-01 20:57:48 +00:00
Steven Thomas
061dec3e8d Merge "Clarify FRAME_RATE_COMPATIBILITY_* params" into rvc-dev 2020-06-01 20:44:30 +00:00
Beverly Tai
d464849e58 Merge "Don't announce dnd intercepted notfications" into rvc-dev 2020-06-01 20:42:02 +00:00
Abodunrinwa Toki
b6e6d1a79b Merge "Updates to TCMS icons rewritting." into rvc-dev am: d53625f660 
Original change: undetermined

Change-Id: Ia60622a17204e6b77784e8b8492c5e0d43761178
 2020-06-01 20:27:59 +00:00
TreeHugger Robot
674625e7d1 Merge "Isolate SpriteIcon into its own file." into rvc-dev-plus-aosp 2020-06-01 20:14:03 +00:00
Abodunrinwa Toki
d53625f660 Merge "Updates to TCMS icons rewritting." into rvc-dev 2020-06-01 20:10:17 +00:00
Tej Singh
94390715ac Merge "Retry pullfinish with empty payload if call fails" into rvc-dev am: 273c839a06 
Change-Id: I4b7396428d3e4ad94891a94f328002caab6c5419
 2020-06-01 19:40:19 +00:00
Tej Singh
273c839a06 Merge "Retry pullfinish with empty payload if call fails" into rvc-dev 2020-06-01 19:14:10 +00:00
Song Hu
03265c0f68 Merge "Update the default score for direct share targets." into rvc-dev am: 060eff0716 
Change-Id: Iccf12b32f4e1fcaea803832491677cf775ce3871
 2020-06-01 19:08:56 +00:00
Song Hu
060eff0716 Merge "Update the default score for direct share targets." into rvc-dev 2020-06-01 18:51:49 +00:00
Garfield Tan
19a44bc5bc Isolate SpriteIcon into its own file. 
This is to isolate differences between internal master and AOSP so that
the open source intern can work on a relatively new project.

It also isolates a divergent piece of code into SpriteIcon.cpp.

Bug: None
Test: Pointer icons in ApiDemos still work.
Change-Id: I1bf8f23411ad7170de2497d6fee0f70b015e9b5f
Merged-In: I1bf8f23411ad7170de2497d6fee0f70b015e9b5f
(cherry picked from commit 7e3457e593)
 2020-06-01 18:36:03 +00:00
Song Hu
c65c942376 Merge "Return empty map when queryUsageStatsForUser returns null in UsageStatsQueryHelper#queryAppUsageStats." into rvc-dev am: 005ce7cae6 
Change-Id: Iafadd721f0757c8e3c30a7eb7af8f49f96f26387
 2020-06-01 18:25:26 +00:00
Song Hu
005ce7cae6 Merge "Return empty map when queryUsageStatsForUser returns null in UsageStatsQueryHelper#queryAppUsageStats." into rvc-dev 2020-06-01 18:05:09 +00:00
Michael Plass
5a407967e8 Merge "wifi: jarjar ipmemorystore interfaces" into rvc-dev am: 83e9ba45a4 
Change-Id: Ib2745e76ed41563c1bf41f3129cac9e7fd7b4847
 2020-06-01 17:28:51 +00:00
Matt Pietal
acae3f2bbb Merge "Controls UI - Animated icons" into rvc-dev am: 2fa6c597b3 
Change-Id: I8f6cdf1039f4207e7591036acea6eb505ffc722d
 2020-06-01 17:28:30 +00:00
Lucas Dupin
189fb115a0 Merge "Move media expiration to MediaDataManager" into rvc-dev am: 61ee50f7ae 
Change-Id: Id3081b6deb390efe4ecec7b56b0d4703aea38e9d
 2020-06-01 17:28:06 +00:00
Michael Plass
83e9ba45a4 Merge "wifi: jarjar ipmemorystore interfaces" into rvc-dev 2020-06-01 17:27:26 +00:00
Beverly
9a9787e116 Don't announce dnd intercepted notfications 
When talkback is enabled, don't announce notifications that are being
visually blocked by DND.

Test: manual
Fixes: 126670462
Change-Id: I61e7a99691149dff0c4c2dcb60f0fe68c1db876d
 2020-06-01 13:25:39 -04:00
Matt Pietal
2fa6c597b3 Merge "Controls UI - Animated icons" into rvc-dev 2020-06-01 17:11:36 +00:00
Lucas Dupin
61ee50f7ae Merge "Move media expiration to MediaDataManager" into rvc-dev 2020-06-01 17:11:04 +00:00
Andy Hung
ce8e6daa9a SoundPool: Fix verbose logging compilation 
Make compatible with clang warning / thread safety.

Test: build verbose and logcat
Bug: 157618660
Change-Id: I773f446561b86a0f3a8b5ddc355cfe6adf0d4294
 2020-06-01 09:51:46 -07:00
TreeHugger Robot
8538ad40d2 Merge "Notify that keyguard is dismissed when user is unlocked" into rvc-dev am: 6c85a4aceb 
Change-Id: I5cb644bcce1c667b2c627cdc34f3681bc4548bd3
 2020-06-01 16:46:46 +00:00
TreeHugger Robot
6c85a4aceb Merge "Notify that keyguard is dismissed when user is unlocked" into rvc-dev 2020-06-01 16:41:48 +00:00
Santiago Seifert
1a9fb93fb8 Merge "Align CryptoInfo value and identity equality" into rvc-dev am: 9a2fdad064 
Change-Id: I5761a7c47c4491ecda03cedd928831408d421707
 2020-06-01 16:39:44 +00:00
Santiago Seifert
9a2fdad064 Merge "Align CryptoInfo value and identity equality" into rvc-dev 2020-06-01 16:38:16 +00:00
Mady Mellor
f0c52ab441 Merge "Require shortcut to bubble" into rvc-dev am: 1dbf98fb57 
Change-Id: Ia0999b1f9c862f97dc26b8eb17b8500cd07bd0cb
 2020-06-01 16:32:58 +00:00
Mady Mellor
1dbf98fb57 Merge "Require shortcut to bubble" into rvc-dev 2020-06-01 16:29:53 +00:00
Jeff Sharkey
af811ee0ff Merge "Load video thumbnails using ARGB_8888 for quality." into rvc-dev am: eadf939db8 
Change-Id: I4f6257ad5f109d6b6d58707fe2c3f114972f3b6c
 2020-06-01 16:27:43 +00:00
Jeff Sharkey
eadf939db8 Merge "Load video thumbnails using ARGB_8888 for quality." into rvc-dev 2020-06-01 16:12:00 +00:00
Song Hu
93cefaac1c Update the default score for direct share targets. 
Bug: 151112858
Test: atest CtsSharesheetTestCases:android.sharesheet.cts.CtsSharesheetDeviceTest
Change-Id: I700bebf19bbaf208efaccf97ab77472d43c1b34a
 2020-06-01 09:07:19 -07:00
Alex Buynytskyy
4115191cc4 Merge "Healthcheck: proper job allocation and test." into rvc-dev am: c4ac9d2321 
Change-Id: I9257064a3c0a064f2217adbe8ab5c00f26027896
 2020-06-01 16:04:42 +00:00
Kevin Chyn
9710f8eaab Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc8d 
Change-Id: Ib44ff58a107d0e1e4c58b98f0d15234f1b2ea01c
 2020-06-01 16:04:30 +00:00
Jeff Sharkey
459f2c806b Merge "Revert "Apps shouldn't be disabling StrictMode checks."" into rvc-dev am: c99a508218 
Change-Id: I5d4a4161fa0c9e9ab8bef9a543c357bab4576408
 2020-06-01 16:04:05 +00:00
Alex Buynytskyy
c4ac9d2321 Merge "Healthcheck: proper job allocation and test." into rvc-dev 2020-06-01 16:01:41 +00:00
Kevin Chyn
20534dcc8d Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev 2020-06-01 15:57:00 +00:00
Jeff Sharkey
c99a508218 Merge "Revert "Apps shouldn't be disabling StrictMode checks."" into rvc-dev 2020-06-01 15:55:14 +00:00
Jeff Sharkey
3080fb7c9e Revert "Apps shouldn't be disabling StrictMode checks." 
This reverts commit 14e961870a.

Reason for revert: satayev@
Bug: 156336269

Change-Id: Ic0d3a650156c06f58fce4c28157191f4497469f0
 2020-06-01 15:54:41 +00:00
Ryan Lin
75d943ca32 Merge "Fix Magnification Settings didn't restore via D2D transfer" into rvc-dev am: ca83d45538 
Change-Id: I228db2d49cce8dd6cfad03e31d8e0dcc706fed34
 2020-06-01 15:25:03 +00:00
Ryan Lin
ca83d45538 Merge "Fix Magnification Settings didn't restore via D2D transfer" into rvc-dev 2020-06-01 15:15:15 +00:00
Miranda Kephart
977ffdc52a Merge "Fix screenshot UI for insets" into rvc-dev am: f39155c305 
Change-Id: I8ff4369b3476dce0339d1bff1c412c817875b059
 2020-06-01 14:53:21 +00:00
Miranda Kephart
f39155c305 Merge "Fix screenshot UI for insets" into rvc-dev 2020-06-01 14:42:06 +00:00
TreeHugger Robot
9aeeead479 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: bcd3c75866 -s ours 
am skip reason: subject contains skip directive

Change-Id: Icae2aa75651c0ceeb635b672ee6bf8ee41b0611e
 2020-06-01 14:39:39 +00:00
TreeHugger Robot
0d15f3f00d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 2a59edbefd -s ours 
am skip reason: subject contains skip directive

Change-Id: I7b31f6202659d2561406d41191f011243ab45111
 2020-06-01 14:39:22 +00:00
TreeHugger Robot
e50fa21fab [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b5e2901ec0 -s ours 
am skip reason: subject contains skip directive

Change-Id: I3d945b04002d085fd5944ea33f5e7dea2f06fee8
 2020-06-01 14:39:04 +00:00
TreeHugger Robot
82aeb8fd06 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af9a747e33 -s ours 
am skip reason: subject contains skip directive

Change-Id: If08cdf61d80588ed53544210ee6832ed40d0deea
 2020-06-01 14:38:41 +00:00
Jeff Sharkey
e42cbb8704 Merge "Support getStorageVolume() for synthetic volumes." into rvc-dev am: fd71805e1c 
Change-Id: I5f6675f1514ed308014e833d28e1b3a3cbe8c93a
 2020-06-01 14:38:01 +00:00
Jeff Sharkey
f05d514436 Merge "Apps shouldn't be disabling StrictMode checks." into rvc-dev am: 4d96602de0 
Change-Id: Iaf92a5949c9196d5d4194322e360d114325a4eea
 2020-06-01 14:37:23 +00:00