Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pete Bentley
2ed26021b2 Merge commit '0ac895d970e70a1300efb853802f4d2b3443ee22' of persistent-https://googleplex-android.git.corp.google.com/platform/frameworks/base into merge_conflict 
Change-Id: Ia69d97ab86a7a37318fdb2512f4756d6ef438c0e
Merged-In: I306dfc37155caf0c3d9c5db23e1fdc9d5d37399e
 2020-06-18 13:06:40 +01:00
Matt Pietal
68943be01d Controls API - Update template docs 
Add more clarity around which control template to select.

Fixes: 150630500
Test: manual
Change-Id: I215e485e1cf81aae7e2c6c8b469945069136aad8
 2020-06-18 08:03:44 -04:00
TreeHugger Robot
d137df266f Merge "include unit test for enhanced error handling" into rvc-dev am: 42472cb3a0 am: 448ba81313 am: 9817a0df12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844551

Change-Id: Ie766778f3eeaac106bcd7f144cf5f7a0499eb0c5
 2020-06-18 11:49:40 +00:00
TreeHugger Robot
d422be6209 Merge "Callback the surface package after the views are drawn locally" into rvc-dev am: cf5f65cbe3 am: cf50e80097 am: ce4d0339d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11607123

Change-Id: I7f1a8f3aaede8b04554fc6c029b8213db41f4d03
 2020-06-18 11:49:04 +00:00
TreeHugger Robot
9817a0df12 Merge "include unit test for enhanced error handling" into rvc-dev am: 42472cb3a0 am: 448ba81313 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844551

Change-Id: I93b8d28be82e2781f07f7bf7f546b5d6e56cc63d
 2020-06-18 11:36:43 +00:00
TreeHugger Robot
ce4d0339d7 Merge "Callback the surface package after the views are drawn locally" into rvc-dev am: cf5f65cbe3 am: cf50e80097 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11607123

Change-Id: I72c56291b73d611b6674924193438a104dc51b90
 2020-06-18 11:36:12 +00:00
TreeHugger Robot
448ba81313 Merge "include unit test for enhanced error handling" into rvc-dev am: 42472cb3a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844551

Change-Id: I93e0b441034327dedf54d303742d84d8c2d58203
 2020-06-18 11:18:36 +00:00
TreeHugger Robot
cf50e80097 Merge "Callback the surface package after the views are drawn locally" into rvc-dev am: cf5f65cbe3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11607123

Change-Id: Iee502e3c891c4df6ae061eac5ebe6821a00c7c82
 2020-06-18 11:18:08 +00:00
TreeHugger Robot
42472cb3a0 Merge "include unit test for enhanced error handling" into rvc-dev 2020-06-18 11:11:29 +00:00
Aaron Huang
6424968d64 Merge "Address comments from aosp/1298476" am: 777fbbb954 am: eb276cb5b3 am: a12b3d3626 am: b9e62de14f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040

Change-Id: I067965de3d884bfe8f2832e5116daadd5bda1ae5
 2020-06-18 11:06:40 +00:00
TreeHugger Robot
d08ec6ac8d Merge "Remove incorrect optimization in visibility cache" into rvc-dev am: 0f1076a4dc am: 90d7ebd48c am: f85f638ada 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11896405

Change-Id: I34f829f77dcfe955d1ac5bea1849e4ada5dae09b
 2020-06-18 11:06:11 +00:00
Narayan Kamath
a171f7a90e Merge "Fix Deadlock Issue On AppFuseBridge" into rvc-dev am: a27544861b am: 4537a78288 am: 03cbfcdc5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894161

Change-Id: I621d737d0da34e547b617bf5d26540141fdc9207
 2020-06-18 11:05:25 +00:00
Lorenzo Colitti
ac253d354f Merge "Move DnsPacket to libs net" into rvc-dev am: db056d4043 am: 7f7e19eda5 am: a9095c04b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: I15e4f426e47cdc77a1cdccb1501f7e649c9a6bbf
 2020-06-18 11:04:23 +00:00
TreeHugger Robot
cf5f65cbe3 Merge "Callback the surface package after the views are drawn locally" into rvc-dev 2020-06-18 11:03:17 +00:00
Aaron Huang
b9e62de14f Merge "Address comments from aosp/1298476" am: 777fbbb954 am: eb276cb5b3 am: a12b3d3626 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040

Change-Id: I8557b955af2d28122054df5236a38543523909f4
 2020-06-18 10:49:25 +00:00
TreeHugger Robot
f85f638ada Merge "Remove incorrect optimization in visibility cache" into rvc-dev am: 0f1076a4dc am: 90d7ebd48c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11896405

Change-Id: I175842f7d352116ba1da1d4c03a92749abd4b58e
 2020-06-18 10:49:05 +00:00
Narayan Kamath
03cbfcdc5a Merge "Fix Deadlock Issue On AppFuseBridge" into rvc-dev am: a27544861b am: 4537a78288 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894161

Change-Id: I0ddcfcbb3d9ba2284ca483dbc4db7e14c9d0cc10
 2020-06-18 10:48:53 +00:00
Lorenzo Colitti
a9095c04b9 Merge "Move DnsPacket to libs net" into rvc-dev am: db056d4043 am: 7f7e19eda5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: I130496147364f798817d7d12e814749e86f0ab0c
 2020-06-18 10:47:59 +00:00
Aaron Huang
a12b3d3626 Merge "Address comments from aosp/1298476" am: 777fbbb954 am: eb276cb5b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040

Change-Id: I7b119758ac7cd65defdec77692957287af17566d
 2020-06-18 10:47:47 +00:00
TreeHugger Robot
a2d97a148d Merge "Add Null checks to NavigationBarView" into rvc-dev am: ac83472c3c am: 29ebb4f4b6 am: 52da866292 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893821

Change-Id: Ia2e0ca7796b7b6f12178e903d87b3f9313163214
 2020-06-18 10:41:20 +00:00
TreeHugger Robot
90d7ebd48c Merge "Remove incorrect optimization in visibility cache" into rvc-dev am: 0f1076a4dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11896405

Change-Id: I0803e0fb516e33188b178dfb039e4ce6dc176d52
 2020-06-18 10:35:25 +00:00
Narayan Kamath
4537a78288 Merge "Fix Deadlock Issue On AppFuseBridge" into rvc-dev am: a27544861b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894161

Change-Id: I48e7218c159cd1944c5aa77cfcbeda9969ccff0f
 2020-06-18 10:34:57 +00:00
Joanne Chung
d532a9c8b2 Merge "Notify the registered AutofillCallback for inline." into rvc-dev am: f755f9c1a5 am: c22d09bbe3 am: 5f2a9788e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818505

Change-Id: Ia591d1d4e3b6bf1b63b48b0ccf477f4583f69d7b
 2020-06-18 10:34:55 +00:00
Sudheer Shanka
23ef48fa76 Merge "Maintain the fuse buffer pool keyed by inode instead of threadId." into rvc-dev am: b52a288e0c am: 8861ef2cfb am: dafa1db023 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885304

Change-Id: Icdec1ddefe8eb22db006443906e51510da48a2ea
 2020-06-18 10:34:32 +00:00
TreeHugger Robot
0f1076a4dc Merge "Remove incorrect optimization in visibility cache" into rvc-dev 2020-06-18 10:34:19 +00:00
Lorenzo Colitti
7f7e19eda5 Merge "Move DnsPacket to libs net" into rvc-dev am: db056d4043 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: Ia19cb44ad56e4358c63564261d481459d1386542
 2020-06-18 10:34:11 +00:00
Aaron Huang
eb276cb5b3 Merge "Address comments from aosp/1298476" am: 777fbbb954 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040

Change-Id: I3c7c0ef738b6c6b964dc91c593cbf2b6166e3843
 2020-06-18 10:34:10 +00:00
Hyundo Moon
aa80375e10 SystemMediaRoute2Provider: Set callback after instantiation is done 
A NullPointerException can happen if some callback method is called
before the constructor of SystemMediaRoute2Provider ends.
This CL fixes the issue.

Bug: 158838070
Test: Passes CTS and mediaroutertest
Change-Id: Ibad3c54ad3f7921621628b6147c35605652da29b
 2020-06-18 19:22:39 +09:00
TreeHugger Robot
52da866292 Merge "Add Null checks to NavigationBarView" into rvc-dev am: ac83472c3c am: 29ebb4f4b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893821

Change-Id: Ic1f3f0eaec3d24c409eca929d6cc904268c96f32
 2020-06-18 10:22:13 +00:00
Joanne Chung
5f2a9788e6 Merge "Notify the registered AutofillCallback for inline." into rvc-dev am: f755f9c1a5 am: c22d09bbe3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818505

Change-Id: Ib401cdee129399db8fb9be9a5758f77fd90b7f00
 2020-06-18 10:21:59 +00:00
Sudheer Shanka
dafa1db023 Merge "Maintain the fuse buffer pool keyed by inode instead of threadId." into rvc-dev am: b52a288e0c am: 8861ef2cfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885304

Change-Id: I3052e9d50f91c37b10cac558f3b7a7e3397a7ef7
 2020-06-18 10:21:29 +00:00
Aaron Huang
777fbbb954 Merge "Address comments from aosp/1298476" 2020-06-18 10:18:57 +00:00
Narayan Kamath
a27544861b Merge "Fix Deadlock Issue On AppFuseBridge" into rvc-dev 2020-06-18 10:15:55 +00:00
Lorenzo Colitti
db056d4043 Merge "Move DnsPacket to libs net" into rvc-dev 2020-06-18 10:14:47 +00:00
TreeHugger Robot
29ebb4f4b6 Merge "Add Null checks to NavigationBarView" into rvc-dev am: ac83472c3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893821

Change-Id: I6695a257de5cd6fa196779eb56d6bc8954115193
 2020-06-18 10:08:21 +00:00
Joanne Chung
c22d09bbe3 Merge "Notify the registered AutofillCallback for inline." into rvc-dev am: f755f9c1a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818505

Change-Id: I4bc84c5711422547c6823f348f78e7735c771f06
 2020-06-18 10:07:48 +00:00
TreeHugger Robot
ac83472c3c Merge "Add Null checks to NavigationBarView" into rvc-dev 2020-06-18 10:02:53 +00:00
Joanne Chung
f755f9c1a5 Merge "Notify the registered AutofillCallback for inline." into rvc-dev 2020-06-18 10:00:42 +00:00
Sudheer Shanka
8861ef2cfb Merge "Maintain the fuse buffer pool keyed by inode instead of threadId." into rvc-dev am: b52a288e0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885304

Change-Id: I14a9b532835122e41408aeccc4319eb9e7441514
 2020-06-18 10:00:13 +00:00
Sudheer Shanka
b52a288e0c Merge "Maintain the fuse buffer pool keyed by inode instead of threadId." into rvc-dev 2020-06-18 09:46:29 +00:00
TreeHugger Robot
66b928fc7b Merge "Decouple logUIevent from Bubble class" into rvc-dev am: bcbcca7d4f am: 83c67df969 am: 1f72612f40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11849441

Change-Id: I1d57ee42dd3a026f93c76ecd6c714994edb56c46
 2020-06-18 09:41:16 +00:00
Tobias Thierer
3853f7b0e7 Merge "Fix file descriptor ownership." into rvc-dev am: 21ff6de81f am: 88e39e1bdf am: 965c456f98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872627

Change-Id: I8e13a33fc56c513a7b9d94078ed3b1b9f1a488a8
 2020-06-18 09:40:46 +00:00
TreeHugger Robot
1f72612f40 Merge "Decouple logUIevent from Bubble class" into rvc-dev am: bcbcca7d4f am: 83c67df969 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11849441

Change-Id: Ia6df6f04c97d4bfa59a8b4316d3329333db085b5
 2020-06-18 09:20:37 +00:00
Tobias Thierer
965c456f98 Merge "Fix file descriptor ownership." into rvc-dev am: 21ff6de81f am: 88e39e1bdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872627

Change-Id: Ib814d3da85665156cbbc239325cbb3c4a3b5b9c9
 2020-06-18 09:20:02 +00:00
Martijn Coenen
097dd2241d Merge "Increase timeout waiting for ExternalStorageService to bind." into rvc-dev am: c817e215f9 am: d6a65e658e am: 6ed0a15174 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894162

Change-Id: I7e7a6dad8d2c8b80d7b6a547d02409292ea1e9a7
 2020-06-18 09:02:28 +00:00
Wei Sheng Shih
6eae028002 Merge "Force relayout when wallpaper engine become visible." into rvc-dev am: ec30716a6b am: 8b3f702c83 am: 19f6e5e758 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863063

Change-Id: Ib810eda995c38fc990d117a78b874d52fb174f25
 2020-06-18 09:01:53 +00:00
TreeHugger Robot
83c67df969 Merge "Decouple logUIevent from Bubble class" into rvc-dev am: bcbcca7d4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11849441

Change-Id: I6ec6c5b06af07d7af5771022d2a3097d8a4d29e9
 2020-06-18 08:53:35 +00:00
Tobias Thierer
88e39e1bdf Merge "Fix file descriptor ownership." into rvc-dev am: 21ff6de81f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872627

Change-Id: I9b176f2dfa39ab27f4d9061759de69358784e1f1
 2020-06-18 08:53:18 +00:00
Martijn Coenen
6ed0a15174 Merge "Increase timeout waiting for ExternalStorageService to bind." into rvc-dev am: c817e215f9 am: d6a65e658e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894162

Change-Id: I8a0e28a287bf1e5383e34890fb72dc90e3b1885a
 2020-06-18 08:46:00 +00:00
Wei Sheng Shih
19f6e5e758 Merge "Force relayout when wallpaper engine become visible." into rvc-dev am: ec30716a6b am: 8b3f702c83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863063

Change-Id: I28b6ee756fb6d02f723bcf15f9fa4e21985783b0
 2020-06-18 08:45:36 +00:00