Commit Graph

83753 Commits

Author SHA1 Message Date
Hugh Chen
7f4a301b88 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours am: 48ceb503d8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: Id62683035962b0c8df55c61fb574c5e86025ad06
2021-06-28 06:42:17 +00:00
Hugh Chen
3e51c20e21 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: 4c2b189379 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: Ibe216a5f6ac77ae34c00eaf915c34397833fd71d
2021-06-28 06:42:13 +00:00
Hugh Chen
49d4c89944 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: I19651eae9672ae29ed50c9b795626b49d062f557
2021-06-28 06:37:50 +00:00
Hugh Chen
f41af1a1e3 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: If1c2a27ab396564127b1bd4d2030ff0a308d9fee
2021-06-28 06:37:47 +00:00
Hugh Chen
48ceb503d8 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I245db30a5d520b326015747008037cfaf9f10351
2021-06-28 06:37:37 +00:00
Hugh Chen
4c2b189379 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: I8d51b562c0610f609892dd56fe81d70edbbf4109
2021-06-28 06:37:33 +00:00
Hugh Chen
c6362e92e8 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: Ia9b38945171dae15032adfce0b20756aa32c478b
2021-06-28 06:37:13 +00:00
Hugh Chen
e849d212b7 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141

Change-Id: I607bc56a88f50087d9e466eaad9a67d0f016463d
2021-06-28 06:37:12 +00:00
Hugh Chen
3f2394bbc7 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: I810f4769b8a1c55306af2d8fbda1da427a06f48b
2021-06-28 06:37:08 +00:00
Hugh Chen
368ba20c95 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140

Change-Id: I3967969e09f69542cc461ca818d5024e7fe33f48
2021-06-28 06:37:08 +00:00
Hugh Chen
a539c36421 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I60bd575da426261bfcd112ac4b69d4efe15c6ad2
2021-06-28 06:37:04 +00:00
Hugh Chen
dbcebc42bf [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: Icd57778b71e3ff3f2300fdd0f335373bd7fce4cd
2021-06-28 06:37:00 +00:00
Hugh Chen
ff719d5bd8 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: bee2daea18 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I8a2a91ce7420f647f5b6c3a76a31686049ba3011
2021-06-28 06:36:30 +00:00
Hugh Chen
60beadd631 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I14dceb2e7d17451f831bdf124387a4e76d744579
2021-06-28 06:36:23 +00:00
Hugh Chen
a0446cb1cc [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: a11ed686d4 -s ours am: bc51750bf1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: Id03d0cce6c878671ca3a311a0a8f581cb116db53
2021-06-28 06:27:29 +00:00
Hugh Chen
09a4146c6c [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc am: 91d5f08e39 -s ours am: 9eef0e089d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: Ibfbee35f0109ee3b7d2bf1f239dc1e421711f478
2021-06-28 06:26:57 +00:00
Hugh Chen
0cfe42b287 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: Ibf35314504458240ec753c062f284225508701bd
2021-06-28 06:19:08 +00:00
Hugh Chen
367921a80d [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: I315047b2c175ac29474ad3b0a261d26d2745e4d8
2021-06-28 06:19:04 +00:00
Hugh Chen
499cfe303f [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I3a2ddb2b2f8a2050dc017d2e3b4d9cf840d3a7dc
2021-06-28 06:18:59 +00:00
Hugh Chen
87426af532 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: I8d89f0ac05df88cd680a15e8c64c2133b1619e53
2021-06-28 06:18:56 +00:00
Hugh Chen
bc51750bf1 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: a11ed686d4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I47d3d52d1f11879e049bef336d0dde464b5de048
2021-06-28 06:18:50 +00:00
Hugh Chen
9eef0e089d [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc am: 91d5f08e39 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I4ce2d29b73bd2db7ba3cb74cad46515eba64e425
2021-06-28 06:18:45 +00:00
TreeHugger Robot
5af1f843fd [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev am: 9c105d911a -s ours am: 85524a7276 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021916

Change-Id: Idde460477b38afbfaaa6cd6229f1db0b822b0c09
2021-06-28 06:18:09 +00:00
TreeHugger Robot
29a15a436d [automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a67a -s ours am: 1c6594bcd4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016136

Change-Id: I54a0befc24198d6f88f4deedb755fd577fda89cd
2021-06-28 06:18:05 +00:00
Hugh Chen
bee2daea18 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I28b33a8286af88bc1b494cd325cb946e9ccca554
2021-06-28 06:15:26 +00:00
Hugh Chen
76545f383c [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours
am skip reason: skipped by user hughchen

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: Ieec3c3403fe68257bbd3c04ec2395af202e2b28d
2021-06-28 06:15:18 +00:00
Hugh Chen
c551f39977 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141

Change-Id: Ifef9d53b072a081c2c78437e4bc77e511024092a
2021-06-28 06:14:41 +00:00
Hugh Chen
9316df9560 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140

Change-Id: Ic3ca73d1126a07c955e10b7871b9ccec0038b60d
2021-06-28 06:14:38 +00:00
Hugh Chen
3fcb9c9811 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: I265d8d2c13c97463ba2d9449e68925199b90be3c
2021-06-28 06:14:35 +00:00
Hugh Chen
9f4308daa2 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: Ia1ad9ee7da0a972a3a97aca68d2fb8b6f3061d24
2021-06-28 06:14:30 +00:00
Hugh Chen
505cc44596 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: Ic4237a93471f2064896492eb607447620c0fc21a
2021-06-28 06:07:26 +00:00
Hugh Chen
1fe494db11 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: If38bb4a7880b0771648410c2dc11285e07008b34
2021-06-28 06:07:20 +00:00
Hugh Chen
a11ed686d4 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I66e622edb04b797035548be5e8e5bff1585d44a1
2021-06-28 06:07:14 +00:00
Hugh Chen
91d5f08e39 RESTRICT AUTOMERGE Update string am: 9356205dfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I39be0753d272bcde0b4ade53ae3afc74a67155f8
2021-06-28 06:07:09 +00:00
TreeHugger Robot
85524a7276 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev am: 9c105d911a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021916

Change-Id: Id5025c35217126e88af7d100fff6960699d3ae94
2021-06-28 06:06:38 +00:00
TreeHugger Robot
1c6594bcd4 [automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a67a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016136

Change-Id: I675c537b664572cdd7a097aa0516dfd6fce6055b
2021-06-28 06:06:32 +00:00
Hugh Chen
d351303e36 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I311472b1f9d27cc4a7da875150741f0eb51e573f
2021-06-28 06:06:01 +00:00
Hugh Chen
3f493a3078 RESTRICT AUTOMERGE Update string am: 7ce80425ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: I9c8fabb01ea2cf69b2714523b361f50a5a597561
2021-06-28 06:05:58 +00:00
TreeHugger Robot
9c105d911a Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev 2021-06-28 05:55:46 +00:00
TreeHugger Robot
b2b280a67a Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev 2021-06-28 05:55:26 +00:00
Bonian Chen
40a93c2511 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev am: f4a80fdfa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15120295

Change-Id: I01d1c9a907097c944f68829bc0ff9d68eebd1435
2021-06-28 05:42:19 +00:00
Bonian Chen
f4a80fdfa3 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev
* changes:
  Revert "[Settings] Fix build breakage"
  Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..."
2021-06-28 05:28:07 +00:00
Bonian Chen
4c4d8e3a08 Revert "[Settings] Fix build breakage"
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ifb1a579863df157b41aebbdf59ad7e4584efa866
2021-06-28 05:23:33 +00:00
Bonian Chen
69fc8e0ccd Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..."
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ib830b7b00504264a703a03a00bfdfcf65135d394
2021-06-28 05:23:33 +00:00
TreeHugger Robot
3110021f51 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: I14c08d87c5895a6962142a226d52f3ed6fbf7b84
2021-06-28 04:37:57 +00:00
TreeHugger Robot
3d5fd19e9f Merge "Consistent color between status bar and app bar" into sc-dev 2021-06-28 04:25:09 +00:00
Bonian Chen
aaea164675 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I43500208af3d17787ad7065cfe05735486ef2cce
2021-06-28 04:02:18 +00:00
Bonian Chen
b45ea80636 [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785

Change-Id: I3d56a66613cb0b2a6b187f9be672d9b03f5385a1
2021-06-28 04:02:17 +00:00
Bonian Chen
c437177d4b Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev 2021-06-28 03:59:43 +00:00
Bonian Chen
bf4120f3f8 Merge "[Settings] Fix build breakage" into sc-dev 2021-06-28 03:59:43 +00:00