Automerger Merge Worker
e9272dc787
Merge "Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: 928e81ae49" into rvc-d1-dev-plus-aosp am: 93dc50a6df am: 47315c0651
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Ida513b562d07a80a1b782de314330f3e1ab688bf
2020-06-11 18:44:19 +00:00
Joshua Duong
dc71644772
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: b84cafa24c am: ac85fec739 am: 7e59ac6b3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Ie0a766b6264b2d2be801ca587d5d4bd5b085be84
2020-06-11 18:44:02 +00:00
TreeHugger Robot
f3c20305fb
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: 4327cd65cc am: 38aaa31584 am: 54f86cfc61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: I9e1c1df385b75ad0469b23de904db23ef3298aa1
2020-06-11 18:43:25 +00:00
Joshua Duong
dec3d00370
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: b84cafa24c am: 4e3d96116f am: 95326e7f31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Icc817959eeb559d89c3f8b0bc7d14481de919b36
2020-06-11 18:41:48 +00:00
TreeHugger Robot
581716a9ef
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: b299d90b7f am: 266700a7a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: I1fe9134d62d240bf3c4edcac990acddd88bc9f0e
2020-06-11 18:23:33 +00:00
TreeHugger Robot
95c1934376
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: 4327cd65cc am: f836c42063
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: Idfd05075c197965f7c8092021fdc26b67d666481
2020-06-11 18:21:19 +00:00
Automerger Merge Worker
47315c0651
Merge "Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: 928e81ae49" into rvc-d1-dev-plus-aosp am: 93dc50a6df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Ic783aa228c98f02d3cf823a4f9b7c01cc8c96044
2020-06-11 18:20:14 +00:00
Joshua Duong
7e59ac6b3d
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: b84cafa24c am: ac85fec739
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Id30aa42c7fcca2d479c14bbc67b4f7d176ac2a36
2020-06-11 18:19:30 +00:00
TreeHugger Robot
54f86cfc61
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: 4327cd65cc am: 38aaa31584
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: I7a9fd26057bf32433c35026dc0ed08a19ec3058e
2020-06-11 18:11:16 +00:00
Joshua Duong
95326e7f31
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: b84cafa24c am: 4e3d96116f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Ia9fd81d14025536c5a53a9c68112f55c866953b5
2020-06-11 18:10:29 +00:00
TreeHugger Robot
266700a7a4
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: b299d90b7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: I8ddca6ec04857daed135d72bfd0aa2bfebc770f6
2020-06-11 17:56:47 +00:00
TreeHugger Robot
38aaa31584
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: 4327cd65cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: Icf50cfb1ae51a07c3ac86b183f53607ea8ea69d1
2020-06-11 17:56:19 +00:00
TreeHugger Robot
f836c42063
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6 am: 4327cd65cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: Idafdf6a714a9c35f92a21684de3aeb941f772e12
2020-06-11 17:56:12 +00:00
Automerger Merge Worker
93dc50a6df
Merge "Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: 928e81ae49" into rvc-d1-dev-plus-aosp
2020-06-11 17:55:46 +00:00
Joshua Duong
4e3d96116f
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: b84cafa24c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: I67d23dafeb10db85c0b07a746c540dbf2dffd318
2020-06-11 17:55:40 +00:00
Joshua Duong
41c3dc79df
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: 928e81ae49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: I419b3b9af1fa6df8484dd9f5238d8a251cb0422f
2020-06-11 17:55:36 +00:00
Joshua Duong
ac85fec739
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: b84cafa24c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Idb0fee5e98d8618634eace2b5adabc65997c7cf9
2020-06-11 17:55:24 +00:00
TreeHugger Robot
4327cd65cc
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: Icc6c824db2ad89a8a18fdcdcd595afc4f406aa6d
2020-06-11 17:37:14 +00:00
Joshua Duong
b84cafa24c
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: Ib5e569614e15f5c39590fc40a18b2673e45f9767
2020-06-11 17:36:49 +00:00
TreeHugger Robot
b299d90b7f
Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410
Change-Id: I88d711322b1b3ea5f4e50f534bab68e7a5b17b96
2020-06-11 17:36:29 +00:00
Joshua Duong
928e81ae49
Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521
Change-Id: If2438ebe5f39ba9543d3a74d27e71902f6f93c4e
2020-06-11 17:36:19 +00:00
TreeHugger Robot
d6081039c6
Merge "Don't pass channel info for the bubble app page" into rvc-dev
2020-06-11 17:23:56 +00:00
Joshua Duong
63facb88bd
Merge "[adbwifi] Handle tls port changes." into rvc-dev
2020-06-11 17:23:00 +00:00
Chen Xu
dd3324a326
rename "Emergency Alert" to "Public Warning" per IT requirements
...
Follow Italy Government requirements to rename setting string for
emergency alerts
Bug: 158094274
Test: Manual
Change-Id: Id969d0f6f9c0282ef3c122ef3ea04a64646024fe
2020-06-11 10:10:05 -07:00
markchien
17feecffae
Replace ConnectivityManager as TetheringManager
...
Tethering APIs are all move to TetheringManager from Android R.
1. Replace ConnectivityManager tethering API usage as TetheringManager.
2. Use TetheringManager#stopTethering to disable usb tethering instead
of using deprecated ConnectivityService#setUsbTethering
3. Use TetheringManager#stopTethering to disable bluetooth tethering
instead of directly use BluetoothPan#setBlueoothTethering. So bluetooth
getProfileProxy is not needed in TetherService because tethering would
do that when calling #stopTethering.
4. Also support TETHERING_ETHERNET entitlement check that
TETHERING_ETHERNET is new added from Android R.
Bug: 146918263
Test: atest TetherServiceTest
Change-Id: Id969f29d7210f2ee32719c76439049bbc86cd4f6
2020-06-11 23:36:59 +08:00
Mady Mellor
87e16f416f
Don't pass channel info for the bubble app page
...
Fixes: 157485149
Test: make SettingsUnitTests; adb shell am instrument etc
Change-Id: If8d9b446ed056996cda91fcc5e92c7077ff3ea5d
2020-06-11 08:33:45 -07:00
markchien
257b9bcdfa
Remove schedule recheck logic from TetherService
...
This change just remove unused code.
Tethering no longer ask TetherService to schedule recheck
(use #EXTRA_SET_ALARM) from Android Q. Intead Tethering
(EntitlementManager) would schedule the recheck by itself.
This change is necessary in order to move the resourcesout
of the framework because TetherService needs to know when
it need to re-run entitlement recheck from framework res
(config_mobile_hotspot_provision_check_period).
Bug: 146918263
Test: atest TetherSerivceTest
Change-Id: Ie45859c19b96d0689c45dd610501fae0506742ff
2020-06-11 23:28:49 +08:00
Automerger Merge Worker
e2e4f5a45d
Merge "Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: 7b63dda831 am: 2c24c39737" into rvc-qpr-dev-plus-aosp am: 4a0a7b5e45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: I1f98641df7707681a4f2352c635ea0bf7d769d66
2020-06-11 12:25:33 +00:00
TreeHugger Robot
89570dc404
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79 am: f7bc707706 am: c385b4a380
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: I29c7c429974790b082d0b3af4a195721079dfbe5
2020-06-11 12:25:05 +00:00
TreeHugger Robot
ea4404bb1e
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79 am: eb4a0e7507 am: 777ff5f628
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: I5bf1286dfc43cbb919153288321f25a871d1595c
2020-06-11 12:24:52 +00:00
Automerger Merge Worker
4a0a7b5e45
Merge "Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: 7b63dda831 am: 2c24c39737" into rvc-qpr-dev-plus-aosp
2020-06-11 12:07:13 +00:00
TreeHugger Robot
95717194cb
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: 7b63dda831 am: 2c24c39737
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: I02170a6200e60501a7bf6b87f8a2deae13135fe6
2020-06-11 12:07:08 +00:00
TreeHugger Robot
c385b4a380
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79 am: f7bc707706
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: I04d21e587164189d6a1b0a893f3640c21f810517
2020-06-11 12:07:04 +00:00
TreeHugger Robot
777ff5f628
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79 am: eb4a0e7507
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: I68b300ab243690514ab14d7ba61f636f039c2a57
2020-06-11 12:06:53 +00:00
TreeHugger Robot
2c24c39737
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: 7b63dda831
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: Ib7a077eadb53639139e49b7a63fb8591bc1a3c0d
2020-06-11 11:52:07 +00:00
TreeHugger Robot
eb4a0e7507
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: I30c4b2324ca889084e5040525da4250a24c410c2
2020-06-11 11:51:58 +00:00
TreeHugger Robot
f7bc707706
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: I25fdf7734b3cbd1f8d06333a1c9e78221afe809b
2020-06-11 11:51:55 +00:00
TreeHugger Robot
7b63dda831
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: I7d8fb6ae02a41c2cc76241e3d3cd3252dbc8d459
2020-06-11 11:32:02 +00:00
TreeHugger Robot
a4b29edb79
Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499
Change-Id: I1b1af2087e995308c505d0945fcfd099f44e5349
2020-06-11 11:32:00 +00:00
TreeHugger Robot
ae1ed2508a
Merge "Add a new SettingsCategoryPreference style" into rvc-dev
2020-06-11 11:16:55 +00:00
Jason Chiu
3c3f362125
Improve BT slice card loading performance
...
The bottleneck is getting LocalBluetoothManager the first time.
1. Initialize LocalBluetoothManager earlier and asynchronously.
2. Don't block in slice's constructor and getSlice().
- Initialize the bt updaters until the manager is ready.
- Just show a header if the manager is not ready yet.
Fixes: 157702021
Test: robotest
Change-Id: I427df55f259b45ba4c37557b22e09dcc24079e93
2020-06-11 18:39:29 +08:00
Automerger Merge Worker
e6dbeccec1
Merge "Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9" into rvc-qpr-dev-plus-aosp am: 6780306ec1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: Ia21b19dc03ca5c41f245ece90a71a294f9fb6601
2020-06-11 10:26:19 +00:00
András Klöczl
d209f1e782
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: cfe3027432 am: 28fd271f02 am: 6c9f5797c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: Ic951f913a15aab58cef686b19ccc4ac46f9f1947
2020-06-11 10:26:01 +00:00
András Klöczl
e551663f17
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: 4e2a9a04e3 am: 46bfb08216
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I4cdd72a6dbca4d802ed8c3ea13d7e0b1777fbec3
2020-06-11 10:25:37 +00:00
Automerger Merge Worker
6780306ec1
Merge "Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9" into rvc-qpr-dev-plus-aosp
2020-06-11 09:57:59 +00:00
András Klöczl
1b3e5c7aed
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: b04ad237c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: Ic015fa7828a7c32a4238a8cf3deeacf384dc6da5
2020-06-11 09:57:50 +00:00
András Klöczl
6c9f5797c4
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: cfe3027432 am: 28fd271f02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I6c4c422029277e7d23a5a39ef79b037cc14d3a01
2020-06-11 09:57:49 +00:00
András Klöczl
46bfb08216
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2 am: 4e2a9a04e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I4db1231c83ca921c975f1ef273c4e650e6ff3f23
2020-06-11 09:57:38 +00:00
András Klöczl
28fd271f02
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: cfe3027432
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: I4a3c91a7a33147753764d93ed307c5cf166ac101
2020-06-11 09:35:32 +00:00
András Klöczl
4e2a9a04e3
Merge "Change user setup prompt dialog showing logic" into rvc-dev am: f8754b4deb am: 974efbd7f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686951
Change-Id: Idf895f299526d9eacdd139d8dbe77e98c22d1e1d
2020-06-11 09:35:24 +00:00