Remi NGUYEN VAN
f40f71ccf1
Replace isWeaklyValidatedHostname with guava
...
The guava implementation is more accurate than the basic NetworkUtils
implementation.
NetworkUtils is being moved to its own JAR and will not be available
from Settings.
Bug: 174436414
Test: m
Wrote test for isWeaklyValidatedHostname, verified it passes with
guava
Change-Id: I1d01f2beba36009e17f651652e2d7f57be5aa398
2020-12-08 14:02:17 +09:00
TreeHugger Robot
84d4237008
Merge "Fix advanced device icon won't update issue"
2020-12-08 02:29:37 +00:00
tim peng
cf4d295959
[automerger skipped] Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev am: de2f2754d9
am: 32ef316678
-s ours
...
am skip reason: Change-Id Ibfc11e1bd99ba2e578b5d9e7dcc9132e372b68dd with SHA-1 1268629fda
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136219
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d9bf7bb9ad136975ec302c751cdf792311893f3
2020-12-08 02:18:14 +00:00
tim peng
32ef316678
Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev am: de2f2754d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136219
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4c0ebb50dd2caaeabb1f39549a80d1de0890201
2020-12-08 01:09:56 +00:00
tim peng
de2f2754d9
Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev
2020-12-08 00:55:21 +00:00
Xiao Ma
379cd8a008
Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev am: a63d8db293
am: b48fffc33b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13170053
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I151c304b623cdb937eb4a208a3c72cf50440e9eb
2020-12-08 00:52:31 +00:00
Xiao Ma
b48fffc33b
Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev am: a63d8db293
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13170053
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib822c372af03860a63533ec44638389fb25e2ffb
2020-12-08 00:37:18 +00:00
Xiao Ma
a63d8db293
Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev
2020-12-08 00:15:53 +00:00
TreeHugger Robot
d3aec37f3a
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours am: a9892de23f
am: 85f6ce8e71
am: d6d4c2ac64
am: 7787e22dd3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie16930e02e4035de7386f96704c7232317afee18
2020-12-07 21:33:03 +00:00
Eugene Susla
d3e3a6c931
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours am: bfee0284e1
am: a5da16b1d6
am: bbad7cee9c
am: cd191477c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7fd01ec8b19ba20712ef08de5c8d3af82a274489
2020-12-07 21:32:58 +00:00
Eugene Susla
57109fabe4
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours am: 40961e80cd
am: cf7f335294
am: edad8243b0
am: 39075b350e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4775c57fedc48283efa881b53f9e6b0f6b4152a
2020-12-07 21:29:24 +00:00
Eugene Susla
82f96447bb
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
am: 03b269ea1d
am: f0ecfe2cfc
am: ff7de9afd8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I9bfff26e054703d8409ffdb9b0f56460af89257b
2020-12-07 21:11:36 +00:00
Xin Li
69cc5c5f5c
[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: 07ccb42665
am: 4a0b338a72
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13177007
Change-Id: Id80c3398d66311d0edc77e90ec6858951579ea1a
2020-12-07 21:10:22 +00:00
TreeHugger Robot
7787e22dd3
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours am: a9892de23f
am: 85f6ce8e71
am: d6d4c2ac64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9675f55bc51baea068c6487f0a3fe7da7235aa6b
2020-12-07 21:08:45 +00:00
Eugene Susla
cd191477c8
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours am: bfee0284e1
am: a5da16b1d6
am: bbad7cee9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I153982db74a0316f1ac09bb2b6c72c1ac6bd282e
2020-12-07 21:08:42 +00:00
Eugene Susla
39075b350e
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours am: 40961e80cd
am: cf7f335294
am: edad8243b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idf07ef6acf26be8079fd48d4af4311c7b38f330a
2020-12-07 21:08:33 +00:00
Eugene Susla
e5aa21505a
[automerger skipped] RESTRICT AUTOMERGE am: bfa7a75545
am: d67e22c122
am: 31505ca0b3
am: 337aa8dbf3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688
Change-Id: I0612610111fcc8200a095677398f80a59f8c968f
2020-12-07 21:07:38 +00:00
Wesley.CW Wang
4212a5ef6c
[automerger skipped] Add Battery Defender feature to Settings am: 7ccb54feb6
am: 974f359a26
-s ours
...
am skip reason: Change-Id Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a with SHA-1 9a6aae5006
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13108999
Change-Id: I3c7679781dede71b336f7784129425484a19985f
2020-12-07 21:07:28 +00:00
TreeHugger Robot
a54f9ca3fd
[automerger skipped] Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev am: 9ccf19cb9f
am: cbbc224e4d
-s ours
...
am skip reason: Change-Id I2726a3deb397f646e4c74a8c445dde6fafb694a8 with SHA-1 3a7293cbbf
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109545
Change-Id: Iae9edb41aed3f609cba43bb677baad53f38b3c53
2020-12-07 21:07:14 +00:00
Xin Li
f471b344ec
[automerger skipped] DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 835215964f
am: c19e729570
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13176357
Change-Id: Ie076452445c1d73178c12cea269743276f48dcdf
2020-12-07 20:56:11 +00:00
TreeHugger Robot
d6d4c2ac64
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours am: a9892de23f
am: 85f6ce8e71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I17f588dc8bcd527b9f43492bc6437ac3d7dbff7f
2020-12-07 20:54:43 +00:00
Eugene Susla
bbad7cee9c
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours am: bfee0284e1
am: a5da16b1d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I69282d3c13d0bc4652beddc4823384a9817f148f
2020-12-07 20:54:40 +00:00
Eugene Susla
edad8243b0
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours am: 40961e80cd
am: cf7f335294
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac627656862cbf1348a29e7401c98e6fa74cba33
2020-12-07 20:54:30 +00:00
TreeHugger Robot
0ddc1960f9
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours am: a9892de23f
am: b31cea60bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I982b0735f4a515253361e4601faedf4dc571a5f9
2020-12-07 20:54:06 +00:00
Eugene Susla
8e5ad81a1a
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours am: bfee0284e1
am: 7177969533
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a013bb4f521b99f9401a18ff3a8b103f0c54215
2020-12-07 20:54:04 +00:00
Eugene Susla
afaf245575
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours am: 40961e80cd
am: 330028f0e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0471330b152d497cbe0ca5fbecabfd1b7a4d2183
2020-12-07 20:53:52 +00:00
TreeHugger Robot
b31cea60bf
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours am: a9892de23f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
Change-Id: Idcb1a917bc0388248671d7fcd155a5319ebf94cc
2020-12-07 20:23:10 +00:00
Eugene Susla
7177969533
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours am: bfee0284e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
Change-Id: I705f8bfdfecc8b9bf505a717074c02bf734b4af9
2020-12-07 20:23:08 +00:00
Eugene Susla
330028f0e0
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours am: 40961e80cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
Change-Id: I918e38d9e29f56581088a56770a2067345458199
2020-12-07 20:23:01 +00:00
TreeHugger Robot
85f6ce8e71
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours am: a9892de23f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I65d77c3c623f4c4ee099e0814db1d30cda2af6dd
2020-12-07 20:22:50 +00:00
Eugene Susla
a5da16b1d6
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours am: bfee0284e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3914c813a2c1fb40afd9fa8704d103ce74a0a80
2020-12-07 20:22:47 +00:00
Eugene Susla
cf7f335294
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours am: 40961e80cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I66c2806838f41b9e5fd022fd126e65773ae125cd
2020-12-07 20:22:32 +00:00
TreeHugger Robot
a9892de23f
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a415856595ff465a67d7312d2d9c09a410e87af
2020-12-07 20:02:48 +00:00
Eugene Susla
bfee0284e1
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8bb775b57acd051c5ce9658cdb0faeac152890f
2020-12-07 20:02:46 +00:00
Eugene Susla
40961e80cd
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I67d0a5b8803ed1480752f1bd82852ce4d5ad8e13
2020-12-07 20:02:31 +00:00
TreeHugger Robot
2aa9a43701
Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
Change-Id: I5bd01274e4f00a8f7666a364323525faa60e3251
2020-12-07 19:28:33 +00:00
Eugene Susla
c8d81959a2
RESTRICT AUTOMERGE am: 2e82aa5d05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
Change-Id: I850120ab85fa938ebce7115c778b833b5266594c
2020-12-07 19:28:31 +00:00
Eugene Susla
24ec36b6e8
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
Change-Id: I633b0e35a224055ca9f07de627322f48065a234e
2020-12-07 19:28:24 +00:00
TreeHugger Robot
a91519976e
Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev
2020-12-07 19:19:14 +00:00
Eugene Susla
22864c728b
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
Change-Id: I689123f39fc3399d71f873025605319131ff19ab
2020-12-07 19:01:56 +00:00
Eugene Susla
74ca730b4a
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
Change-Id: Idd2522623b35128ccc207d99d21371aefa0c4454
2020-12-07 18:47:31 +00:00
Julia Reynolds
fcfc260cf5
Merge "Stop depending on empty Settings"
2020-12-07 18:31:26 +00:00
Jiashen Wang
8b113cb74a
Merge "[SIM Dialog Migration] Sending push notification after DSDS reboot"
2020-12-07 18:31:06 +00:00
Jiashen Wang
ea5ef92219
Merge "[SIM Dialog Migration] Enable SIM operation dialog in Settings"
2020-12-07 18:31:02 +00:00
Jiashen Wang
9c14ca798a
Merge "Fix the dialog presist issue after toggling pSIM"
2020-12-07 18:30:44 +00:00
Eugene Susla
ff7de9afd8
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
am: 03b269ea1d
am: f0ecfe2cfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I2e8e5d8d7a9d2cb78d7bf7dee9c3a7787dce3550
2020-12-07 18:18:36 +00:00
Eugene Susla
7e23f84f86
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
am: 1d609a5c58
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I51ed92c6fdb3f220d35f103442e38de394cd64ba
2020-12-07 18:05:39 +00:00
Eugene Susla
f0ecfe2cfc
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
am: 03b269ea1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I635d9648a8facd4383de1eea4890f8ad43ddf289
2020-12-07 18:05:24 +00:00
Eugene Susla
1d609a5c58
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: I2b946cac02eadf48759cd1111b1396a4f96edb5a
2020-12-07 17:37:46 +00:00
Eugene Susla
03b269ea1d
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours am: 7bd20e27ab
am: 90a1422f8c
-s ours am: 5dcdc8c8f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: Ife51a5f9684c6f7fa5ce49a976c522bb0871913e
2020-12-07 17:36:41 +00:00