Peter Kalauskas
1f5dd2802b
Change perf-setup.sh to perf-setup in README.md
...
Test: atest-src google/perf/jank/UIBench/UIBench-Lock -v
Bug: 170349152
Change-Id: I391eb8669f3ce1c4c44c26227d25cf3ecc64bbc6
2020-10-14 15:25:14 -07:00
TreeHugger Robot
93a933d5ed
Merge "Expose video codec type in MediaMetadataRetriever"
2020-10-12 14:57:36 +00:00
Varun Shah
e609b6bcbc
Merge "Update PendingIntent mutability flag in CalendarContract."
2020-10-12 14:41:26 +00:00
TreeHugger Robot
687d46aa30
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 1c3a411a39 am: b0394acccc am: 62240a1ace -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I7136818bfa0e18e1650159dec808203091b860a6
2020-10-12 13:01:24 +00:00
Charles Chen
52d4a7deef
[automerger skipped] [RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: 440cdf385a am: 12244f9042 am: 94f38577c0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I61de73b764566426cc40dcd13d818eb4f2ef2e0e
2020-10-12 13:01:19 +00:00
TreeHugger Robot
8ee9ffd5da
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 1c3a411a39 am: 8a847beeff am: 077216b7a2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I222c89f4fe2b7eb5be0baba3082a90ae41fe9ade
2020-10-12 13:01:08 +00:00
Charles Chen
85a3bad4d4
[automerger skipped] [RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: 440cdf385a am: 9f1a808925 am: 10e46e292c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: Ieb75b5269fe8f0b8bcd1299a2acd3d7a6b16ed22
2020-10-12 13:00:57 +00:00
TreeHugger Robot
62240a1ace
Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 1c3a411a39 am: b0394acccc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I08a087829408248e4005abff4027dc8a1f2a75ae
2020-10-12 12:42:43 +00:00
Charles Chen
94f38577c0
[RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: 440cdf385a am: 12244f9042
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I8395365c8163aebe3a2136e072c2bcb7851bd5df
2020-10-12 12:42:36 +00:00
TreeHugger Robot
077216b7a2
Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 1c3a411a39 am: 8a847beeff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I09084e7cdec799a9da4322cf1fcc720450b47586
2020-10-12 12:42:24 +00:00
Charles Chen
10e46e292c
[RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: 440cdf385a am: 9f1a808925
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I7c1ce3aef5df0aba36c6a515b08d5fffd7b4f476
2020-10-12 12:42:19 +00:00
Automerger Merge Worker
fb1e519115
Merge changes from topic "am-12a93de0fb82435abb9d75e12bd1113c"
...
* changes:
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 912dc1511c -s ours
[automerger skipped] [RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: b0d222b4a1 -s ours
2020-10-12 12:27:45 +00:00
TreeHugger Robot
ab11735e42
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 912dc1511c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I9d2ac657a1deb1d0bd6544df757888d301a5eef4
2020-10-12 12:27:41 +00:00
Charles Chen
9251524d1b
[automerger skipped] [RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: b0d222b4a1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I3eb9d351041b1cf01cf0e4a1f1b25754da6b6e5e
2020-10-12 12:27:31 +00:00
TreeHugger Robot
b0394acccc
Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 1c3a411a39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: Idec8b864ad1cd0546d0df6f7a1273f596120f2f4
2020-10-12 12:27:20 +00:00
Charles Chen
12244f9042
[RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: 440cdf385a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: Icf3df0b21c393067b0a89c0a5f9fb7037bfbdc71
2020-10-12 12:27:17 +00:00
Anton Hansson
34529139fd
Merge "Move the dist rules from monolithic to merged rules" am: 99398da506 am: 3b8ec2dcac am: 88901af27b am: b5fcebde9d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454979
Change-Id: Id64f6017e54e27d97c822e62a85e0221a2454bfa
2020-10-12 12:27:13 +00:00
TreeHugger Robot
8a847beeff
Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 1c3a411a39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I1c4fbb96b452c127326575444ffc969d27f129c0
2020-10-12 12:27:06 +00:00
Charles Chen
9f1a808925
[RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: 440cdf385a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I81e38982d347a7885f1967fd5e4dc09d426cb692
2020-10-12 12:27:01 +00:00
TreeHugger Robot
912dc1511c
Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I4ba52f8c4af8bb9718f6ab60a295203369e35068
2020-10-12 11:43:53 +00:00
Charles Chen
b0d222b4a1
[RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I64a3654906a73f5d8f55673dde247c12a2891084
2020-10-12 11:43:51 +00:00
TreeHugger Robot
1c3a411a39
Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: Ife885c3cdbc170fd3d07d4c48ef7ccb63e6f8b2e
2020-10-12 11:43:51 +00:00
Charles Chen
440cdf385a
[RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12683367
Change-Id: I944363b2a0e887dc42137e3962a2c85dae54ffca
2020-10-12 11:43:45 +00:00
Anton Hansson
b5fcebde9d
Merge "Move the dist rules from monolithic to merged rules" am: 99398da506 am: 3b8ec2dcac am: 88901af27b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454979
Change-Id: I2d3150f9b3a071f25236a09b07fb9c5bf008480f
2020-10-12 11:36:59 +00:00
TreeHugger Robot
936cd3b3f1
Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev
2020-10-12 11:28:41 +00:00
Anton Hansson
88901af27b
Merge "Move the dist rules from monolithic to merged rules" am: 99398da506 am: 3b8ec2dcac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454979
Change-Id: Ie28b14a6f8ba236ee555a11b4284b7473eb3e7b7
2020-10-12 11:26:00 +00:00
Anton Hansson
3b8ec2dcac
Merge "Move the dist rules from monolithic to merged rules" am: 99398da506
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454979
Change-Id: I6fbbea431b2d385036135491c509afc0db887571
2020-10-12 11:04:51 +00:00
Mark Chien
14f98ff848
[automerger skipped] Merge changes I60ed5465,I70b49d0a into mainline-prod am: 4c4f42a7f5 -s ours
...
am skip reason: Change-Id Iddc5304730dce7b11c5d124b7eddce057d752bbd with SHA-1 6626f7bcc9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12789075
Change-Id: Ia95b27c0ce749a9f7cab5cba532fde873bf44cb0
2020-10-12 10:47:49 +00:00
Anton Hansson
186229a227
Merge "Add appsearch and graphics to module lists"
2020-10-12 10:45:55 +00:00
Anton Hansson
99398da506
Merge "Move the dist rules from monolithic to merged rules"
2020-10-12 10:45:13 +00:00
Mark Chien
4c4f42a7f5
Merge changes I60ed5465,I70b49d0a into mainline-prod
...
* changes:
Make the IP subnet persistent till reboot
Make PrivateAddressCoordinator ignore vpn network
2020-10-12 10:03:26 +00:00
TreeHugger Robot
c18da0b9a2
Merge "Attempt to fix presubmit failure"
2020-10-12 09:58:58 +00:00
Hyundo Moon
41a7b5aee4
Merge "Resolve API review for MediaMetadata#getBitmapDimensionLimit"
2020-10-12 04:34:28 +00:00
Louis Chang
8cef293dda
Attempt to fix presubmit failure
...
System crashed while running presubmit. The #getDisplayIdsLocked()
was not guarded by synchronization since commit 05e1c1a .
Bug: 170451499
Test: presubmit
Change-Id: I4f2dfd2637632f722d6223469d478940db152e45
2020-10-12 11:48:26 +08:00
Lorenzo Colitti
e36395f116
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: 392b52f49f am: 926d1ee880 am: 649c2bbbd8 am: 72432ab0f4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: Iba6098badc018fa64b1c5fc20177b97a81a2e685
2020-10-12 01:48:18 +00:00
Lorenzo Colitti
72432ab0f4
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: 392b52f49f am: 926d1ee880 am: 649c2bbbd8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: I5b11411b87069687d32dede7194f9cd8a232c963
2020-10-12 01:34:41 +00:00
Lorenzo Colitti
649c2bbbd8
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: 392b52f49f am: 926d1ee880
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: Ie6a7fdb8e1ce035ce145b90645290e7e4777f7e6
2020-10-12 01:20:47 +00:00
Lorenzo Colitti
926d1ee880
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: 392b52f49f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: Iac7fc24c531db663469df1b1161d9f85a4c6f3ee
2020-10-12 01:06:47 +00:00
tim peng
a8c40563dc
Merge "Add dismiss timing for Media Output Dialog"
2020-10-12 01:03:58 +00:00
tim peng
d42ebf89fd
Merge "Update OutputSwitcher from SettingsPanel to MediaOutputDialog in SystemUI"
2020-10-12 01:03:27 +00:00
Lorenzo Colitti
392b52f49f
Merge "Speculatively fix L2TP keepalive issues by reducing mtu"
2020-10-12 00:40:44 +00:00
Dmitri Plotnikov
bc8a0ee79e
Merge "Rewrite KernelSingleProcessCpuThreadReader to native"
2020-10-12 00:01:33 +00:00
Minche Li
29f12866c2
Merge "Magnification button applies fade-in and fade-out animation"
2020-10-11 04:57:23 +00:00
TreeHugger Robot
8aced1f671
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7f2db3b0c1 -s ours am: fda201b794 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12809388
Change-Id: Ib3bfb0d5cd6c156110da7dae73ef80dac5a6288e
2020-10-11 02:29:48 +00:00
TreeHugger Robot
5a0c6aa576
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 603dc1a2ab -s ours am: bbfef91f77 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12807719
Change-Id: I9b2ad7afa3de23b26f7d079ab972db2bd4316b00
2020-10-11 02:29:27 +00:00
TreeHugger Robot
fda201b794
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7f2db3b0c1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12809388
Change-Id: I713d2de87b0e7e3c0c1133bb549b7490027b2f7b
2020-10-11 02:02:33 +00:00
TreeHugger Robot
bbfef91f77
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 603dc1a2ab -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12807719
Change-Id: Ic6a4d44b9f9eef719ea62815cc0863b1503c5cb5
2020-10-11 02:01:49 +00:00
TreeHugger Robot
7f2db3b0c1
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-10-11 02:00:39 +00:00
Bill Yi
39e14cf0ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71b921af5a -s ours am: fbe4c9e8dd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12809264
Change-Id: Ic8b9d1a3c1768adba5f5d5a25ddd4d6950372827
2020-10-11 01:39:50 +00:00
TreeHugger Robot
603dc1a2ab
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-10-11 01:33:52 +00:00