Christopher Tate
1e2ed9cad0
[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours am: 1f14278834 am: 53aea4a3ad -s ours am: 4780dc3cb3 -s ours
...
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886
Change-Id: Ie97b6e0934f101553a1157df7111d2f847e38129
2020-08-28 00:20:14 +00:00
Chris Tate
9cb0c58fb0
[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours am: 629705299c am: 2f50ed96f0 -s ours am: 75a8d3033e -s ours
...
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886
Change-Id: Ida8d1991c1d63a8cc258532504801a39a68560ee
2020-08-28 00:20:04 +00:00
Christopher Tate
12dc02e15b
[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours am: 1f14278834 am: 53aea4a3ad -s ours am: 4780dc3cb3 -s ours
...
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886
Change-Id: Ic81bee15d0c66e92285d247f7b090eba9edb106a
2020-08-28 00:20:02 +00:00
Chris Tate
f9920fdcee
[automerger skipped] Merge "Only autoVerify at install for new hosts" into oc-mr1-dev am: 178b57c5c5 am: e4b7d4c8ac am: 3214fcfb81 am: 42c911a8d8 -s ours am: c9c3789db6 -s ours
...
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11692559
Change-Id: I9d1624105cfe801cad30e56c247a118f2959171c
2020-08-28 00:19:58 +00:00
Chris Tate
26a8265584
[automerger skipped] Merge "Only autoVerify at install for new hosts" into oc-mr1-dev am: 178b57c5c5 am: e4b7d4c8ac am: 3214fcfb81 am: 42c911a8d8 -s ours am: c9c3789db6 -s ours
...
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11692559
Change-Id: I18277d02adee531aa36662274a45e1821b909285
2020-08-28 00:19:46 +00:00
Chris Tate
1e8c7faa55
[automerger skipped] Merge "Only autoVerify at install for new hosts" into pi-dev am: 417f48f0f8 -s ours am: 0e78a7b16b am: 3f92d05734 -s ours am: b722c3b36d -s ours
...
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694357
Change-Id: Id0f9a1c8293efe50c7651975baae62b79b99ad56
2020-08-28 00:19:35 +00:00
Chris Tate
0bba18e675
[automerger skipped] Merge "Only autoVerify at install for new hosts" into pi-dev am: 417f48f0f8 -s ours am: 0e78a7b16b am: 3f92d05734 -s ours am: b722c3b36d -s ours
...
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694357
Change-Id: I5034f4033adbf9c1ef46c1c500ce4d44f5f42f80
2020-08-28 00:19:21 +00:00
Patrick Baumann
bb5558fe58
[automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb am: 83fac841f8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10938446
Change-Id: I3d5317bf0c37e855829aa8bf4e4ce6ec327e76b9
2020-08-28 00:08:20 +00:00
Winson Chiu
bd3635bd35
Merge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev am: 1fac778d66 am: cbb60db519 am: eac7fa225b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886043
Change-Id: Ibd75271d095b83bd49e4bfa2d44951e4309c8f22
2020-08-28 00:08:07 +00:00
Chris Tate
75a8d3033e
[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours am: 629705299c am: 2f50ed96f0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886
Change-Id: Iff3ec4e5b0e9f8170b60787673d6613364b0002a
2020-08-28 00:07:14 +00:00
Christopher Tate
4780dc3cb3
[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours am: 1f14278834 am: 53aea4a3ad -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886
Change-Id: I3c90fb68984936afcf4f063188371745d6c7bc8c
2020-08-28 00:07:10 +00:00
Chris Tate
c9c3789db6
[automerger skipped] Merge "Only autoVerify at install for new hosts" into oc-mr1-dev am: 178b57c5c5 am: e4b7d4c8ac am: 3214fcfb81 am: 42c911a8d8 -s ours
...
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11692559
Change-Id: I03164c18d6c42fde6195214e8ce3776294667d6d
2020-08-28 00:06:43 +00:00
Chris Tate
b722c3b36d
[automerger skipped] Merge "Only autoVerify at install for new hosts" into pi-dev am: 417f48f0f8 -s ours am: 0e78a7b16b am: 3f92d05734 -s ours
...
am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694357
Change-Id: Ic800569e317dc218fd4c5a70a5fafd687c0a33b3
2020-08-28 00:06:12 +00:00
Patrick Baumann
83fac841f8
[automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10938446
Change-Id: Ifbb1b1d6c87c1c115ba6556dea99da05f5965dff
2020-08-27 23:54:10 +00:00
Winson Chiu
eac7fa225b
Merge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev am: 1fac778d66 am: cbb60db519
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886043
Change-Id: I9950021b62e50bbcb2b20a3ec4861720878eaf9b
2020-08-27 23:54:02 +00:00
Chris Tate
2f50ed96f0
[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours am: 629705299c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886
Change-Id: I82e80214c7824764a5c195b7907ec6f24ab7a774
2020-08-27 23:53:49 +00:00
Christopher Tate
53aea4a3ad
[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours am: 1f14278834
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886
Change-Id: I4b6157fb88287213266eca92debc11c1fe4d7b3c
2020-08-27 23:53:47 +00:00
Treehugger Robot
45fc27021c
[automerger skipped] Merge "Inherit source windowing mode in some cases." am: 530fa56bc0 am: 7c30bea5af -s ours am: e55c204242 -s ours
...
am skip reason: Change-Id Ib1b75145c0b0b38b07bcde2ca66a1d772a2c2d0f with SHA-1 2517de66a9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412208
Change-Id: I1ac1ee5af6187473caaee003561f4f47eb1a108a
2020-08-27 23:53:33 +00:00
Chris Tate
42c911a8d8
Merge "Only autoVerify at install for new hosts" into oc-mr1-dev am: 178b57c5c5 am: e4b7d4c8ac am: 3214fcfb81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11692559
Change-Id: I6053713b377918726c1f1f740fa6b42a8b45a142
2020-08-27 23:53:15 +00:00
Chris Tate
3f92d05734
[automerger skipped] Merge "Only autoVerify at install for new hosts" into pi-dev am: 417f48f0f8 -s ours am: 0e78a7b16b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694357
Change-Id: I0a5be37d02b31698cf354220ced1594b96006537
2020-08-27 23:52:56 +00:00
Patrick Baumann
5daea910bb
[automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10938446
Change-Id: Ib07731f1f57714962d312f458dc4c966edcdc970
2020-08-27 23:37:39 +00:00
Winson Chiu
cbb60db519
Merge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev am: 1fac778d66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886043
Change-Id: Ib2e6c3e5696aa01579ebfe49be4d5ef71b0f4af9
2020-08-27 23:37:26 +00:00
Chris Tate
629705299c
[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886
Change-Id: I6b463e35bb2a39869af2103d4d43cead5f55d6e4
2020-08-27 23:37:04 +00:00
Christopher Tate
1f14278834
[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689886
Change-Id: I43ebd0b7d4093cea1d9b2ec157005639ebc57ea4
2020-08-27 23:37:01 +00:00
Chris Tate
3214fcfb81
Merge "Only autoVerify at install for new hosts" into oc-mr1-dev am: 178b57c5c5 am: e4b7d4c8ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11692559
Change-Id: I3454c7dad47ea9901131d921d6fbe270dec3ddc5
2020-08-27 23:36:13 +00:00
Chris Tate
0e78a7b16b
[automerger skipped] Merge "Only autoVerify at install for new hosts" into pi-dev am: 417f48f0f8 -s ours
...
am skip reason: skipped by user ctate
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694357
Change-Id: I53e5c13f67952bfab83926ee5140d07d2b61c47e
2020-08-27 23:35:41 +00:00
Treehugger Robot
e55c204242
[automerger skipped] Merge "Inherit source windowing mode in some cases." am: 530fa56bc0 am: 7c30bea5af -s ours
...
am skip reason: Change-Id Ib1b75145c0b0b38b07bcde2ca66a1d772a2c2d0f with SHA-1 2517de66a9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412208
Change-Id: I527e39ba0680df548c07322a82d4a7bae84daa2d
2020-08-27 23:33:53 +00:00
zoey chen
c647fa10a9
[TelephonyMainline] Make getMergedSubscriberIdsFromGroup as System API and rename it
...
Bug: 145584030
Test: make
Merged-In: I6c077f3bee6bfd4d5b215aca4e9b19b719772b29
Change-Id: I6c077f3bee6bfd4d5b215aca4e9b19b719772b29
2020-08-27 15:57:57 -07:00
Treehugger Robot
7c30bea5af
Merge "Inherit source windowing mode in some cases." am: 530fa56bc0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412208
Change-Id: I13d8cc8acc9eb60ddcb4e8e5aa2afa6376d7e36f
2020-08-27 22:36:40 +00:00
Treehugger Robot
530fa56bc0
Merge "Inherit source windowing mode in some cases."
2020-08-27 22:15:13 +00:00
Alec Mouri
c1942afbff
Correctly expose EGL_ANDROID_native_fence_sync to hwui
...
When we moved off of gui/SyncFeatures for retrieving this extension, we
accidentally didn't include the eglQueryStringImplementationANDROID path
for retrieving extensions. Fortunately this extension is only used for
TextureView synchronization, but we should still use the extension when
available.
Bug: 159921224
Test: Manually inject log statements to verify the extension is
correctly visible.
Change-Id: Idaa872778afc13e86bdea918da8631b4747fe9c1
(cherry picked from commit 49d87e5c07 )
Merged-In: Idaa872778afc13e86bdea918da8631b4747fe9c1
2020-08-27 22:02:27 +00:00
Treehugger Robot
aee8e7d310
Merge "CEC : Add method for check range" am: aaae72e029 am: 92acccbbcd am: 704c2bb241
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413607
Change-Id: I4a2a8b2d47ccd44c42399192d7561812ea759c3f
2020-08-27 20:44:09 +00:00
Treehugger Robot
704c2bb241
Merge "CEC : Add method for check range" am: aaae72e029 am: 92acccbbcd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413607
Change-Id: I016e9f1d0959542b906dec15d8af618ab34b556c
2020-08-27 20:25:35 +00:00
Treehugger Robot
92acccbbcd
Merge "CEC : Add method for check range" am: aaae72e029
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413607
Change-Id: I280c1b508c2065eb570f92f1e6d2e799d4f8ac44
2020-08-27 20:05:53 +00:00
Treehugger Robot
aaae72e029
Merge "CEC : Add method for check range"
2020-08-27 19:11:33 +00:00
Shraddha Basantwani
689f6e99ae
CEC : Add method for check range
...
Test: make
Bug: 159901363
Change-Id: Iae07802a8f8770892b0175babaebe9a7c5873c8b
2020-08-27 17:06:25 +05:30
Treehugger Robot
84d6557c88
[automerger skipped] Merge "DO NOT MERGE: GNSS: Add a check of SIM presence to GnssConfig" am: d09cf27486 -s ours am: 7bdeaf1905 am: ed0a5432eb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399175
Change-Id: Ic634bb1bb76710fbcdc42536d1702f2f4f82358a
2020-08-26 20:56:27 +00:00
Treehugger Robot
ed0a5432eb
[automerger skipped] Merge "DO NOT MERGE: GNSS: Add a check of SIM presence to GnssConfig" am: d09cf27486 -s ours am: 7bdeaf1905
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399175
Change-Id: I33f0de26f9e394e216a6e890468c0ced3a9367f3
2020-08-26 20:43:02 +00:00
Treehugger Robot
7bdeaf1905
[automerger skipped] Merge "DO NOT MERGE: GNSS: Add a check of SIM presence to GnssConfig" am: d09cf27486 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399175
Change-Id: Ib99e4ed3feafc7fc91f48060e282d8d56729457c
2020-08-26 20:26:33 +00:00
Treehugger Robot
d09cf27486
Merge "DO NOT MERGE: GNSS: Add a check of SIM presence to GnssConfig"
2020-08-26 20:07:35 +00:00
Roman Hakh
df4111c2ab
DO NOT MERGE: GNSS: Add a check of SIM presence to GnssConfig
...
There are functions in the GnssConfiguration class that load and apply
GNSS properties from a carrier configuration file. But these properties
are related to SUPL and LPP that are used in cell phones.
Therefore, need to check the presence of SIM in device before
printing error messages.
Bug: 163993486
Test: $ adb logcat | grep 'Unable to set ES_EXTENSION_SEC: 0'
to make sure that properties weren't applied.
Signed-off-by: Roman Hakh <roman.hakh@globallogic.com >
Change-Id: I173c8d614c1e2923f478698ffd6a806b04dcbf27
2020-08-26 18:18:17 +00:00
Josh Hou
63358f50c6
Merge "Allow call forwarding number with prefixes to be dialed while on IMS roaming" am: 1f17c75beb am: 514a9e40d8 am: e45b4aa21d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393116
Change-Id: I7c98cc6f4a2a29408090f6a886812bb373d3d40f
2020-08-26 18:13:15 +00:00
Josh Hou
e45b4aa21d
Merge "Allow call forwarding number with prefixes to be dialed while on IMS roaming" am: 1f17c75beb am: 514a9e40d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393116
Change-Id: I7a4a90761deea319355c7900ae8e78777455924c
2020-08-26 17:19:24 +00:00
Garfield Tan
6a036e211f
Inherit source windowing mode in some cases.
...
We allow freeform windows on fullscreen displays launch activities in
freeform windows if they'll be on the same display.
Bug: 139274544
Bug: 163178199
Test: FreeformWindowingModeTests#testFreeformWindowManagementSupport
passed on fullscreen display.
Test: atest WmTests:TaskLaunchParamsModifierTests
Change-Id: Ib1b75145c0b0b38b07bcde2ca66a1d772a2c2d0f
Merged-In: Ib1b75145c0b0b38b07bcde2ca66a1d772a2c2d0f
2020-08-26 10:19:07 -07:00
Josh Hou
514a9e40d8
Merge "Allow call forwarding number with prefixes to be dialed while on IMS roaming" am: 1f17c75beb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393116
Change-Id: Ic0af4ae22d42b0d689e972f28fe937a6ed78ba28
2020-08-26 17:00:40 +00:00
Josh Hou
1f17c75beb
Merge "Allow call forwarding number with prefixes to be dialed while on IMS roaming"
2020-08-26 16:32:53 +00:00
Wilson Wu
e1f053984a
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with Android's inclusive language guidance" am: d62396372c -s ours am: e4c0dbb8d8 am: d89656e3bf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398973
Change-Id: I744e07a163b09a22ad2135362da1a4f3058f7e02
2020-08-26 10:58:59 +00:00
Wilson Wu
d89656e3bf
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with Android's inclusive language guidance" am: d62396372c -s ours am: e4c0dbb8d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398973
Change-Id: I45f19b6b8a1ea764cbdd07b4d3064398c2cbdc37
2020-08-26 10:28:19 +00:00
Wilson Wu
e4c0dbb8d8
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with Android's inclusive language guidance" am: d62396372c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398973
Change-Id: Ic05ea2011efe84d0416a64d78a9c94ead4830b79
2020-08-26 10:13:35 +00:00
Wilson Wu
d62396372c
Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with Android's inclusive language guidance"
2020-08-26 09:49:03 +00:00