Age | Commit message (Collapse) | Author |
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2737414
Change-Id: I270c2326c99fdd5caf2b9a6516ed978bdf0f6297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
|
|
main am: 65953636f9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2729801
Change-Id: I3fddd28ac3e324a38f6a1371e824c1bc08fe8006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
main
|
|
PD#SWPL-101172
Problem:
The timing of IPv4 and IPv6 acquisition is not synchronous.
UI will be updated only one time that tiggered by faster one
Solution:
With the registerDefaultNetworkCallback callback function,
both IPv4 and IPv6 are updated when available
Verify:
By local
Change-Id: Ic0a85da5d3fa975dd521012e88f255d7f687133a
Signed-off-by: honghai.song <honghai.song@amlogic.com>
|
|
Merged-In: I7dd3e12e549228223ed8c8aac71e6d1faf94f487
Change-Id: I4bbe56f13e24d4dd0b53268e768a9cbcfd18fb96
|
|
-s ours am: 735617bf42 -s ours am: 71944816f2 -s ours
am skip reason: Merged-In Ia911a28790d57cfb1d1f5cb3aa2982c1be75ea77 with SHA-1 9fc38efae7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2777089
Change-Id: I7dd3e12e549228223ed8c8aac71e6d1faf94f487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours am: 735617bf42 -s ours
am skip reason: Merged-In Ia911a28790d57cfb1d1f5cb3aa2982c1be75ea77 with SHA-1 9fc38efae7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2777089
Change-Id: I2ca01f0f79d4af1acdab533e6cee4d7c91b029ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours
am skip reason: Merged-In Ia911a28790d57cfb1d1f5cb3aa2982c1be75ea77 with SHA-1 9fc38efae7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2777089
Change-Id: If0f264ce28475a7ba0ed02a9ada02be9350b87c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am skip reason: Merged-In Ia911a28790d57cfb1d1f5cb3aa2982c1be75ea77 with SHA-1 9fc38efae7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2777089
Change-Id: Ideb799f2a754a2e3cf5daa6e76f8a517ed83f0b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Bug: 298295554
Merged-In: Ia911a28790d57cfb1d1f5cb3aa2982c1be75ea77
Change-Id: I0b4153397444932421cd7f69ed668d2f935d758c
|
|
Added callback in BluetoothDevicesService to trigger
refresh in ConnectedDevicesSliceProvider when receiving
BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED.
Needed to ensure that the subtitle for a connected
or disconnected Bluetooth menu item is correct.
Bug: 298653577
Test: Go to Settings > Remotes & Accessories > Pair accessory.
Connect a BT device, e.g. a headset.
Expected: Device connected. New device menu item added with
sub title "Connected". Has preview with menu item "Disconnect".
Disconnect BT device.
Expected: Device disconnected. Device menu item sub title changed
to "Disconnected". Preview has menu item "Connect".
Connect BT device.
Expected: Device connected. Device menu item sub title changed
to "Connected". Preview has menu item "Disconnect".
Repeat the two previous steps a few times.
Change-Id: I99368b1f5918c783ade0572a8acea604579f47bf
|
|
am: 2d79b03316 am: 5ef407ecc1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2677035
Change-Id: Ib0b0369637acb84b62b9418efe2727f8cb6c851a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 2d79b03316
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2677035
Change-Id: I8ebfb7afefb53aad5f2d8e2f308a73620f8f42bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2677035
Change-Id: Idde9c0cec9ff7e5c9090c7e4decdcef207bb88a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2677035
Change-Id: Ia3863699f061f625cbe77eb041f87a6754e58ff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 0817d5043f -s ours am: baa13b9c87 -s ours
am skip reason: Merged-In I02f8adcaa5e053974fd74dec2957cdc9ce128f10 with SHA-1 aa81ce7651 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/24182477
Change-Id: Ifc200030f59773b56c5bcb16d6475484ac069336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 0817d5043f -s ours
am skip reason: Merged-In I02f8adcaa5e053974fd74dec2957cdc9ce128f10 with SHA-1 aa81ce7651 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/24182477
Change-Id: I02204d2749feb47a3ec63eeaa1cc739eccc5dfc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am skip reason: Merged-In I02f8adcaa5e053974fd74dec2957cdc9ce128f10 with SHA-1 aa81ce7651 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/24182477
Change-Id: I9d85485ee4c90bf389b7dfb95aa8fc0bf773e1da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Bug: 291102124
Merged-In: I02f8adcaa5e053974fd74dec2957cdc9ce128f10
Change-Id: I3fd615f7c0ec58c34949452cceabcf0052b17779
|
|
Known/official devices should be hidden from the generic Bluetooth
accessories section and should only visible in the OEM-
partner-implemented Slice.
Bug: 293200558
Test: Specify a BT device label in Settings/res/values/config.xml >
known_bluetooth_device_labels.
Go to Settings > Remotes & Accessories > Pair accessory.
Put the BT device in pairing mode.
The BT device should not be visible in the list of pairing devices.
Change-Id: Ia911a28790d57cfb1d1f5cb3aa2982c1be75ea77
|
|
01540fa549 -s ours am: ddaa82ca12 -s ours am: c4465217cc -s ours am: 7687cb7b13 -s ours
am skip reason: Merged-In I79845da00c625e40e412ae21fd3da945b87d4b64 with SHA-1 5d51a6f224 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2635408
Change-Id: I9e8929bd88e34bd6f75df7682a06e1ea7740f099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours am: 961a7933cf -s ours am: 65fb3ad088 -s ours am: 63f852cd76 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: I910f7c5b271ede558d8a6940439cb3b827326ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
01540fa549 -s ours am: ddaa82ca12 -s ours am: c4465217cc -s ours
am skip reason: Merged-In I79845da00c625e40e412ae21fd3da945b87d4b64 with SHA-1 5d51a6f224 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2635408
Change-Id: I5643cfea7c080d8bd177c758711d7a955c1fadb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
01540fa549 -s ours am: ddaa82ca12 -s ours
am skip reason: Merged-In I79845da00c625e40e412ae21fd3da945b87d4b64 with SHA-1 5d51a6f224 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2635408
Change-Id: I4b2cd72840078c349eccc9c1cb231e904921e728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours am: 660ce88d54 -s ours am: fcaf4efc5b -s ours am: d11abd193b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: I824df141b5f7d8f20f56fce09458cbcc32273fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours am: 961a7933cf -s ours am: 65fb3ad088 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: I2fc48af123dce76ad0236eda014c29ead0b564b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
01540fa549 -s ours
am skip reason: Merged-In I79845da00c625e40e412ae21fd3da945b87d4b64 with SHA-1 5d51a6f224 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2635408
Change-Id: Ia3e329ec61b9069d125de78158c7cd3ec7e0ab29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours am: 660ce88d54 -s ours am: fcaf4efc5b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: I5734cb7d06d8db992c7696afa4cf5b59da432fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am skip reason: Merged-In I79845da00c625e40e412ae21fd3da945b87d4b64 with SHA-1 5d51a6f224 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2635408
Change-Id: I56a6f480020c3c93e14a945036fed5fb0beb0ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
udc-qpr-dev am: 24424bfce6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23792139
Change-Id: I5a66e7234de3eca5191cf1d9a05d8e0582038d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
e9b017a2dc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23792139
Change-Id: I9c40a67729729089f218d24339706e60167f4714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
|
|
udc-d1-dev am: dab92f77cd -s ours am: 97238e62db -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791516
Change-Id: I19b4201c42df983944cd6908f0879f974d86b729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
bd29fc1c05 -s ours am: 2da045d4dc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791516
Change-Id: If6c32ff81416a6ba8850166ac3fcf74c09eabdad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
udc-d1-dev am: dab92f77cd -s ours am: e50ff277b1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791516
Change-Id: If5fdffea1f2e58611fcaf9db5853855dbd0a9c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
bd29fc1c05 -s ours am: 80f4c1aa11 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791516
Change-Id: I8469a5befb70c8768adb8bc003d5c629435948a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
udc-d1-dev am: dab92f77cd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791516
Change-Id: I127866b5cc658b265974411906b3786a4ce80944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
bd29fc1c05 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791516
Change-Id: I7b1c56e7abe52c599151f05b63e34949f424e2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
udc-d1-dev am: dab92f77cd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791516
Change-Id: Idd5bebea31c968574bd2ea40131d96f7b36d08e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
bd29fc1c05 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791516
Change-Id: I9cf48bd24f0f1febcaedf1ce5463355d8620cb7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
|
|
3a3c1b1ba6 -s ours am: 660ce88d54 -s ours am: 805dc6ba02 -s ours am: def48efb97 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: Ibe850c6804d23b3c21f5b49277831b583cadf176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours am: 660ce88d54 -s ours am: 805dc6ba02 -s ours am: bf97dec955 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: Ifc96dd9cec4f756a2d3b7cce92aaa3a7a26ab827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours am: 961a7933cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: Ic4c4299831bd98cbedfcaa8a8929d87c5ee448cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours am: 660ce88d54 -s ours am: 805dc6ba02 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: Ib2b80b9ff5d631feba458b4ef1a06ee23e191e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours am: 660ce88d54 -s ours am: 805dc6ba02 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: I862546f0b46ead423da9712f71bc4f67cc5aab12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours am: 660ce88d54 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: I0008b622c8cc0f15a3d3d0ac3c6fd6cb1ae8cd01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: I593fd8440ea136bfbdf578a9f811f97d45ac9059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
3a3c1b1ba6 -s ours am: 660ce88d54 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/23791517
Change-Id: Ib6f19b5a724d4a94f8d3fdc4abdbc1702a607de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|