Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
574,749 Commits 3 Branches 0 Tags
c34b5738f13da8a8fbf0628cb70c98fcd5928c86
Commit Graph

574749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mohammad Samiul Islam
c34b5738f1 Remove duplicate logic from ModuleTestUtils 
Bug: 160296318
Test: atest StagedInstallInternalTest
Change-Id: Ia31fc9d5246203da1869cc6d0e6ffcfc8d794080
 2020-08-05 11:23:54 +01:00
TreeHugger Robot
22e36b1ac0 [automerger skipped] Merge "Remove "Blacklist" nomenclature from USB services classes." into rvc-dev-plus-aosp am: 2764ffc44d am: 0fa6dd8470 am: d2034fcad1 -s ours 
am skip reason: Change-Id I4b3affce57ba61ad9697e91f2a5f63556ee1cd62 with SHA-1 028ffa470b is in history

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

Change-Id: Ib53482db3bc5392132ed5824b8a7a600151079cb
 2020-08-04 16:56:13 +00:00
TreeHugger Robot
d2034fcad1 Merge "Remove "Blacklist" nomenclature from USB services classes." into rvc-dev-plus-aosp am: 2764ffc44d am: 0fa6dd8470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296481

Change-Id: Ife07d9608311ef5b8864e40d4441d9259aed06d8
 2020-08-04 16:39:20 +00:00
TreeHugger Robot
0fa6dd8470 Merge "Remove "Blacklist" nomenclature from USB services classes." into rvc-dev-plus-aosp am: 2764ffc44d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296481

Change-Id: I54bd912d55e02d4c1affba9cdd3d6bc91d6583f5
 2020-08-04 16:16:01 +00:00
Jin Seok Park
679825e9ea Merge "[Media ML] Remove hidden API usage in SystemServer" 2020-08-04 16:04:13 +00:00
TreeHugger Robot
2764ffc44d Merge "Remove "Blacklist" nomenclature from USB services classes." into rvc-dev-plus-aosp 2020-08-04 16:03:21 +00:00
TreeHugger Robot
10f5c2273e [automerger skipped] Merge "Update Visualizer implementation after changes in AudioEffect" into rvc-dev-plus-aosp am: 3de6e81eb7 am: 72479c775f am: 602c3fa036 -s ours 
am skip reason: Change-Id I90ac6e4fe0a1229758a98a63a3b7810de60469be with SHA-1 12223f0edc is in history

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

Change-Id: Ic5bbfdaf878e882051b1339516528eda77aa4d09
 2020-08-04 15:57:01 +00:00
Jonathan Nieder
379015cff0 Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am: 0b778939c7 am: 3f1247e91b am: 7d95615a4d am: 5f1edaf743 am: 3371e64939 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/177320

Change-Id: Iefaae30f9fc6ba781058e7592fd4f893f22bdc2e
 2020-08-04 15:56:39 +00:00
Josh Tsuji
f1a3ed26c5 Merge "Remember the stack position, including across configuration changes." into rvc-qpr-dev am: 9020ed08e1 am: 2325a9361e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12254380

Change-Id: If8dd12720681c9d095d534aaee8392fc0a4986ec
 2020-08-04 15:55:53 +00:00
TreeHugger Robot
602c3fa036 Merge "Update Visualizer implementation after changes in AudioEffect" into rvc-dev-plus-aosp am: 3de6e81eb7 am: 72479c775f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12298175

Change-Id: I899d7cbf820eb9db87246b01cdcf3d4260e69b16
 2020-08-04 15:47:41 +00:00
Jonathan Nieder
3371e64939 Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am: 0b778939c7 am: 3f1247e91b am: 7d95615a4d am: 5f1edaf743 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/177320

Change-Id: I0f37cccc928a99de4ccad9e36210997662f2b2e5
 2020-08-04 15:47:11 +00:00
Josh Tsuji
2325a9361e Merge "Remember the stack position, including across configuration changes." into rvc-qpr-dev am: 9020ed08e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12254380

Change-Id: I904330889de1da23b2d44c0a948b51e6d454fd76
 2020-08-04 15:37:37 +00:00
TreeHugger Robot
72479c775f Merge "Update Visualizer implementation after changes in AudioEffect" into rvc-dev-plus-aosp am: 3de6e81eb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12298175

Change-Id: Ide91fb1a65b56e1f2260fdeb03cd62389fcded66
 2020-08-04 15:27:47 +00:00
Jonathan Nieder
5f1edaf743 Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am: 0b778939c7 am: 3f1247e91b am: 7d95615a4d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/177320

Change-Id: I1426f2320901cd1c98ecd288d97f9e9e267d66c1
 2020-08-04 15:27:11 +00:00
Josh Tsuji
9020ed08e1 Merge "Remember the stack position, including across configuration changes." into rvc-qpr-dev 2020-08-04 15:17:30 +00:00
Josh Tsuji
4734fb5e1b Merge "Remember the stack position, including across configuration changes." 2020-08-04 15:16:35 +00:00
TreeHugger Robot
3de6e81eb7 Merge "Update Visualizer implementation after changes in AudioEffect" into rvc-dev-plus-aosp 2020-08-04 15:14:18 +00:00
Jonathan Nieder
7d95615a4d Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am: 0b778939c7 am: 3f1247e91b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/177320

Change-Id: Ifb7370b8438fd2932b98a031b43af4f48e4869f4
 2020-08-04 15:06:45 +00:00
Orion Hodson
80f27538de Merge changes from topic "art-owners-update" am: 6066f5dae1 am: 74ad7baf85 am: 11f0a179d7 am: 03c7f1ce80 am: 7c7fe31e82 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382418

Change-Id: I876d9444a009a5a769995e8792fd802555e4be86
 2020-08-04 15:06:31 +00:00
Fabian Kozynski
469dbafb76 Merge "Add EBS interface to BatteryController" 2020-08-04 15:05:36 +00:00
Jonathan Nieder
3f1247e91b Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am: 0b778939c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/177320

Change-Id: I97d5b55d592acdb541334af19110c8830d707b51
 2020-08-04 14:55:35 +00:00
Orion Hodson
7c7fe31e82 Merge changes from topic "art-owners-update" am: 6066f5dae1 am: 74ad7baf85 am: 11f0a179d7 am: 03c7f1ce80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382418

Change-Id: I0fbcc677227da24b476bbdac32bcfbb70c5c9329
 2020-08-04 14:54:23 +00:00
Jonathan Nieder
0b778939c7 Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" 2020-08-04 14:35:43 +00:00
Orion Hodson
03c7f1ce80 Merge changes from topic "art-owners-update" am: 6066f5dae1 am: 74ad7baf85 am: 11f0a179d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382418

Change-Id: I8835c22e35b1f0bb34067cd52fa0c3e62a245f65
 2020-08-04 14:30:14 +00:00
Orion Hodson
11f0a179d7 Merge changes from topic "art-owners-update" am: 6066f5dae1 am: 74ad7baf85 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382418

Change-Id: Id5cf529e4f525ee3f4e7779ae155c54741a389c3
 2020-08-04 14:02:49 +00:00
Orion Hodson
74ad7baf85 Merge changes from topic "art-owners-update" am: 6066f5dae1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382418

Change-Id: I0107c8e3e035e08fa0241dd4e6e69d409f7a1d74
 2020-08-04 13:41:13 +00:00
Orion Hodson
6066f5dae1 Merge changes from topic "art-owners-update" 
* changes:
  Update startop OWNERS file
  Update art-team members in pm OWNERS file
 2020-08-04 13:17:58 +00:00
Mohammad Samiul Islam
9547241ba1 Merge "Put finalized child staged session at correct place in dumpsys" 2020-08-04 09:50:56 +00:00
Marvin Ramin
b4e4013707 Merge "Make AudioManager device volume behavior APIs SystemApi" 2020-08-04 09:33:31 +00:00
Alan Stokes
f673da25a0 Merge "Don't include inaccessible data dirs in library paths." into rvc-qpr-dev am: 56dc3f4122 am: 7532bf45af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12248782

Change-Id: I6bbc621102ca993fb140abab2a3ba960cedd1d8c
 2020-08-04 08:47:59 +00:00
Alan Stokes
7532bf45af Merge "Don't include inaccessible data dirs in library paths." into rvc-qpr-dev am: 56dc3f4122 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12248782

Change-Id: Ifa14d8729ce4b0a34fd8cf3657c19e405fa0a5be
 2020-08-04 08:21:34 +00:00
Orion Hodson
432dd133d1 Update startop OWNERS file 
Test: build/make/tools/checkowners.py -c -v frameworks/base/startop/OWNERS
Change-Id: I5ed92452adea4d349843b5eb7ec199117c6a2a59
 2020-08-04 08:02:04 +00:00
Alan Stokes
56dc3f4122 Merge "Don't include inaccessible data dirs in library paths." into rvc-qpr-dev 2020-08-04 07:56:42 +00:00
Orion Hodson
72d884b80f Update art-team members in pm OWNERS file 
Test: build/make/tools/checkowners.py -c -v frameworks/base/services/core/java/com/android/server/pm/OWNERS
Change-Id: I8b5b8b09b425e52c15340af07771ee89c5807854
 2020-08-04 07:36:40 +00:00
Treehugger Robot
7b3e66602f Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 am: 0490999da3 am: 4c7276679d am: be23688553 am: 7d52b480e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386056

Change-Id: I1772e22d210fe67f833b29385d258d748f49edf3
 2020-08-04 05:43:47 +00:00
Ryan Chan
458aed0508 Fix typo "thew" -> "threw" in AndroidTestRunner 
Change-Id: I63899c42fac7f52866a2d2f6db060cf7918547c8
 2020-08-03 22:17:07 -07:00
Treehugger Robot
7d52b480e2 Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 am: 0490999da3 am: 4c7276679d am: be23688553 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386056

Change-Id: I98618b95e3e34636301d62ca38a6e3ba4defda82
 2020-08-04 05:10:32 +00:00
Treehugger Robot
be23688553 Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 am: 0490999da3 am: 4c7276679d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386056

Change-Id: I08b21123944936a874e715c693feecde5b182cb4
 2020-08-04 04:49:22 +00:00
Treehugger Robot
4c7276679d Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 am: 0490999da3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386056

Change-Id: I0e32fc0efc33ddd25cee10c8a06662ac29420a89
 2020-08-04 04:35:45 +00:00
Treehugger Robot
0490999da3 Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386056

Change-Id: Id204af9041087af516907d4deec2f52347df542b
 2020-08-04 04:09:43 +00:00
TreeHugger Robot
40cc713000 Merge "Merge ActivityTestsBase into WindowTestsBase" 2020-08-04 03:51:57 +00:00
Henry Fang
7b0d02cd8b Merge "Tuner JNI: Correct memcpy of C2DataIdInfo" 2020-08-04 03:48:42 +00:00
Treehugger Robot
f08b133000 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-04 03:47:36 +00:00
Lyn Han
22e00e0281 Merge "Check if inflation task is cancelled post execute" 2020-08-04 03:23:16 +00:00
Yi Kong
6b11cc834f Merge "Introduce ProfcollectForwardingService" 2020-08-04 03:19:33 +00:00
TreeHugger Robot
1750f5fe12 Merge "Clean injection dependency to PipMenuActivity (4/N)" 2020-08-04 03:12:50 +00:00
Philip P. Moltmann
4b9dd36b72 Merge "Revert "Check cross-user interactions for permissions and app-op..."" 2020-08-04 02:40:26 +00:00
Automerger Merge Worker
a5c0618adb Merge "Merge "Alert ProxCheck listeners directly when timing out." into rvc-d1-dev am: 350583bea0 am: b20a507711" into rvc-qpr-dev-plus-aosp am: 67c210eb60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12294057

Change-Id: I4189282cf74f5e100e48434324b61afd6b7fc594
 2020-08-04 01:55:46 +00:00
Dave Mankoff
b2727c462b Merge "Alert ProxCheck listeners directly when timing out." into rvc-d1-dev am: 350583bea0 am: 3a82e7dbc0 am: 5c8d4a63d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12294057

Change-Id: I1ed80748fcef8387c829a8280c1ac329df3256a9
 2020-08-04 01:54:47 +00:00
Ryan Lin
fd74c08bfe Merge "Add callback for transition animation" 2020-08-04 01:50:06 +00:00