Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
726,620 Commits 3 Branches 0 Tags
0e816076d970fa46cd970eab424d8fb6d56bfa11
Commit Graph

726620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Issei Suzuki
0e816076d9 [automerger skipped] Merge "Keep FLAG_SHOW_WALLPAPER flag on NotificationShade." into sc-v2-dev am: e7831937e7 am: 02c4c404bc -s ours 
am skip reason: Merged-In I7876c92331125b00931218d9e5aca164a1ea50d9 with SHA-1 0b55f18928 is already in history

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

Change-Id: I568f5a31b2d908b8403641633cb4665ea1aecdd5
 2021-10-19 10:41:03 +00:00
Issei Suzuki
02c4c404bc Merge "Keep FLAG_SHOW_WALLPAPER flag on NotificationShade." into sc-v2-dev am: e7831937e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16075530

Change-Id: I8a25f5fd2d2c3e9c0c47f0e6b6eac6c789dbed15
 2021-10-19 10:37:24 +00:00
Jordan Demeulenaere
e73d9fb0bf Merge "Ensure that ghosted view is attached when calculating its matrix." into sc-v2-dev am: ad71aa409d am: fce72425a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16048150

Change-Id: I06fbb1e051cb7330c09df7c5de1646d2a5f89a75
 2021-10-19 10:36:36 +00:00
Nataniel Borges
e639772f75 Merge "Fix parsing of WM trace in critical mode" 2021-10-19 10:01:46 +00:00
TreeHugger Robot
798887a42f Merge "AudioMixingRule: more javadoc on mix role" 2021-10-19 09:55:42 +00:00
Issei Suzuki
e7831937e7 Merge "Keep FLAG_SHOW_WALLPAPER flag on NotificationShade." into sc-v2-dev 2021-10-19 09:53:57 +00:00
Jordan Demeulenaere
fce72425a0 Merge "Ensure that ghosted view is attached when calculating its matrix." into sc-v2-dev am: ad71aa409d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16048150

Change-Id: I99d25820c9d95c59dff5b4a8c7c0b02b2486f42d
 2021-10-19 09:44:28 +00:00
TreeHugger Robot
3145f6bb10 Merge "Revert "Merge BroadcastOptions and ActivityOptions PendingIntent..."" 2021-10-19 09:40:52 +00:00
Jordan Demeulenaere
ad71aa409d Merge "Ensure that ghosted view is attached when calculating its matrix." into sc-v2-dev 2021-10-19 08:57:21 +00:00
Jakub Pawlowski
93ef99202a Merge "settingslib/media: Add LeAudio support" am: 10d9b01f61 am: 8588ef52ac am: f02e22d3cc am: 5032d10a70 am: 3fb7312ce9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857733

Change-Id: Ib333661a43f76e43c55cb1fa2a6f8ffafa446ce6
 2021-10-19 06:32:08 +00:00
Jakub Pawlowski
3fb7312ce9 Merge "settingslib/media: Add LeAudio support" am: 10d9b01f61 am: 8588ef52ac am: f02e22d3cc am: 5032d10a70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857733

Change-Id: If7ea1ceb4a50238cd81dde926824c37bf90ad4b3
 2021-10-19 06:19:31 +00:00
TreeHugger Robot
9dcb0345f6 Merge "Compute surface position of scaled child window" 2021-10-19 06:18:43 +00:00
Jakub Pawlowski
5032d10a70 Merge "settingslib/media: Add LeAudio support" am: 10d9b01f61 am: 8588ef52ac am: f02e22d3cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857733

Change-Id: Ibd74cf16c6f5271b3a24ad6201318272a62c5678
 2021-10-19 06:02:10 +00:00
Tony Huang
169716d3e4 Merge "Make new task follow source task root" into sc-v2-dev am: 8172fc3e42 am: e34a978e4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16055327

Change-Id: I9a269cea7bd6e67188b20a10cfa021f658f02953
 2021-10-19 06:01:42 +00:00
Jakub Pawlowski
f02e22d3cc Merge "settingslib/media: Add LeAudio support" am: 10d9b01f61 am: 8588ef52ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857733

Change-Id: I39404a12c1d5ed36aaa358bc3f411bfdaf333af8
 2021-10-19 05:50:55 +00:00
Tony Huang
e34a978e4e Merge "Make new task follow source task root" into sc-v2-dev am: 8172fc3e42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16055327

Change-Id: I9f025025d2718ddb42d650120d0e2d1cc39e3993
 2021-10-19 05:50:48 +00:00
Tony Huang
8172fc3e42 Merge "Make new task follow source task root" into sc-v2-dev 2021-10-19 05:34:11 +00:00
Jakub Pawlowski
8588ef52ac Merge "settingslib/media: Add LeAudio support" am: 10d9b01f61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857733

Change-Id: I6474cd5595774e8f5413f7c86d946f241b1a2d51
 2021-10-19 05:32:44 +00:00
Jakub Pawlowski
10d9b01f61 Merge "settingslib/media: Add LeAudio support" 2021-10-19 05:19:37 +00:00
Arc Wang
f63482774b Merge "Improve scalability of Settings deep link API" into sc-v2-dev am: 3fc42998a8 am: 61183ca835 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15979687

Change-Id: Iaccfa6e4d6aa31a6f0a3f9a1efb0508adeca8f4b
 2021-10-19 04:28:19 +00:00
Arc Wang
61183ca835 Merge "Improve scalability of Settings deep link API" into sc-v2-dev am: 3fc42998a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15979687

Change-Id: I7c4def218a8e4edc147d1f6baa8c16faee58beeb
 2021-10-19 04:12:00 +00:00
Arc Wang
3fc42998a8 Merge "Improve scalability of Settings deep link API" into sc-v2-dev 2021-10-19 03:56:27 +00:00
JW Wang
2ea1d2d121 Merge "Implement two-phase rollback (4/n)" 2021-10-19 03:29:59 +00:00
Kensuke Miyagi
b0bc55cd83 Merge "Consider sharee's priority in resource granting/reclaiming" 2021-10-19 03:23:45 +00:00
TreeHugger Robot
80bb8b6a6e Merge "Fix incorrect pos / id for privacy dot" into sc-v2-dev am: 7c4437e7b0 am: 2eb7628857 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15950888

Change-Id: I3cac821b2767740b7dd02c09467d38608394f6a7
 2021-10-19 03:04:28 +00:00
TreeHugger Robot
2eb7628857 Merge "Fix incorrect pos / id for privacy dot" into sc-v2-dev am: 7c4437e7b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15950888

Change-Id: I0ce4a449239b6d8446ef18cf84436785cf11da25
 2021-10-19 02:52:45 +00:00
Songchun Fan
b626af3980 Merge changes I1a0f0298,I46e61eac 
* changes:
  [pm] helper class to handle preferred activity
  [pm] another installation helper
 2021-10-19 02:44:20 +00:00
TreeHugger Robot
7c4437e7b0 Merge "Fix incorrect pos / id for privacy dot" into sc-v2-dev 2021-10-19 02:33:41 +00:00
Jackal Guo
4adac9edc8 Merge "Apply visibility to #getSuspendedPackageLauncherExtras" 2021-10-19 01:58:48 +00:00
Chloris Kuo
2bd65682d8 Merge "Notification text change should not be interruptive during post time" into sc-v2-dev am: 36a15a906c am: 28967d42e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16076774

Change-Id: I1544f874b27509dd63327f5c14ad8c88724b3e53
 2021-10-19 01:43:38 +00:00
Jerry Chang
eac907396f [automerger skipped] Merge "Revert "Revert "Provide IconProvider in sysui dagger""" into sc-v2-dev am: 299b926bcf -s ours am: 06738f856e -s ours 
am skip reason: Merged-In If4ab0590f4b850103411b6a2dccf2092bb06d563 with SHA-1 43047d3bee is already in history

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

Change-Id: I89e97cb3ba5ceba280887e6a5381461938e4e7fd
 2021-10-19 01:43:02 +00:00
TreeHugger Robot
8cba177627 Merge "Fix daveys when latch_unsignaled is used" 2021-10-19 01:34:17 +00:00
Chloris Kuo
28967d42e7 Merge "Notification text change should not be interruptive during post time" into sc-v2-dev am: 36a15a906c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16076774

Change-Id: I23e725cb556cd6869de23fbce0eadc0db477c5df
 2021-10-19 01:30:09 +00:00
Jerry Chang
06738f856e [automerger skipped] Merge "Revert "Revert "Provide IconProvider in sysui dagger""" into sc-v2-dev am: 299b926bcf -s ours 
am skip reason: Merged-In If4ab0590f4b850103411b6a2dccf2092bb06d563 with SHA-1 43047d3bee is already in history

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

Change-Id: Iba88703d8e951b8181d7988d8eab32bb30afe123
 2021-10-19 01:29:23 +00:00
Chloris Kuo
36a15a906c Merge "Notification text change should not be interruptive during post time" into sc-v2-dev 2021-10-19 01:16:13 +00:00
TreeHugger Robot
10a8bc2e52 Merge "Add TEST_MAPPING for InputMethodStressTest." 2021-10-19 01:16:12 +00:00
Jerry Chang
299b926bcf Merge "Revert "Revert "Provide IconProvider in sysui dagger""" into sc-v2-dev 2021-10-19 01:05:00 +00:00
Jean-Michel Trivi
ca7bf64c94 AudioMixingRule: more javadoc on mix role 
Bug: 194163617
Test: make doc-comment-check-docs
Change-Id: I562b06e1698264c3abfe11076f4e125284c79f54
 2021-10-18 17:56:50 -07:00
Jordan Liu
556251df8c Merge "Do not strip trailing F's of test ICCID" am: 78a8259df5 am: 60a553a4e6 am: 1701e21425 am: 347582a227 am: 7ee17eb840 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852927

Change-Id: I1183bb8187eba4295cc43f9286ca5d4399d2be9d
 2021-10-19 00:53:33 +00:00
Jordan Liu
7ee17eb840 Merge "Do not strip trailing F's of test ICCID" am: 78a8259df5 am: 60a553a4e6 am: 1701e21425 am: 347582a227 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852927

Change-Id: Ied8153cb602a95895ee99dfc83a1be192260d725
 2021-10-19 00:40:48 +00:00
Jordan Liu
347582a227 Merge "Do not strip trailing F's of test ICCID" am: 78a8259df5 am: 60a553a4e6 am: 1701e21425 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852927

Change-Id: I720920f0df0df7c55386a172409ffe3d0f4f40e3
 2021-10-19 00:23:47 +00:00
Kensuke Miyagi
f88074f371 Consider sharee's priority in resource granting/reclaiming 
Also, add null check to avoid NPE upon resource reclaiming

Bug: 203099909
Test: android.media.tv.tuner.cts.TunerTest
Change-Id: I2c92f7d81b5a739d153637b83c664bbfbe633715
 2021-10-19 00:23:25 +00:00
Jordan Liu
1701e21425 Merge "Do not strip trailing F's of test ICCID" am: 78a8259df5 am: 60a553a4e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852927

Change-Id: I1b4386e0f6963998553fd3579732d2521f16bf35
 2021-10-19 00:06:01 +00:00
Jordan Liu
60a553a4e6 Merge "Do not strip trailing F's of test ICCID" am: 78a8259df5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852927

Change-Id: I95ee3bacd503b1ab0cfe48b82fbe057d25aac96c
 2021-10-18 23:48:16 +00:00
Treehugger Robot
5b76efc971 Merge "Add a method to get rawContact" am: b20dc98bfa am: 6f0afa50dc am: 6afd547bb4 am: 978624c29f am: 98284edde4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849459

Change-Id: I846a404eb3a2dc24beb2a186d65d31f4b8c39d45
 2021-10-18 23:37:22 +00:00
Jordan Liu
78a8259df5 Merge "Do not strip trailing F's of test ICCID" 2021-10-18 23:33:54 +00:00
John Reck
c8024fc783 Fix daveys when latch_unsignaled is used 
Fixes: 202297616
Test: manual
Change-Id: Ibd2edd9a6dbe7f66d990a276fcfb6cec8445086d
 2021-10-18 19:30:45 -04:00
Chloris Kuo
c2d00c9c2e Merge "Notification text change should not be interruptive during post time" 2021-10-18 23:28:50 +00:00
Treehugger Robot
98284edde4 Merge "Add a method to get rawContact" am: b20dc98bfa am: 6f0afa50dc am: 6afd547bb4 am: 978624c29f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849459

Change-Id: Id8f7d122924d64375bef37966e4acc4999f141f0
 2021-10-18 23:20:29 +00:00
Treehugger Robot
978624c29f Merge "Add a method to get rawContact" am: b20dc98bfa am: 6f0afa50dc am: 6afd547bb4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1849459

Change-Id: Idfd07a3369920ea2955031b7b4d8f7e522b25795
 2021-10-18 23:05:12 +00:00