Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
7cd99c47bb0cc2aa9c6c242f33c1752b60d09839
frameworks_base/core/java/android
History
Jakub Pawlowski 7cd99c47bb resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I6cbbb7e2c680996bdd7b7f1d84bc14011451c7a5
2021-01-31 00:40:24 +01:00
..
accessibilityservice
Merge "Make me an owner of accessibility frameworks" am: f79a0fd564 am: b8ec02815b
2021-01-19 22:43:42 +00:00
accounts
Merge "Protect account chooser activities against overlay." into qt-dev am: 7f2257fa0f am: 683623e8b0 am: be186dc33e am: 88e38a7d1c am: 37ff5c9d04
2021-01-07 00:18:59 +00:00
animation
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
annotation
Add enforcement parameter to RequiresFeature
2021-01-26 12:20:32 -08:00
app
Merge "add ownership" am: c63817d8f0 am: b327283c1d
2021-01-29 23:22:13 +00:00
apphibernation
Introduce global package hibernation
2021-01-28 15:32:23 -08:00
appwidget
Update AppWidget owners
2021-01-21 21:56:08 +00:00
attention
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
bluetooth
resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp
2021-01-31 00:40:24 +01:00
companion
…
content
Merge "Add owners" am: 033aefcb06 am: 8098a5fa5d
2021-01-28 18:33:04 +00:00
database
Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
2020-12-02 00:38:58 -08:00
ddm
…
debug
…
gesture
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
graphics/fonts
Add OWNERS for font manager related module
2021-01-22 10:07:27 -08:00
hardware
DO NOT MERGE "Allow DeviceConfig to change display settings for high zone" am: 58515946ac
2021-01-19 04:02:10 +00:00
inputmethodservice
Merge changes from topic "dec5" am: c2793cf12b am: 9af6ac78b0
2020-12-08 16:43:19 +00:00
metrics
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
net
Merge "Allow system components to request underlying network policies."
2021-01-29 18:58:00 +00:00
nfc
Merge "Added setAlwaysOn feature"
2021-01-20 19:13:43 +00:00
os
Merge "WatchDog: support dumping AIDL HALs" am: 4c0600b406 am: ac37ade768
2021-01-29 23:53:23 +00:00
permission
Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c
2020-12-08 16:01:16 +00:00
permissionpresenterservice
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
preference
…
print
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
printservice
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
privacy
…
provider
Merge "Add an API for LPA (SIM Manager) to bring up pages related to managing SIM profiles." am: 795478a020 am: 5c0c899770
2021-01-21 01:59:27 +00:00
se
Merge "Add intent to notify applications when the secure element state changed"
2021-01-22 02:58:28 +00:00
security
ECDH SPI interface
2021-01-27 10:54:47 +01:00
service
Merge "Create the ResumeOnRebootService."
2021-01-25 23:08:17 +00:00
speech
Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
2020-12-02 00:38:58 -08:00
telephony
[Telephony] PhoneStateListener redesign for new event
2021-01-14 16:58:33 +08:00
text
Remove usage of hidden NetworkUtils from Formatter
2021-01-18 17:01:56 +09:00
timezone
Modify / add OWNERS files related to time / tz
2020-12-14 11:32:44 +00:00
transition
Improve OWNERS coverage across frameworks/base/.
2020-12-08 08:36:27 -07:00
util
Merge "Add 'Android Resources' team as OWNERS of classes in android.util"
2021-01-27 13:18:49 +00:00
uwb
Add UWB APIs to SystemApi
2021-01-21 09:41:39 -08:00
view
Merge "Add missing textservice OWNERS files." am: 0f4112a760 am: 49023f3cd8
2021-01-21 01:00:21 +00:00
webkit
…
widget
Merge "AbsSeekBar: Fix growRect computation" am: e1f0416a17 am: 48b3ec73d9
2021-01-19 22:44:04 +00:00
window
Merge changes from topic "dec5" am: c2793cf12b
2020-12-08 16:05:11 +00:00
package.html
…