Treehugger Robot
|
2d1ef477a3
|
[automerger skipped] Merge "API: Remove ViewDebug.ExportedProperty and CapturedViewProperty from current.txt" am: 274911fd70 am: f8c6eb678b -s ours am: 7151f089b8 -s ours am: 676f2451d0 -s ours am: 1ead020c09 -s ours
am skip reason: Change-Id I99ed93e96f7465f1f7c9a32c3715a874055dc809 with SHA-1 7e703b445e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325822
Change-Id: Ic40dce4a5b7db678e96ac81ae356d1455c981679
|
2020-06-10 17:41:16 +00:00 |
|
Treehugger Robot
|
c16494b587
|
[automerger skipped] Merge "Call DeleteLocalRef in GNSS JNI" am: 17d5740fcf am: 527c635e71 -s ours am: 8c7cb70a76 -s ours am: adf77ebc3e -s ours am: 11477ac922 -s ours
am skip reason: Change-Id Ia5e5a84e1b17887b440c2c83894f0a8cfc50faf4 with SHA-1 c19b3a8ecf is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326195
Change-Id: I4c65f4da60c1075b52fe86c4062e80e9a8d59922
|
2020-06-10 17:40:52 +00:00 |
|
TreeHugger Robot
|
b239729ce3
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: f7f596f902 am: 1412508376 am: f57b02519c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: I53b69085c4b94c0e3aa9ec3548d9d9364d51db3a
|
2020-06-10 17:40:24 +00:00 |
|
Automerger Merge Worker
|
412733b123
|
Merge "Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3 am: 8a6442ece9" into rvc-qpr-dev-plus-aosp am: b1a657cf7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: I7ba38a32e1fcfc8d6ee8316eba230e663cc5895f
|
2020-06-10 17:40:00 +00:00 |
|
TreeHugger Robot
|
01f6702064
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3 am: 929d7d9b2e am: b2b6bd3154
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: I681b4aba2a250d585805532546f6cacb284727ee
|
2020-06-10 17:39:24 +00:00 |
|
Treehugger Robot
|
1ead020c09
|
[automerger skipped] Merge "API: Remove ViewDebug.ExportedProperty and CapturedViewProperty from current.txt" am: 274911fd70 am: f8c6eb678b -s ours am: 7151f089b8 -s ours am: 676f2451d0 -s ours
am skip reason: Change-Id I99ed93e96f7465f1f7c9a32c3715a874055dc809 with SHA-1 7e703b445e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325822
Change-Id: I5e0a4e3710fa5289f124b58bfb967999e15d1aa2
|
2020-06-10 17:23:03 +00:00 |
|
Treehugger Robot
|
11477ac922
|
[automerger skipped] Merge "Call DeleteLocalRef in GNSS JNI" am: 17d5740fcf am: 527c635e71 -s ours am: 8c7cb70a76 -s ours am: adf77ebc3e -s ours
am skip reason: Change-Id Ia5e5a84e1b17887b440c2c83894f0a8cfc50faf4 with SHA-1 c19b3a8ecf is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326195
Change-Id: I4f90d2b0b0fcfe35892e5bf9e47da1112431e046
|
2020-06-10 17:22:24 +00:00 |
|
TreeHugger Robot
|
f57b02519c
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: f7f596f902 am: 1412508376
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: I1c5cc319b9193d621d38902af1f0faef25361881
|
2020-06-10 17:21:42 +00:00 |
|
Automerger Merge Worker
|
b1a657cf7b
|
Merge "Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3 am: 8a6442ece9" into rvc-qpr-dev-plus-aosp
|
2020-06-10 17:21:31 +00:00 |
|
TreeHugger Robot
|
9462add156
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3 am: 8a6442ece9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: I294ec57a188b9edb753e599f5c20e4a23e222fe6
|
2020-06-10 17:21:14 +00:00 |
|
TreeHugger Robot
|
b2b6bd3154
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3 am: 929d7d9b2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: I1a8db46ab0c7cd48d0d764fa36f04fcec7dd3f79
|
2020-06-10 17:21:07 +00:00 |
|
Diksha Gohlyan
|
ada0476641
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: 9ad0db624f am: 4fd236e976 am: c0ae23ab29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: Ie687c38ca7a4fc7ce04c4ddaeccd8767d619c12d
|
2020-06-10 17:15:49 +00:00 |
|
Diksha Gohlyan
|
4587669750
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: eed2210da6 am: b5a418d90c am: b54d03ac6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: Ifab1a9ef3c3b17bf843ca64eedea14bbb5c2d738
|
2020-06-10 17:15:25 +00:00 |
|
Diksha Gohlyan
|
27ae63d038
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: 9ad0db624f am: df420898ba am: 5653bed177
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: Ic4e2610a51f0b479069aa033e54c4f070f145956
|
2020-06-10 17:14:49 +00:00 |
|
Treehugger Robot
|
676f2451d0
|
[automerger skipped] Merge "API: Remove ViewDebug.ExportedProperty and CapturedViewProperty from current.txt" am: 274911fd70 am: f8c6eb678b -s ours am: 7151f089b8 -s ours
am skip reason: Change-Id I99ed93e96f7465f1f7c9a32c3715a874055dc809 with SHA-1 7e703b445e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325822
Change-Id: I7214ffbc42e966b1adc4ca8fb88292c821040a3e
|
2020-06-10 17:08:01 +00:00 |
|
Treehugger Robot
|
adf77ebc3e
|
[automerger skipped] Merge "Call DeleteLocalRef in GNSS JNI" am: 17d5740fcf am: 527c635e71 -s ours am: 8c7cb70a76 -s ours
am skip reason: Change-Id Ia5e5a84e1b17887b440c2c83894f0a8cfc50faf4 with SHA-1 c19b3a8ecf is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326195
Change-Id: Ib5e5158625bc84870007543ee0119d258ba0ee7d
|
2020-06-10 17:07:38 +00:00 |
|
Treehugger Robot
|
7151f089b8
|
[automerger skipped] Merge "API: Remove ViewDebug.ExportedProperty and CapturedViewProperty from current.txt" am: 274911fd70 am: f8c6eb678b -s ours
am skip reason: Change-Id I99ed93e96f7465f1f7c9a32c3715a874055dc809 with SHA-1 7e703b445e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325822
Change-Id: I87eecdb282236086de3ae2d3ecf1effc6206855c
|
2020-06-10 17:03:13 +00:00 |
|
Treehugger Robot
|
8c7cb70a76
|
[automerger skipped] Merge "Call DeleteLocalRef in GNSS JNI" am: 17d5740fcf am: 527c635e71 -s ours
am skip reason: Change-Id Ia5e5a84e1b17887b440c2c83894f0a8cfc50faf4 with SHA-1 c19b3a8ecf is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326195
Change-Id: Ifc0c2481f7456fdfdac251558d65fe76a6eec861
|
2020-06-10 17:02:55 +00:00 |
|
TreeHugger Robot
|
1412508376
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: f7f596f902
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: Ia74ee52d0296b75a202e4033e44d587ff80fe81f
|
2020-06-10 17:02:33 +00:00 |
|
TreeHugger Robot
|
8a6442ece9
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: I9ed0f019a6a123ada7571b9b3c3bf5c3bc583e6e
|
2020-06-10 17:02:03 +00:00 |
|
TreeHugger Robot
|
929d7d9b2e
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: I309651ca20f203afd8c79f28b38aa227ba222117
|
2020-06-10 17:01:58 +00:00 |
|
Diksha Gohlyan
|
c0ae23ab29
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: 9ad0db624f am: 4fd236e976
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: I3ff75e648af6f5134df6407aeba78ebb479a27b3
|
2020-06-10 16:57:10 +00:00 |
|
Diksha Gohlyan
|
b54d03ac6c
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: eed2210da6 am: b5a418d90c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: Idccc9263ee077c909557394b5f748c58dc48eba0
|
2020-06-10 16:56:38 +00:00 |
|
Diksha Gohlyan
|
5653bed177
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: 9ad0db624f am: df420898ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: I01f2a892b4f3e74c29cda1ef19db8d6e9041a426
|
2020-06-10 16:54:02 +00:00 |
|
Treehugger Robot
|
f8c6eb678b
|
Merge "API: Remove ViewDebug.ExportedProperty and CapturedViewProperty from current.txt" am: 274911fd70
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325822
Change-Id: Id5c4afa9253b6dad89727332e43050e40eea1cad
|
2020-06-10 16:50:38 +00:00 |
|
Treehugger Robot
|
527c635e71
|
Merge "Call DeleteLocalRef in GNSS JNI" am: 17d5740fcf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326195
Change-Id: Icc08283b9bda7dfca42801138d3c15ef48867c10
|
2020-06-10 16:49:25 +00:00 |
|
TreeHugger Robot
|
7fbce095b3
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: I72bfd784f3ee281905f1d402cf0920b904c4a7e5
|
2020-06-10 16:49:20 +00:00 |
|
TreeHugger Robot
|
f7f596f902
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440
Change-Id: Ia5c7fc3891176b2c0a0de7576ec58ff57f5f0bed
|
2020-06-10 16:49:04 +00:00 |
|
TreeHugger Robot
|
a27465258a
|
Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev
|
2020-06-10 16:33:37 +00:00 |
|
Treehugger Robot
|
274911fd70
|
Merge "API: Remove ViewDebug.ExportedProperty and CapturedViewProperty from current.txt"
|
2020-06-10 16:33:24 +00:00 |
|
Treehugger Robot
|
17d5740fcf
|
Merge "Call DeleteLocalRef in GNSS JNI"
|
2020-06-10 16:26:50 +00:00 |
|
Diksha Gohlyan
|
4fd236e976
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: 9ad0db624f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: I290165ed76c2b9e83c5c9b7e2b553e7a0445338d
|
2020-06-10 16:25:28 +00:00 |
|
Diksha Gohlyan
|
df420898ba
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: 9ad0db624f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: Ic7c4da14725110f6ef28f770af6271e76c1f43f1
|
2020-06-10 16:24:49 +00:00 |
|
Diksha Gohlyan
|
b5a418d90c
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013 am: eed2210da6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: I740bdd76bdb4295ee18aab5323b699038831a31c
|
2020-06-10 16:24:48 +00:00 |
|
Patrick Baumann
|
29fb75aa60
|
Merge "Revert "Pre-cache filter results"" into rvc-dev am: c357f2cafd am: 756d9c1196 am: 1a18ee5cdf am: ab5eead4e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820080
Change-Id: Ib14e7a6386cda81872281b5b0c791055e9c155e5
|
2020-06-10 16:21:16 +00:00 |
|
Patrick Baumann
|
b16316b0ae
|
Merge "Revert "Pre-cache filter results"" into rvc-dev am: c357f2cafd am: facf8bcd10 am: 9be4e4324c am: 9a733c84c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820080
Change-Id: If3466858e46c0ec1751c885396c01d3740922c6c
|
2020-06-10 16:20:57 +00:00 |
|
Automerger Merge Worker
|
4c7737132f
|
Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e am: 0e1b6cb520 -s ours" into rvc-d1-dev-plus-aosp am: 30c6bd29c7 -s ours am: 1c989cfa90 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 be7265d261 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979
Change-Id: I594adfeb0faf2e4dbad8d69efe1456db36abdfef
|
2020-06-10 16:20:32 +00:00 |
|
Lorenzo Colitti
|
89c2c43c4f
|
[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e -s ours am: 956a9bc9e1 -s ours am: 1fab9c087a -s ours am: b771fd535b -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 be7265d261 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979
Change-Id: Id658f9ed7cc293697b9352196b9f6b42f4fbe741
|
2020-06-10 16:19:21 +00:00 |
|
Patrick Baumann
|
abbe59a4fd
|
[automerger skipped] Merge "Revert "Pre-cache filter results"" into rvc-dev am: c357f2cafd am: 756d9c1196 am: 59349f30f7 am: a696a3637d -s ours
am skip reason: skipped by user patb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820080
Change-Id: I4772aa4a2c34cb4958bba8c00d7fbb46ad906bed
|
2020-06-10 16:18:42 +00:00 |
|
Diksha Gohlyan
|
9ad0db624f
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: If2115b152fb5242430e4645d224990f95b912bd0
|
2020-06-10 16:08:44 +00:00 |
|
Diksha Gohlyan
|
eed2210da6
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev am: e445872013
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815146
Change-Id: I2c448592b8b1e7737bc8e3e2da55f6c7132520f0
|
2020-06-10 16:08:44 +00:00 |
|
Lorenzo Colitti
|
1f9a5ed4a8
|
[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e am: 0e1b6cb520 am: c889bb9a83 -s ours am: e519dde2cc -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 55882575de is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979
Change-Id: I0bdaab9f4f587a097cbf9e982300981b9d75afcd
|
2020-06-10 16:08:08 +00:00 |
|
Patrick Baumann
|
ab5eead4e2
|
Merge "Revert "Pre-cache filter results"" into rvc-dev am: c357f2cafd am: 756d9c1196 am: 1a18ee5cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820080
Change-Id: Iccde3a41741f725266c06905ff06df5f0bf4fcb5
|
2020-06-10 16:03:46 +00:00 |
|
Patrick Baumann
|
9a733c84c9
|
Merge "Revert "Pre-cache filter results"" into rvc-dev am: c357f2cafd am: facf8bcd10 am: 9be4e4324c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820080
Change-Id: Ia63f1b2bd898c689bdbd434d7a4380dfacfea22b
|
2020-06-10 16:03:31 +00:00 |
|
Automerger Merge Worker
|
1c989cfa90
|
Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e am: 0e1b6cb520 -s ours" into rvc-d1-dev-plus-aosp am: 30c6bd29c7 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 be7265d261 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979
Change-Id: Iac524d19a8a357a3248368a4bfe15ffa668cdb1e
|
2020-06-10 16:03:24 +00:00 |
|
Lorenzo Colitti
|
b771fd535b
|
[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e -s ours am: 956a9bc9e1 -s ours am: 1fab9c087a -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 be7265d261 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979
Change-Id: I24f4975c818a6857feee0082245bfb33af3911ff
|
2020-06-10 16:01:56 +00:00 |
|
Patrick Baumann
|
a696a3637d
|
Merge "Revert "Pre-cache filter results"" into rvc-dev am: c357f2cafd am: 756d9c1196 am: 59349f30f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820080
Change-Id: I1a2b55bccc65d151c64918afeb59aa668463f90a
|
2020-06-10 15:56:24 +00:00 |
|
Diksha Gohlyan
|
e445872013
|
Merge "Use visiblePath instead of path for findDocumentPath" into rvc-dev
|
2020-06-10 15:56:20 +00:00 |
|
Lorenzo Colitti
|
e519dde2cc
|
[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e am: 0e1b6cb520 am: c889bb9a83 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 55882575de is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979
Change-Id: Ib3fb4af9b39f9497b0cbf9cb327cc5941b7dd7ac
|
2020-06-10 15:55:58 +00:00 |
|
Louis Chang
|
3f4dc86ffd
|
Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b am: 3884ae8712 am: 04dfbf4d61 am: f8b17cd22c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788494
Change-Id: Ic5e559d8487fae352974b7bf57bec93812963a28
|
2020-06-10 15:48:14 +00:00 |
|