Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
509,302 Commits 3 Branches 0 Tags
adf965c9fdaf697648296e94ecfb47bdde4d838b
Commit Graph

509302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
adf965c9fd Merge "Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dcfb am: e0d455c9d4" into rvc-d1-dev-plus-aosp 2020-06-12 05:48:50 +00:00
Hyundo Moon
f4a9310ea7 Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dcfb am: e0d455c9d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835420

Change-Id: I56994969e985960d72270195aabb8df568c14e05
 2020-06-12 05:48:43 +00:00
TreeHugger Robot
c0548a39a8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: cab8a73c6d -s ours am: 4ea2e2e0cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75915ac9084ed12ca17807e8e66e6b8b8afb86cd
 2020-06-12 05:48:41 +00:00
TreeHugger Robot
a772862791 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0f8165ffdb -s ours am: b234a0b518 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifec46fa8f6cf0e7d2eaff1d734a22e5a9990218a
 2020-06-12 05:48:32 +00:00
Hyundo Moon
1ac1256aeb Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dcfb am: a6760a6ce0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835420

Change-Id: Ibd624640231169f853b23a06015ba1152f38d8ab
 2020-06-12 05:48:04 +00:00
TreeHugger Robot
cdf785de2d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0f8165ffdb -s ours am: 78c9a17f91 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c42b7fca83bb004128961e55befb09d133744d1
 2020-06-12 05:47:56 +00:00
TreeHugger Robot
c725ee7b2c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7eb6cf298f -s ours am: 5afca7b12c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14ac46ec393fadf621720305844db3a8e62eca2b
 2020-06-12 05:47:32 +00:00
TreeHugger Robot
1f77568e1b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7eb6cf298f -s ours am: c1be178eb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4fa83fd22c85965f40f31ac07b5e1713cac7025
 2020-06-12 05:47:14 +00:00
TreeHugger Robot
4ea2e2e0cc [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: cab8a73c6d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide242eee20ba455139d61bed576e0c3a3470c609
 2020-06-12 05:31:43 +00:00
Hyundo Moon
a6760a6ce0 Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dcfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835420

Change-Id: Ifcdc722cd1a581846012a0406f04821e8f398d1a
 2020-06-12 05:31:32 +00:00
Hyundo Moon
e0d455c9d4 Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dcfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835420

Change-Id: I2502e5f74a56fe67307c1aaa343d2bea1741358e
 2020-06-12 05:31:25 +00:00
TreeHugger Robot
78c9a17f91 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0f8165ffdb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e59dc72904cbadab535518a769d15181239fad2
 2020-06-12 05:31:17 +00:00
TreeHugger Robot
b234a0b518 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0f8165ffdb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia563edf6ac8814df5108d7671a0ae4ff9924fa0f
 2020-06-12 05:31:06 +00:00
TreeHugger Robot
c1be178eb1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7eb6cf298f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1a1daefd56d2e1da003a0257e7207009f15da7d
 2020-06-12 05:30:51 +00:00
TreeHugger Robot
5afca7b12c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7eb6cf298f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1111e5d6bad8b7d0b85244d1c915e12a3520a2b9
 2020-06-12 05:30:42 +00:00
TreeHugger Robot
cab8a73c6d Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-12 05:26:37 +00:00
Hyundo Moon
6d8d91dcfb Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev 2020-06-12 05:23:25 +00:00
TreeHugger Robot
0f8165ffdb Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-12 05:19:36 +00:00
TreeHugger Robot
7eb6cf298f Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-12 05:17:01 +00:00
Chalard Jean
69d76569dd [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 am: 0a36671223 -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 081ff7a8f2 is in history

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

Change-Id: I7194a4a3a70f93dd510bda107f620e23fb0af19d
 2020-06-12 05:12:16 +00:00
Frank Li
8440b3c208 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 am: dc78c3ba8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: I56e4f097c02350d411c6d844f3934cfcd7f73ad6
 2020-06-12 05:11:40 +00:00
Chalard Jean
6a8dc3be59 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 -s ours am: e6527eef99 -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 c022b0c7ea is in history

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

Change-Id: I51aaef47a6e94d53a744b80fc684cd6fda6ec73c
 2020-06-12 05:11:29 +00:00
Frank Li
84d08f23d0 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 am: f572adce1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: Iea400b5d0716f12f91d5e0ceafa1cde772daf939
 2020-06-12 05:11:13 +00:00
Automerger Merge Worker
b3bf6c02a8 Merge "Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 89a5c51eca" into rvc-d1-dev-plus-aosp 2020-06-12 05:11:08 +00:00
TreeHugger Robot
177e3d8fe5 Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 7dda5946b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: I3fcdfe19ba9b2b51e16a013432ef634a446dabe7
 2020-06-12 05:10:56 +00:00
TreeHugger Robot
c7f3db371d Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 am: 89a5c51eca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: I37fb271e9e780bff7ebc754a3f9e025f25575a18
 2020-06-12 05:10:55 +00:00
Chalard Jean
e6527eef99 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 c022b0c7ea is in history

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

Change-Id: I819ea5e14c6eaf108ac7252768014aa5d33891b3
 2020-06-12 04:58:29 +00:00
Chalard Jean
0a36671223 Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: Ic82a23e6f949bd2c74c3dc49da516938f0603e2e
 2020-06-12 04:58:27 +00:00
Frank Li
dc78c3ba8e Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: Ibb7aa50863308e4364c16701d15f76c47725e707
 2020-06-12 04:58:05 +00:00
Frank Li
f572adce1e Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: I4b789b7c68ede5dd6d73cb5b1c4030855d49940f
 2020-06-12 04:58:01 +00:00
TreeHugger Robot
7dda5946b7 Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: Id560b7d80d6e7130e4bc9828421305c0a7fd45db
 2020-06-12 04:57:34 +00:00
TreeHugger Robot
89a5c51eca Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: I3e8d0b9de32c121e2c9a68306f14dea97e8628d3
 2020-06-12 04:57:31 +00:00
Chalard Jean
8aafdcc328 Merge "Document the limitation to a hundred callbacks." into rvc-dev 2020-06-12 04:54:02 +00:00
Frank Li
64a3cb03e7 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev 2020-06-12 04:50:57 +00:00
TreeHugger Robot
70bec8cc36 Merge "Help reduce falsing on the seek bar" into rvc-dev 2020-06-12 04:44:55 +00:00
Automerger Merge Worker
c490a815c2 Merge "Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 49efb08d79" into rvc-d1-dev-plus-aosp 2020-06-12 04:42:41 +00:00
Ruchir Rastogi
6cc5dca172 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 49efb08d79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I65ec2f8a807a74af1af1738b4b3a226290a30caa
 2020-06-12 04:42:33 +00:00
Ruchir Rastogi
deb5941c88 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 40c4fad297 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I525b245d12ae4e29c2d70264b437f3b6c826d5ef
 2020-06-12 04:42:23 +00:00
Ruchir Rastogi
49efb08d79 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: Ibb041b389a8f2ce24f351c46bbe9500b877aeaf7
 2020-06-12 04:25:53 +00:00
Ruchir Rastogi
40c4fad297 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: I0eae405855a39047d0fa315c26e0831d8f613161
 2020-06-12 04:25:39 +00:00
Ruchir Rastogi
003ef4903a Merge "Add libincident_test to MTS" into rvc-dev 2020-06-12 04:11:44 +00:00
Beth Thibodeau
484684091e Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: bcd7297083 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I66b51251b3612e76329fc0f943630d4a6ab90e7f
 2020-06-12 04:02:51 +00:00
Beth Thibodeau
10288035a6 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c am: 337ffc43d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: I46f16765640c2e6f8f31261be951992378f8997b
 2020-06-12 04:02:29 +00:00
Beth Thibodeau
337ffc43d6 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: Ibd140fd39103d096d099519d17c24f2119aeb0ca
 2020-06-12 03:51:32 +00:00
Beth Thibodeau
bcd7297083 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: Ib569729dd607d60d0897da86095bc3092ba86974
 2020-06-12 03:51:21 +00:00
Yunfan Chen
d9c7811096 Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 am: c56f6b53b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: I6ff08fc32ff843de23631e621a69fe9d6d3c218a
 2020-06-12 03:48:17 +00:00
Yunfan Chen
a2351f080f Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 am: 13212d164e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: I70040662b89e37015da805318d35c4e6aeb9352e
 2020-06-12 03:47:39 +00:00
Automerger Merge Worker
7d44d5a2f8 Merge "Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c" into rvc-d1-dev-plus-aosp 2020-06-12 03:47:10 +00:00
Tony Huang
ed4937c342 Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: dbe759768c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612936

Change-Id: Iab51f9238ece0fc805ee50a9892d3c726c02fcab
 2020-06-12 03:46:55 +00:00
Tony Huang
8e350afb0f Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612936

Change-Id: Iae7fd6a4b188e00c0deb11e84be91e4ce641f41b
 2020-06-12 03:46:49 +00:00