Commit Graph

474494 Commits

Author SHA1 Message Date
Automerger Merge Worker
a48836618e Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: f7400c5481 am: c390eec125 am: 6b5e69c06e
Change-Id: I21faf9500c72d97a06d4aabb20924c4e5324194a
2020-03-03 03:48:10 +00:00
Automerger Merge Worker
2efd300073 Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: 9b96c10ace am: 7f9619239b am: 413480e16c
Change-Id: I8440f578133fc420932a084899943aced144c4a6
2020-03-03 03:47:45 +00:00
Automerger Merge Worker
2d359f0c39 Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into rvc-dev am: 4812dfa61f am: 63c8366fa7 am: 07289e10ba am: 5fbf9ce694
Change-Id: I2bb2b0bcb21d482bf054fcdef49ba9a6e207c715
2020-03-03 03:47:29 +00:00
Automerger Merge Worker
8b3ab92301 Merge "Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into rvc-dev am: 4812dfa61f am: 33915af911" into rvc-d1-dev-plus-aosp am: dc2e24d3c0 am: 660d90530a
Change-Id: Ib6a6700e40da3a9842ccd134cda1191a2c4f7829
2020-03-03 03:47:15 +00:00
Automerger Merge Worker
a29906abd3 Merge "Update nintendo joystick layout" into rvc-dev am: cada936a36 am: ee5248c7b5 am: 02af9b4b2f am: 28c5f354a0
Change-Id: Ia71483ed9ed38a64cfcf450c15c4b8ba165241a4
2020-03-03 03:46:57 +00:00
Automerger Merge Worker
35d75027ba Merge "Split setSystemSelectionChannels" into rvc-dev am: ca8c810a9d am: 96bef3b385 am: 5ab79ab375 am: a0598e6402
Change-Id: I9ea3395fd3fe6be3d41ade1c4da68c5d829c3c19
2020-03-03 03:46:39 +00:00
Automerger Merge Worker
c2b6508648 Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev am: 580f82768c am: 7ec42d503d am: 1e186b03fe am: 6101374c76
Change-Id: If61721a37303bf9e8f61b33f95b4ffebb686402a
2020-03-03 03:46:17 +00:00
Automerger Merge Worker
eb246cf920 Merge "Quick fix for possible deadlock in LMS" into rvc-dev am: 45b8146ae8 am: 98c1646443 am: 4ec5b2f0ff am: 5d2e7f95e9
Change-Id: I418c5c6b5321913989f090afb03be541c73324a4
2020-03-03 03:45:44 +00:00
Automerger Merge Worker
579d9548b2 Merge "Uses SurfacePackage instead of SurfaceControl on inline suggestion" into rvc-dev am: 78160dc4c0 am: 3878dd4d3e am: 47521236d8 am: 644cdfa4d4
Change-Id: I40b23b6c921477ebe3df371af6584dc6821e3af6
2020-03-03 03:45:19 +00:00
Automerger Merge Worker
f0b59d697d Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: 9b96c10ace am: 9d5a681c71 am: b8e9e861a1
Change-Id: I6abb65cd41265cb4e3a88150517ea5a2b2f37e18
2020-03-03 03:45:04 +00:00
Automerger Merge Worker
c104dbe8eb Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into rvc-dev am: 4812dfa61f am: 33915af911 am: 09969e15a7 am: 469936f3ae
Change-Id: I6ebbc8b9f934af685d0b332d3292b26e32edee53
2020-03-03 03:43:30 +00:00
Automerger Merge Worker
60eaabc6d8 Merge "Update nintendo joystick layout" into rvc-dev am: cada936a36 am: c6fef615fe am: 0d42e10d54 am: ec179e77d5
Change-Id: I643611e5ff8f6f925a56befc6531170a538bbfe6
2020-03-03 03:42:08 +00:00
Automerger Merge Worker
fddc4a51ce Merge "Update nintendo joystick layout" into rvc-dev am: cada936a36 am: c6fef615fe am: acbae15aad am: 16179eb08b
Change-Id: I488f4187c612480d266160fe55a9353280ba7d07
2020-03-03 03:40:02 +00:00
Automerger Merge Worker
6b5e69c06e Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: f7400c5481 am: c390eec125
Change-Id: Iff6b06ea33607080c7d03a37a50aa04d9ef53248
2020-03-03 03:24:50 +00:00
Automerger Merge Worker
413480e16c Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: 9b96c10ace am: 7f9619239b
Change-Id: Ie24831f82339ba97ac83cc724efaf0347e7d392b
2020-03-03 03:24:23 +00:00
Automerger Merge Worker
5fbf9ce694 Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into rvc-dev am: 4812dfa61f am: 63c8366fa7 am: 07289e10ba
Change-Id: I547340903dca2b52afa70b6ba1d498f0474feb5d
2020-03-03 03:24:07 +00:00
Automerger Merge Worker
660d90530a Merge "Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into rvc-dev am: 4812dfa61f am: 33915af911" into rvc-d1-dev-plus-aosp am: dc2e24d3c0
Change-Id: Ibac562d48d9d435213f63083cb6a7ac1ae11276c
2020-03-03 03:23:58 +00:00
Automerger Merge Worker
28c5f354a0 Merge "Update nintendo joystick layout" into rvc-dev am: cada936a36 am: ee5248c7b5 am: 02af9b4b2f
Change-Id: I17f4feabb49205c4e720289ee742b27f8799f411
2020-03-03 03:23:30 +00:00
Automerger Merge Worker
a0598e6402 Merge "Split setSystemSelectionChannels" into rvc-dev am: ca8c810a9d am: 96bef3b385 am: 5ab79ab375
Change-Id: I0c0394da7aa1edef53db8152415788d2c70ebbb9
2020-03-03 03:23:24 +00:00
Automerger Merge Worker
6101374c76 Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev am: 580f82768c am: 7ec42d503d am: 1e186b03fe
Change-Id: I27e642652eba497533a7059cfe0dd03549def379
2020-03-03 03:23:11 +00:00
Automerger Merge Worker
5d2e7f95e9 Merge "Quick fix for possible deadlock in LMS" into rvc-dev am: 45b8146ae8 am: 98c1646443 am: 4ec5b2f0ff
Change-Id: I939ba1ae9f42a575553fb331d82ac7d946afa34d
2020-03-03 03:23:00 +00:00
Automerger Merge Worker
644cdfa4d4 Merge "Uses SurfacePackage instead of SurfaceControl on inline suggestion" into rvc-dev am: 78160dc4c0 am: 3878dd4d3e am: 47521236d8
Change-Id: I53508213aec32c36e59e7d37a88de7ca52aea924
2020-03-03 03:22:44 +00:00
Automerger Merge Worker
b8e9e861a1 Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: 9b96c10ace am: 9d5a681c71
Change-Id: Id580a1ad59151c645ffe9f64bfc1d53716abf6c6
2020-03-03 03:22:31 +00:00
Automerger Merge Worker
469936f3ae Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into rvc-dev am: 4812dfa61f am: 33915af911 am: 09969e15a7
Change-Id: I572580e79263e3901b22c019571fbf14ddde81eb
2020-03-03 03:22:20 +00:00
Automerger Merge Worker
5ab79ab375 Merge "Split setSystemSelectionChannels" into rvc-dev am: ca8c810a9d am: 96bef3b385
Change-Id: Iebbd1ca4cfef3849cda5ecb8f97b3246403249e4
2020-03-03 03:22:16 +00:00
Automerger Merge Worker
ec179e77d5 Merge "Update nintendo joystick layout" into rvc-dev am: cada936a36 am: c6fef615fe am: 0d42e10d54
Change-Id: I6ea47be8e642aa3b3503ac31da6b33aa5c373b21
2020-03-03 03:22:12 +00:00
Automerger Merge Worker
1e186b03fe Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev am: 580f82768c am: 7ec42d503d
Change-Id: Idd6e42929ce11810ef7ecbea01e1a5e31c869422
2020-03-03 03:22:05 +00:00
Automerger Merge Worker
4ec5b2f0ff Merge "Quick fix for possible deadlock in LMS" into rvc-dev am: 45b8146ae8 am: 98c1646443
Change-Id: I9ef9324125f29405b985b88167fe18e0cb37e748
2020-03-03 03:21:54 +00:00
Automerger Merge Worker
47521236d8 Merge "Uses SurfacePackage instead of SurfaceControl on inline suggestion" into rvc-dev am: 78160dc4c0 am: 3878dd4d3e
Change-Id: Ifdf0b51c2511c13313dcd29f991f7a371b72464e
2020-03-03 03:21:45 +00:00
Automerger Merge Worker
16179eb08b Merge "Update nintendo joystick layout" into rvc-dev am: cada936a36 am: c6fef615fe am: acbae15aad
Change-Id: I374a2a39faeb60e8519613765fec744c203ce7f8
2020-03-03 03:21:40 +00:00
Automerger Merge Worker
9d5a681c71 Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: 9b96c10ace
Change-Id: I26c6ceb6f08be4bf77e1d4c8737b14beb580c231
2020-03-03 03:21:18 +00:00
Automerger Merge Worker
96bef3b385 Merge "Split setSystemSelectionChannels" into rvc-dev am: ca8c810a9d
Change-Id: I3867c68011003c5b0c1db4876ba78ae8dfb26910
2020-03-03 03:21:17 +00:00
Automerger Merge Worker
c390eec125 Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: f7400c5481
Change-Id: I00fe9cba55bd4b4ffb360ce3ac84d39d5e8579df
2020-03-03 03:21:13 +00:00
Automerger Merge Worker
7f9619239b Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: 9b96c10ace
Change-Id: Id7607a3c81f2d7e046170f2da2c9d01259fb3a75
2020-03-03 03:20:52 +00:00
TreeHugger Robot
ca8c810a9d Merge "Split setSystemSelectionChannels" into rvc-dev 2020-03-03 03:18:55 +00:00
TreeHugger Robot
853823717d Merge "Log permission mismatch with 128s emergency extension" 2020-03-03 03:07:16 +00:00
Automerger Merge Worker
7ec42d503d Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev am: 580f82768c
Change-Id: I8ba9fd6e3c07708940e73f31c77371aa11a7312d
2020-03-03 03:02:55 +00:00
Automerger Merge Worker
98c1646443 Merge "Quick fix for possible deadlock in LMS" into rvc-dev am: 45b8146ae8
Change-Id: Ie9f6bf7be41826da6e49044f0d258e4df0a069ce
2020-03-03 03:02:40 +00:00
Automerger Merge Worker
3878dd4d3e Merge "Uses SurfacePackage instead of SurfaceControl on inline suggestion" into rvc-dev am: 78160dc4c0
Change-Id: I495a191e64336967e1e55e3f5bfa57b5179dfb2e
2020-03-03 03:02:28 +00:00
Automerger Merge Worker
f7400c5481 Merge "Drop the hardware buffer" into rvc-dev am: 494960e818
Change-Id: Ic3600043f31daba9f4ebe7bd905a12d1eeb722ce
2020-03-03 03:02:22 +00:00
Automerger Merge Worker
9b96c10ace Merge "Drop the hardware buffer" into rvc-dev am: 494960e818
Change-Id: I169a91e7af002fd014233ff29eafd67aaae149be
2020-03-03 03:01:51 +00:00
TreeHugger Robot
580f82768c Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev 2020-03-03 03:01:27 +00:00
TreeHugger Robot
45b8146ae8 Merge "Quick fix for possible deadlock in LMS" into rvc-dev 2020-03-03 02:59:15 +00:00
Automerger Merge Worker
a9ffacaae8 Merge "[Wi-Fi] Default enable WifiTracker2 feature flag" into rvc-dev am: d03c6ac27e am: 01f9f95b91 am: e5a212425d am: bdc667281d
Change-Id: I8e551a71e84a5255e00e565b724c1d932d732d50
2020-03-03 02:58:28 +00:00
Automerger Merge Worker
edbf03939b Merge "Hides FEATURE_CONTEXT_HUB from Android SDK" into rvc-dev am: 6c46c74576 am: bdc7da35d6 am: c8e8d958d2 am: 61f6b9ac22
Change-Id: Ia25426f3d51656994404447e677943bfbc2c1335
2020-03-03 02:58:18 +00:00
Automerger Merge Worker
f938a1cf5a Merge "[Wi-Fi] Default enable WifiTracker2 feature flag" into rvc-dev am: d03c6ac27e am: e15e5f9902 am: b9795c54f0 am: 34920045b6
Change-Id: Ifa41d74de34f27551920c1dd2211fb239c97d407
2020-03-03 02:58:10 +00:00
Automerger Merge Worker
499d5938fd Merge "Merge "Hides FEATURE_CONTEXT_HUB from Android SDK" into rvc-dev am: 6c46c74576 am: 7073a280ab am: 217a4752b0" into rvc-qpr-dev-plus-aosp am: 03da9dd34e
Change-Id: Ib149cd9403e4bc609977b15b86674f3472946f71
2020-03-03 02:57:58 +00:00
Automerger Merge Worker
8d5ddc21dc Merge "[Wi-Fi] Default enable WifiTracker2 feature flag" into rvc-dev am: d03c6ac27e am: 01f9f95b91 am: 15972ba04e am: 24c1cbe1ea
Change-Id: I6dfb5b8a153287091cc5739ddace6af094055048
2020-03-03 02:57:23 +00:00
Automerger Merge Worker
07289e10ba Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into rvc-dev am: 4812dfa61f am: 63c8366fa7
Change-Id: I6e8f0b94d716e1eff9bdb96f2e215bd297dac8d1
2020-03-03 02:57:18 +00:00
Automerger Merge Worker
dc2e24d3c0 Merge "Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into rvc-dev am: 4812dfa61f am: 33915af911" into rvc-d1-dev-plus-aosp 2020-03-03 02:57:14 +00:00