Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
2518bcd55c679e193383603de8f60b54c44139dc
frameworks_base/packages
History
Rubin Xu fa91e77abe [DO NOT MERGE] resolve merge conflicts of 157f05eb04 to pi-dev-plus-aosp 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Idc78cfc626716becd634b985d3752ae8c5aadebf
2019-04-03 21:08:03 +00:00
..
BackupRestoreConfirmation
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
2019-02-21 16:02:06 -08:00
CaptivePortalLogin
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"
2019-04-02 20:16:43 -07:00
CarrierDefaultApp
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
2019-02-21 16:02:06 -08:00
CompanionDeviceManager
Convert Android.mk file to Android.bp
2019-02-20 11:16:22 -08:00
CtsShim
Change target SDK to '28'
2019-03-13 16:49:14 -07:00
DefaultContainerService
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
2019-02-21 16:02:06 -08:00
DocumentsUI
…
EasterEgg
P is for PAINT.
2018-06-27 18:58:59 -04:00
ExternalStorageProvider
Merge "To add the Android.bp of ExternalStorageProvider"
2019-03-28 10:55:26 -07:00
ExtServices
Migrate frameworks/base/tests/testables and its users to androidx.test
2019-03-01 17:23:42 +00:00
ExtShared
…
FakeOemFeatures
Convert Android.mk file to Android.bp
2019-02-20 11:16:22 -08:00
FusedLocation
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
2019-02-21 16:02:06 -08:00
InputDevices
Import translations. DO NOT MERGE
2019-02-19 14:05:27 -08:00
Keyguard
…
MtpDocumentsProvider
Import translations. DO NOT MERGE
2019-02-19 14:40:06 -08:00
NetworkPermissionConfig
Rename NetworkStackPermissionStub
2019-04-02 00:14:05 +00:00
NetworkStack
Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library
2019-04-02 17:55:42 +08:00
overlays
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
2019-02-21 16:02:06 -08:00
PrintRecommendationService
…
PrintSpooler
Import translations. DO NOT MERGE
2019-02-19 23:23:09 -08:00
services
Convert Android.mk file to Android.bp
2019-02-20 11:16:22 -08:00
SettingsLib
Import translations. DO NOT MERGE
2019-03-24 09:52:11 -07:00
SettingsProvider
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
2019-02-21 16:02:06 -08:00
SharedStorageBackup
Convert Android.mk file to Android.bp
2019-02-20 11:16:22 -08:00
Shell
Merge changes from topics "nw-scan-cts", "nw-scan-changes"
2019-04-01 13:54:15 -07:00
SimAppDialog
…
StatementService
Convert Android.mk file to Android.bp
2019-02-20 11:16:22 -08:00
SystemUI
[DO NOT MERGE] resolve merge conflicts of 157f05eb04 to pi-dev-plus-aosp
2019-04-03 21:08:03 +00:00
VpnDialogs
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
2019-02-21 16:02:06 -08:00
WallpaperBackup
Convert Android.mk file to Android.bp
2019-02-20 11:16:22 -08:00
WallpaperCropper
Convert Android.mk file to Android.bp
2019-02-20 11:16:22 -08:00
WAPPushManager
Convert Android.mk file to Android.bp
2019-02-20 11:16:22 -08:00