Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
440,573 Commits 3 Branches 0 Tags
4bb43f984f0b294ac791cc42ebb703ad0900bbcf
Commit Graph

440573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4bb43f984f Merge "Use start-bounds for animation leash crop" 2019-08-27 02:07:27 +00:00
Xin Li
72d6d459f1 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.020 into stage-aosp-master am: f5defc19a0 -s ours am: 1f86a83b46 am: 2443995723 
am: 66df574162 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie9fcdf4fd6cfff95dcb873c6da06d4a5872a4c79
 2019-08-26 17:13:49 -07:00
Govinda Wasserman
ae04682de9 Merge "Refactor SysUI to allow daggerization of implementations" 2019-08-26 23:26:59 +00:00
Kiyoung Kim
93244a3dde [automerger skipped] Revert "Merge "NetworkStackClient: Refactor network stack process interaction"" am: 9b9ed234cb -s ours am: 5fa29d4ed5 am: eb03cc8315 
am: 889f24a055

Change-Id: I63af5d24d233c12425610e5c6d15c9857bef3adb
 2019-08-26 15:33:56 -07:00
Felipe Leme
f49401808d [automerger skipped] Merge "Merge "Don't send HOME intent twice when booting from non-system user." into qt-qpr1-dev am: a58013ae18" into qt-qpr1-dev-plus-aosp 
am: 18e0df163f -s ours
am skip reason: change_id Idd8beedf1ea034b47b9756b91404c5a043965c23 with SHA1 f13851d6c1 is in history

Change-Id: Ie154d8a06a83dad42a13657fea843cad8f380c54
 2019-08-26 15:28:33 -07:00
Xin Li
66df574162 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.020 into stage-aosp-master am: f5defc19a0 -s ours am: 1f86a83b46 
am: 2443995723

Change-Id: Id0c981f7998d13fba87779fb4c619ee836fdab07
 2019-08-26 15:22:29 -07:00
Roshan Pius
2dfd5e7435 [automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" am: 764a90c200 am: 049c9b40ba -s ours am: 24b983fde3 -s ours am: 746e033b61 -s ours 
am: cfde3d9afd -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 f061a709b6 is in history

Change-Id: Iebcc1abdee8fadec46907f565bd041c4c2cc2856
 2019-08-26 15:22:29 -07:00
Paul Hu
705649f1f6 [automerger skipped] Merge "Add SocketUtils CTS tests am: 0141ef0948" into qt-dev-plus-aosp am: 364c77f92e am: f6a8f19632 
am: 477b525bf9 -s ours
am skip reason: change_id I36252fdf516cf4a9d4506b615cdb38f5413739e5 with SHA1 93a53224d3 is in history

Change-Id: I42f498e0596eb2dce855f0267b76b4f04c4f31aa
 2019-08-26 15:16:41 -07:00
Paul Hu
e0233061e1 [automerger skipped] Merge "Add SocketUtils CTS tests am: 0141ef0948 am: f770a59ba2" into qt-r1-dev-plus-aosp am: f5f95fce12 
am: ba7620da8d -s ours
am skip reason: change_id I36252fdf516cf4a9d4506b615cdb38f5413739e5 with SHA1 93a53224d3 is in history

Change-Id: Id31da8aaa8782d340d77dc81c784ee603cb2458e
 2019-08-26 15:11:04 -07:00
Long Ling
ba9b991d1e Merge "DeviceConfig: Add Name space and keys for Display Manager" 2019-08-26 21:59:22 +00:00
Sehee Park
01addff1b8 Merge "Define TAG_SYSTEM_DNS" am: fdc37666cb am: b849d1fe35 am: 1666fbe3e0 am: 822d3ea264 
am: 2d7bbb4230

Change-Id: I84f21ab54cb9233f8ef9071f4a76a30b60bd1d31
 2019-08-26 14:54:35 -07:00
Bill Yi
3120eb1e79 [automerger skipped] Import translations. DO NOT MERGE am: 693e8cb402 -s ours am: ac154963e2 -s ours 
am: 20b35af44c -s ours
am skip reason: subject contains skip directive

Change-Id: I94270a76e569bac1356a9fb505f10b59815594ab
 2019-08-26 14:46:53 -07:00
Xin Li
1d597a007f [automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master" into stage-aosp-master am: 4f4af6ba7c -s ours am: bdb03efbfc am: 02edcfe3fd 
am: 9173f1228d -s ours
am skip reason: subject contains skip directive

Change-Id: Ia75b412514c7eb011bc25b2738e43347d3c01552
 2019-08-26 14:20:41 -07:00
Kiyoung Kim
889f24a055 [automerger skipped] Revert "Merge "NetworkStackClient: Refactor network stack process interaction"" am: 9b9ed234cb -s ours am: 5fa29d4ed5 
am: eb03cc8315

Change-Id: I5e91ca6269008ea53ee178c189b2a9bc96d6465e
 2019-08-26 14:14:45 -07:00
Android Build Merger (Role)
18e0df163f Merge "Merge "Don't send HOME intent twice when booting from non-system user." into qt-qpr1-dev am: a58013ae18" into qt-qpr1-dev-plus-aosp 2019-08-26 21:09:38 +00:00
Felipe Leme
5215cc0b89 Merge "Don't send HOME intent twice when booting from non-system user." into qt-qpr1-dev 
am: a58013ae18

Change-Id: I56493c8fc794ccd7e4038688c965675eb654beca
 2019-08-26 14:08:59 -07:00
Roshan Pius
cfde3d9afd [automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" am: 764a90c200 am: 049c9b40ba -s ours am: 24b983fde3 -s ours 
am: 746e033b61 -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 f061a709b6 is in history

Change-Id: Ie0aaeb01360bf14e94bb08e96ec9d88c8c923aac
 2019-08-26 14:08:22 -07:00
Paul Hu
477b525bf9 Merge "Add SocketUtils CTS tests am: 0141ef0948" into qt-dev-plus-aosp am: 364c77f92e 
am: f6a8f19632

Change-Id: Ib9a37cb7def991896fba61fbefe61eb8b583a1fb
 2019-08-26 14:01:10 -07:00
TreeHugger Robot
a58013ae18 Merge "Don't send HOME intent twice when booting from non-system user." into qt-qpr1-dev 2019-08-26 20:57:28 +00:00
Paul Hu
ba7620da8d Merge "Add SocketUtils CTS tests am: 0141ef0948 am: f770a59ba2" into qt-r1-dev-plus-aosp 
am: f5f95fce12

Change-Id: I26b15368b078084158ad91df5d26cea93aff8cd4
 2019-08-26 13:53:50 -07:00
Sehee Park
2d7bbb4230 Merge "Define TAG_SYSTEM_DNS" am: fdc37666cb am: b849d1fe35 am: 1666fbe3e0 
am: 822d3ea264

Change-Id: I508a3608dbd883dd915b40c49eea9f025f8f485e
 2019-08-26 13:46:38 -07:00
Bill Yi
20b35af44c [automerger skipped] Import translations. DO NOT MERGE am: 693e8cb402 -s ours 
am: ac154963e2 -s ours
am skip reason: subject contains skip directive

Change-Id: I1e8576f0f23038b462843e688bdd4725a736f592
 2019-08-26 13:38:49 -07:00
Xin Li
0e429304d9 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: a770df1d2e -s ours am: 9d40ded464 am: 6025644956 
am: b7b701ff43 -s ours
am skip reason: subject contains skip directive

Change-Id: I4ac3b454280f1442f4828406984d14850789b630
 2019-08-26 13:34:29 -07:00
Jiyong Park
648cbff572 [automerger skipped] Remove duplicated sources that go into hiddenapi-mappins am: 0323b4d8a3 am: 96b6abd66a am: f4cbc615fd 
am: 3c6a4dd339 -s ours
am skip reason: change_id I9ea6e06e8bd388f3a495acb6ff5555c0ce2f75b2 with SHA1 68020f8f63 is in history

Change-Id: I38d158f445863a274dede42c660c4d2d7d6b45ce
 2019-08-26 13:32:23 -07:00
Pengquan Meng
5d4992c9b4 [automerger skipped] Merge "Add fileds to Cellbroadcast" am: 071936e546 am: e5f84f5a70 am: 33f79cdfc2 am: ea52bc13ea -s ours 
am: fc5c5abacf -s ours
am skip reason: change_id Ied0780cb1b9993e6d8cdb80131ba2f8b8affcb54 with SHA1 02cfb3bdc8 is in history

Change-Id: If0b2b56d4b595a7e7869a205b4b2c427f843270a
 2019-08-26 13:31:07 -07:00
Xin Li
2443995723 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.020 into stage-aosp-master am: f5defc19a0 -s ours 
am: 1f86a83b46

Change-Id: I2768c093197686bcdb7b5e55f6f6a92a53d501ab
 2019-08-26 13:30:46 -07:00
Mathieu Chartier
d410243c0d [automerger skipped] Merge "Add phenotype property for enabling profiling of boot class path" am: eb247e7abf am: d5f1fed45f am: fb1e55116c am: 9d5b85a5ec 
am: 6b9d0df6cd -s ours
am skip reason: change_id I3e2ec37931a6f9239c5d0fa9fcaea61637061ac1 with SHA1 7253961bd0 is in history

Change-Id: I92f469e6ac23b1fea11cac4a33725cdbeba9475a
 2019-08-26 13:30:02 -07:00
Xin Li
9173f1228d [automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master" into stage-aosp-master am: 4f4af6ba7c -s ours am: bdb03efbfc 
am: 02edcfe3fd

Change-Id: Ic47b4cc372578e550586b913169eb189b5480bb5
 2019-08-26 13:26:27 -07:00
Jiyong Park
1e78b5fd31 [automerger skipped] Merge "Use filegroup to simplify Android.bp for frameworks and its friends" into stage-aosp-master am: b7162b936f am: 5db24005a6 am: 28bde2ffbb 
am: 59928ac0fb -s ours
am skip reason: change_id I0705ddf76b3c628127f65d75e0a8b06c6c250fe2 with SHA1 b360931bf0 is in history

Change-Id: I0562e78a94c04f9e6a99e5c0ff72815ccd951b96
 2019-08-26 13:22:33 -07:00
Xin Li
40e0a0cb2b [automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master am: abaa7ead61 -s ours am: 6fbf8171af am: bf397e95fd 
am: 089a3dc2c2 -s ours
am skip reason: subject contains skip directive

Change-Id: I9d706bd29d70848cd1d7a9c807353b32749eabfc
 2019-08-26 13:21:35 -07:00
Xin Li
1f86a83b46 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.020 into stage-aosp-master 
am: f5defc19a0 -s ours
am skip reason: subject contains skip directive

Change-Id: I19193ba05b514064b934b185a9dba33792ce5227
 2019-08-26 13:15:30 -07:00
Xin Li
04e7cc0ee7 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: bf9040d4f9 -s ours am: 377c17d1ea am: db21ccd28a 
am: 5b74ad6a0f -s ours
am skip reason: subject contains skip directive

Change-Id: Ie46c2fbbeccf7e3bbe0430c6bc09f7286338801c
 2019-08-26 12:39:36 -07:00
Xin Li
b7b701ff43 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: a770df1d2e -s ours am: 9d40ded464 
am: 6025644956

Change-Id: If386bb270b4c6e2d776a207ddab558854d0af4c6
 2019-08-26 12:35:16 -07:00
Jiyong Park
3c6a4dd339 Remove duplicated sources that go into hiddenapi-mappins am: 0323b4d8a3 am: 96b6abd66a 
am: f4cbc615fd

Change-Id: I071041be080de5ce9e463fe91b1b4eb3cda44f67
 2019-08-26 12:30:13 -07:00
Pengquan Meng
fc5c5abacf [automerger skipped] Merge "Add fileds to Cellbroadcast" am: 071936e546 am: e5f84f5a70 am: 33f79cdfc2 
am: ea52bc13ea -s ours
am skip reason: change_id Ied0780cb1b9993e6d8cdb80131ba2f8b8affcb54 with SHA1 02cfb3bdc8 is in history

Change-Id: Ic14a8460db901e6bde3c76b41948a8678cffa439
 2019-08-26 12:28:53 -07:00
Mathieu Chartier
6b9d0df6cd Merge "Add phenotype property for enabling profiling of boot class path" am: eb247e7abf am: d5f1fed45f am: fb1e55116c 
am: 9d5b85a5ec

Change-Id: Ie4ed4975d6e229eab66648ac59bfd078e4226be3
 2019-08-26 12:27:56 -07:00
TreeHugger Robot
3f97f28037 Merge "Add OWNERS for media TV" 2019-08-26 19:20:27 +00:00
Jiyong Park
59928ac0fb Merge "Use filegroup to simplify Android.bp for frameworks and its friends" into stage-aosp-master am: b7162b936f am: 5db24005a6 
am: 28bde2ffbb

Change-Id: I645f88e59c896261c5046b953252e36ea1f392bf
 2019-08-26 12:19:46 -07:00
Xin Li
089a3dc2c2 [automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master am: abaa7ead61 -s ours am: 6fbf8171af 
am: bf397e95fd

Change-Id: I4f3111425ed9952206abf947f2b09f753bd39549
 2019-08-26 12:18:31 -07:00
Yi Kong
e9fb00f9a3 [automerger skipped] Fix android-cloexec-pipe clang-tidy warning am: 9b00f181da -s ours am: 62e3c16301 -s ours am: db8ab235e2 -s ours 
am: 3b66d7608c -s ours
am skip reason: change_id Iee772b5c3ed5e2af481e479dab19030f8419290a with SHA1 1fa946a2f2 is in history

Change-Id: I3784e80a3d011e435b4bd9f158a0ffdf5aea7635
 2019-08-26 12:12:39 -07:00
Roshan Pius
137d28f2f4 [automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" into qt-dev-plus-aosp am: 9f480e0b8a am: 50d95f3217 -s ours 
am: 50217d590e -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 f061a709b6 is in history

Change-Id: Ib3c0f4bbfcfef0a5fa92644ace80922ebdafb94c
 2019-08-26 12:09:26 -07:00
Jared Henderson
a1ef1ea27f Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef am: 7f1e92a654 am: b2cfc86e8b am: 37f8b552d3 
am: 71b94722cb

Change-Id: If3d23854ba967939d61d095c0358b678ddcb68ac
 2019-08-26 12:05:53 -07:00
Anna Trostanetski
67e1b54cad Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d am: a105206a92 am: 9b42b7095d am: 6f5669ed78 
am: 997b46ab36

Change-Id: I80f2950ddab8f8ec9aed0699c3e89ac862c1de72
 2019-08-26 12:02:51 -07:00
Jay Patel
3a4aff83cf Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d am: 4088527e0c am: 77c749611d 
am: 44117eac73

Change-Id: If152556b4a2e4d8a175819be8131b5de69fe9cdd
 2019-08-26 11:58:48 -07:00
Da Xing
e929d54210 [automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours am: 392130fee5 -s ours am: ec2c5c2e18 am: 2476002005 
am: 28f41e7ea2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie876e8894ec5183d4fbb7ca4947e8460552e3208
 2019-08-26 11:54:46 -07:00
Felipe Leme
0639751675 Don't send HOME intent twice when booting from non-system user. 
When Automotive boots, CarServiceHelperService "restarts" the system user in the background, so it
can be unlocked. Consequently, some boot tasks will be executed twice (triggered from
UserController.startUser() and ActivityManager.systemReady()).

Test: manual verification
Bug: 139502237

Merged-In: Idd8beedf1ea034b47b9756b91404c5a043965c23
Change-Id: Idd8beedf1ea034b47b9756b91404c5a043965c23
 2019-08-26 11:49:42 -07:00
Jack Yu
ac79d54b0b [automerger skipped] Merge changes from topic "null_callback" am: 5ce391b313 am: 54e83aca93 am: e0afc80afb -s ours am: 3dba92b05c -s ours 
am: 33b44ef558 -s ours
am skip reason: change_id Ica0b7b810ffd5416ffd1b2b61f7ebc4af0dcb8ce with SHA1 09ef1cb126 is in history

Change-Id: I01a99724861f35881a1b8005ccc05d98e332299f
 2019-08-26 11:49:19 -07:00
Jack Yu
2c8887842c [automerger skipped] Added debug messages and watchdog am: 594931f5d9 am: 75db0a70dd am: 966c2eb20d -s ours am: 1cf83928e5 -s ours 
am: 64be6a44b4 -s ours
am skip reason: change_id I52dd126fddc1b1e8b18d5388a92aabaa3e2e48d5 with SHA1 36e2bfbaad is in history

Change-Id: Icfe8e4bc8a96e6aae26dcdbb3864d0ddd5e8f3bc
 2019-08-26 11:49:04 -07:00
Xin Li
5b74ad6a0f [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: bf9040d4f9 -s ours am: 377c17d1ea 
am: db21ccd28a

Change-Id: Id06af92773fca6805509f766803d58d1026cc466
 2019-08-26 11:36:46 -07:00
Yi Kong
3b66d7608c [automerger skipped] Fix android-cloexec-pipe clang-tidy warning am: 9b00f181da -s ours am: 62e3c16301 -s ours 
am: db8ab235e2 -s ours
am skip reason: change_id Iee772b5c3ed5e2af481e479dab19030f8419290a with SHA1 1fa946a2f2 is in history

Change-Id: I1f2e6cf5dcc20f60dd1f3be9223530db75612174
 2019-08-26 11:33:55 -07:00