Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
497,995 Commits 3 Branches 0 Tags
bc44e67e2c240c8b56e653efc504be700304992b
Commit Graph

497995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
bc44e67e2c Merge "Merge "Enable ChooserTarget ranking of the same app." into rvc-dev am: efa0eab058 am: 992b9d17a8" into rvc-d1-dev-plus-aosp 2020-05-06 00:36:51 +00:00
Automerger Merge Worker
56b276d77a Merge "Merge "audioservice: add missing permission checks" into rvc-dev am: 9744b6124e am: fa4555ad84" into rvc-d1-dev-plus-aosp 2020-05-06 00:36:46 +00:00
Song Hu
c177ef4757 Merge "Enable ChooserTarget ranking of the same app." into rvc-dev am: efa0eab058 am: 992b9d17a8 
Change-Id: Ide6ff9511ad5f8f41b615a48afb71906a2e150a6
 2020-05-06 00:36:45 +00:00
Automerger Merge Worker
661a6e41b3 Merge "Merge "Migrate Tap exclusion logic to TaskEmbedder." into rvc-dev am: 73cc6b8f47 am: 2ad5d8bbdd" into rvc-d1-dev-plus-aosp 2020-05-06 00:36:41 +00:00
Eric Laurent
f3dca9bbe5 Merge "audioservice: add missing permission checks" into rvc-dev am: 9744b6124e am: fa4555ad84 
Change-Id: I12f0c8b0b2a9efaf3af7763c4a408729477b33cb
 2020-05-06 00:36:39 +00:00
Automerger Merge Worker
0601915f14 Merge "Merge "Enable ChooserTarget ranking of the same app." into rvc-dev am: efa0eab058 am: a384d1eb7a" into rvc-d1-dev-plus-aosp 2020-05-06 00:36:35 +00:00
Yuncheol Heo
e0bdb950de Merge "Migrate Tap exclusion logic to TaskEmbedder." into rvc-dev am: 73cc6b8f47 am: 2ad5d8bbdd 
Change-Id: I00dd70cce7e57fb29c1ab5e77b65253d0d938ce0
 2020-05-06 00:36:33 +00:00
Automerger Merge Worker
e16ea3ca74 Merge "Merge "Don't throw exception for inflation after removal" into rvc-dev am: ae72005349 am: da610db0e0" into rvc-d1-dev-plus-aosp 2020-05-06 00:36:29 +00:00
Song Hu
3349d20780 Merge "Enable ChooserTarget ranking of the same app." into rvc-dev am: efa0eab058 am: a384d1eb7a 
Change-Id: Icacb2da601682b2257184be2910da10737e7bad2
 2020-05-06 00:36:27 +00:00
Kevin Han
74560efbcb Merge "Don't throw exception for inflation after removal" into rvc-dev am: ae72005349 am: da610db0e0 
Change-Id: Ie4e9adad2242de75ccb12824ca4ac4aa8785d870
 2020-05-06 00:36:23 +00:00
Yuncheol Heo
c06fbe8e9e Merge "Migrate Tap exclusion logic to TaskEmbedder." into rvc-dev am: 73cc6b8f47 am: 9eeb721848 
Change-Id: I9706a0b87083b953f353d82b570656966748b9d7
 2020-05-06 00:36:17 +00:00
Kevin Han
2c2e3604a4 Merge "Don't throw exception for inflation after removal" into rvc-dev am: ae72005349 am: c2e9ce1215 
Change-Id: Ib3887e3e1aa1f9640158416b039af6c7305e6eb0
 2020-05-06 00:36:05 +00:00
Automerger Merge Worker
2bd5def305 Merge "Merge "Actually inject TargetSdkResolver" into rvc-dev am: 85c3e4d6d2 am: 603d1bddab" into rvc-d1-dev-plus-aosp 2020-05-06 00:36:00 +00:00
Kevin Han
2be9c140ca Merge "Actually inject TargetSdkResolver" into rvc-dev am: 85c3e4d6d2 am: 603d1bddab 
Change-Id: I9d4fd711115f2b4fe6037da3b663e18ed21d107f
 2020-05-06 00:35:50 +00:00
Kevin Han
5485d2a038 Merge "Actually inject TargetSdkResolver" into rvc-dev am: 85c3e4d6d2 am: cb78ade307 
Change-Id: Id37bfb33dafa5af39ae2cbb7c87a5cddeb63c2a5
 2020-05-06 00:35:42 +00:00
Eric Laurent
fa4555ad84 Merge "audioservice: add missing permission checks" into rvc-dev am: 9744b6124e 
Change-Id: Ie713f3fb48735adbc22602ac13abb80bbf69a378
 2020-05-06 00:24:59 +00:00
Song Hu
992b9d17a8 Merge "Enable ChooserTarget ranking of the same app." into rvc-dev am: efa0eab058 
Change-Id: I192b0fe351b6a4009e90870d11962e12f61dfb49
 2020-05-06 00:24:46 +00:00
Yuncheol Heo
2ad5d8bbdd Merge "Migrate Tap exclusion logic to TaskEmbedder." into rvc-dev am: 73cc6b8f47 
Change-Id: I0d9a01dee67115ef7be5a3348f4f099c8a0feaa3
 2020-05-06 00:24:34 +00:00
Song Hu
a384d1eb7a Merge "Enable ChooserTarget ranking of the same app." into rvc-dev am: efa0eab058 
Change-Id: Ifea26e696f650de34317e4ccf95258cff72027f2
 2020-05-06 00:24:23 +00:00
Kevin Han
da610db0e0 Merge "Don't throw exception for inflation after removal" into rvc-dev am: ae72005349 
Change-Id: I97b42c726a5bac839461026e50b07b9586a2b3cb
 2020-05-06 00:24:11 +00:00
Yuncheol Heo
9eeb721848 Merge "Migrate Tap exclusion logic to TaskEmbedder." into rvc-dev am: 73cc6b8f47 
Change-Id: I07306c9b498a99b232c1eec972e1c485fd47e41b
 2020-05-06 00:23:58 +00:00
Kevin Han
c2e9ce1215 Merge "Don't throw exception for inflation after removal" into rvc-dev am: ae72005349 
Change-Id: I552f6ab862580d4796d611df615c0b97b915d816
 2020-05-06 00:23:44 +00:00
Kevin Han
603d1bddab Merge "Actually inject TargetSdkResolver" into rvc-dev am: 85c3e4d6d2 
Change-Id: Ia40b39627c4ec800ca65bd60758536a1e7068c43
 2020-05-06 00:23:14 +00:00
Kevin Han
cb78ade307 Merge "Actually inject TargetSdkResolver" into rvc-dev am: 85c3e4d6d2 
Change-Id: I01d6ee698e8c94ab947e10d5d3690b3c61c88b57
 2020-05-06 00:23:09 +00:00
Eric Laurent
9744b6124e Merge "audioservice: add missing permission checks" into rvc-dev 2020-05-06 00:22:53 +00:00
Song Hu
efa0eab058 Merge "Enable ChooserTarget ranking of the same app." into rvc-dev 2020-05-06 00:02:06 +00:00
Yuncheol Heo
73cc6b8f47 Merge "Migrate Tap exclusion logic to TaskEmbedder." into rvc-dev 2020-05-06 00:00:53 +00:00
Kevin Han
ae72005349 Merge "Don't throw exception for inflation after removal" into rvc-dev 2020-05-05 23:58:24 +00:00
Kevin Han
85c3e4d6d2 Merge "Actually inject TargetSdkResolver" into rvc-dev 2020-05-05 23:57:37 +00:00
Automerger Merge Worker
aeba9557f4 Merge "Merge "Update some ContentResolver docs." into rvc-dev am: 2806da306b am: 86f3ab91d7" into rvc-d1-dev-plus-aosp 2020-05-05 23:49:22 +00:00
Varun Shah
d4c2f40e63 Merge "Update some ContentResolver docs." into rvc-dev am: 2806da306b am: 86f3ab91d7 
Change-Id: Id2261ba6571205e0212d95d81f041da7c78d688d
 2020-05-05 23:49:12 +00:00
Varun Shah
e3afc5a2a7 Merge "Update some ContentResolver docs." into rvc-dev am: 2806da306b am: 7affd8ffe6 
Change-Id: I7fd3115375311498c4bd54b59665e5e23d9caffb
 2020-05-05 23:49:08 +00:00
Varun Shah
86f3ab91d7 Merge "Update some ContentResolver docs." into rvc-dev am: 2806da306b 
Change-Id: I933c08df6d35292cfc28b167148b24e3ceecee2d
 2020-05-05 23:32:26 +00:00
Varun Shah
7affd8ffe6 Merge "Update some ContentResolver docs." into rvc-dev am: 2806da306b 
Change-Id: I017a5fa50896853f6119924fbe44b08eb2375237
 2020-05-05 23:32:10 +00:00
Varun Shah
2806da306b Merge "Update some ContentResolver docs." into rvc-dev 2020-05-05 23:18:55 +00:00
Yuncheol Heo
9c536b61a0 Merge "Revert "Notify the visibility change to update color views without control."" into rvc-dev am: d1cfb337cf am: 800390aebb 
Change-Id: Ib444911f9ba7d86ec6845ec6e83c78834e3b8997
 2020-05-05 23:09:10 +00:00
Julia Reynolds
7a0289afbe Merge "Manage/History buttons should be multiuser aware" into rvc-dev am: 32c36ff2a5 am: ab1fa0c15f 
Change-Id: Ie8d9d8cf377dcd21302a153d210cf9cffa039734
 2020-05-05 23:09:00 +00:00
TreeHugger Robot
7b3a6f3653 Merge "DO NOT MERGE Don't crash if already unregistered" into rvc-dev am: a9f4e2d2d7 am: cee20d0e47 
Change-Id: I83e6fa02991277081b843e7183d83befb7a11778
 2020-05-05 23:08:46 +00:00
Soonil Nagarkar
43e691d921 DO NOT MERGE Don't crash if already unregistered am: 07c129cb1a am: 002f775293 
Change-Id: I4f1ffa867705c4d3052c665e3e18135db0a457af
 2020-05-05 23:08:41 +00:00
Yuncheol Heo
fd59d085d6 Merge "Revert "Notify the visibility change to update color views without control."" into rvc-dev am: d1cfb337cf am: 493b5e0048 
Change-Id: I692289658bcf883192d6aee36c9d3cfb6008110f
 2020-05-05 23:08:14 +00:00
Julia Reynolds
653834e436 Merge "Manage/History buttons should be multiuser aware" into rvc-dev am: 32c36ff2a5 am: c5593e8fee 
Change-Id: I6be2b5e2fe429c55fdfda549d588e558f150d4e6
 2020-05-05 23:08:08 +00:00
Automerger Merge Worker
b6f71a6f43 Merge changes from topic "am-a7446a6e34814019bac9941d457e9acb" into rvc-d1-dev-plus-aosp 
* changes:
  Merge "DO NOT MERGE Add location shell commands to R" into rvc-dev am: c720603034 am: 25ea50d840
  DO NOT MERGE Add location shell commands to R am: bfe15a139d am: fa11abf943
 2020-05-05 23:07:55 +00:00
TreeHugger Robot
3c2690f473 Merge "DO NOT MERGE Don't crash if already unregistered" into rvc-dev am: a9f4e2d2d7 am: 76f2460ed7 
Change-Id: Ie0aa012d798d5d1df148b4009bae416db0b42caf
 2020-05-05 23:07:48 +00:00
Soonil Nagarkar
ae12abfde0 DO NOT MERGE Don't crash if already unregistered am: 07c129cb1a am: b39151b9f4 
Change-Id: I652d05d4e8a3bba3b32ce9b59c68f06d7b886428
 2020-05-05 23:07:45 +00:00
TreeHugger Robot
cf8f63cae3 Merge "DO NOT MERGE Add location shell commands to R" into rvc-dev am: c720603034 am: 25ea50d840 
Change-Id: I99d059f7252908e3c4ea3b281ec06248b4e605b6
 2020-05-05 23:07:43 +00:00
Soonil Nagarkar
0768b622eb DO NOT MERGE Add location shell commands to R am: bfe15a139d am: fa11abf943 
Change-Id: Iee70d562ba824f237f64047578c1980c9c73c0e5
 2020-05-05 23:07:33 +00:00
TreeHugger Robot
0b200796e4 Merge "DO NOT MERGE Add location shell commands to R" into rvc-dev am: c720603034 am: 225cf37d30 
Change-Id: Ib5fbaa3f956be5fbfd840e35141bf90916b5464a
 2020-05-05 23:07:24 +00:00
Soonil Nagarkar
55d6e0a27a DO NOT MERGE Add location shell commands to R am: bfe15a139d am: 0143bd6e7f 
Change-Id: I326dba460cacc46d2aab7ec86423433c98a0290c
 2020-05-05 23:07:20 +00:00
Bryan Ferris
4ae55caeaa [automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d39 am: e18fd339be am: b1ae5fd443 -s ours am: 2adaef294b -s ours am: e5f0ec9b2a am: 306b8b4192 -s ours am: 6b1b2f4e51 am: 253bd94bd4 
Change-Id: Idc29d9fa39e20844e22a44c0864bb68dcebe108f
 2020-05-05 23:07:02 +00:00
lumark
9fb151a92a [automerger skipped] [RESTRICT AUTOMERGE] Restrict app transition maximum duration am: 36bcc77337 am: dcc38988ee am: 748bcb047c -s ours am: a6ccecb6a7 -s ours am: 41ccd543be am: ae9fd54262 -s ours am: 715254a18c am: bb4b449fe8 
Change-Id: Id465386c8d71498cc67f884c403d3f39b8ae0c0b
 2020-05-05 23:06:52 +00:00