PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,224 Commits 1 Branch 0 Tags
c2e4513fb602ba753df465bb833c2026cc4e98b0
Commit Graph

73224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
c2e4513fb6 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I36829e0055437dab79d9e5339ac002a87a4b874f
 2020-08-04 18:12:48 +08:00
Bill Yi
867e9db69d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours am: d0b332ff79 -s ours am: ea02b2f8bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d47f9b5e0a62f946fc0fd846d68e8fbd29b231d
 2020-08-03 05:44:18 +00:00
Bill Yi
22799cb188 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours am: 1a2b17caf7 -s ours am: 71855b46fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae3ce4e16cc32f81193fc0260f6bd2c5fdb2244c
 2020-08-03 05:43:56 +00:00
Bill Yi
ea02b2f8bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours am: d0b332ff79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id97b06c1591f57e09ec21166e11800ae0aa6de25
 2020-08-03 05:34:42 +00:00
Bill Yi
71855b46fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours am: 1a2b17caf7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e4a71eca15320d4bfb7067de08a027d6da229a8
 2020-08-03 05:19:03 +00:00
Bill Yi
d0b332ff79 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id73c8faf93f57ad301435a2305064920f9606463
 2020-08-03 05:10:11 +00:00
Bill Yi
1a2b17caf7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a6a8305639a74cd38ada85ac059ccd002b8afa9
 2020-08-03 05:08:40 +00:00
Bonian Chen
f336c3d93c [automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours am: 692b75c3cd -s ours am: 3da8082299 -s ours am: 3adb69ca05 -s ours 
am skip reason: Change-Id I2b5b34d068ba4590f65a284d4f62a1cc77f9666f with SHA-1 590042b3ba is in history

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

Change-Id: I10b8eec2bf94aa05526712cc670ab718a34dc1dc
 2020-08-03 04:43:34 +00:00
Bonian Chen
3adb69ca05 [automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours am: 692b75c3cd -s ours am: 3da8082299 -s ours 
am skip reason: Change-Id I2b5b34d068ba4590f65a284d4f62a1cc77f9666f with SHA-1 590042b3ba is in history

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

Change-Id: Iea01c8158e2d2f7025d0d1ce1a0bf463b47b4f7f
 2020-08-03 04:32:33 +00:00
Bonian Chen
3da8082299 [automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours am: 692b75c3cd -s ours 
am skip reason: Change-Id I2b5b34d068ba4590f65a284d4f62a1cc77f9666f with SHA-1 590042b3ba is in history

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

Change-Id: I2c70947e2cf9fe38a9560f73ecbf040e66e6c659
 2020-08-03 04:11:59 +00:00
Bonian Chen
692b75c3cd [automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours 
am skip reason: Change-Id I2b5b34d068ba4590f65a284d4f62a1cc77f9666f with SHA-1 590042b3ba is in history

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

Change-Id: I5cd573731209ef02419f564e0135e70d34a04882
 2020-08-03 03:45:50 +00:00
Bonian Chen
2aba7f043e Merge "Hide sliceView if Slice is null" am: 811d654a6d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385016

Change-Id: Iffeb4e5ded6ebda5680b04afe83abd0803fb3d57
 2020-08-03 03:22:43 +00:00
Bonian Chen
811d654a6d Merge "Hide sliceView if Slice is null" 2020-08-03 03:05:03 +00:00
TreeHugger Robot
e66c8beaa5 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-03 01:44:01 +00:00
Bill Yi
8214e3f395 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7b581c7ca33a79416c26f500dfe13ebb0a9c16f4
 2020-08-02 23:32:14 +00:00
Arc Wang
3feacc9bbb [automerger skipped] Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev am: 5d86bebb32 am: 675894883c -s ours 
am skip reason: Change-Id Icf97199967faa2e359b0120a8c989bd1df2c6cea with SHA-1 21faffa23c is in history

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

Change-Id: I0f81e538d00f7e26b0dedb2cc1faeec223c017d3
 2020-08-02 13:53:24 +00:00
Arc Wang
61b043a6dd [automerger skipped] Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev am: f833684e28 am: b049b018d3 -s ours 
am skip reason: skipped by user arcwang

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

Change-Id: Iacf72797b77cc41218e2136e00377fcc15c21981
 2020-08-02 13:52:55 +00:00
Raff Tsai
53cbfe28bb Hide sliceView if Slice is null 
Fixes: 142035673
Test: robolectric, visual
Change-Id: I2b5b34d068ba4590f65a284d4f62a1cc77f9666f
Merged-In: I2b5b34d068ba4590f65a284d4f62a1cc77f9666f
 2020-08-02 12:26:10 +00:00
Arc Wang
675894883c Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev am: 5d86bebb32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271448

Change-Id: I84f736a1797e9b6b31bc007fc88df912ca9f5eeb
 2020-08-01 02:57:49 +00:00
Arc Wang
b049b018d3 Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev am: f833684e28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248953

Change-Id: I20946b3619d96eefbb23d48ba4b43b2bc68ed115
 2020-08-01 02:57:37 +00:00
Arc Wang
5d86bebb32 Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev 2020-08-01 02:34:26 +00:00
Arc Wang
f833684e28 Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev 2020-08-01 02:34:05 +00:00
Arc Wang
b3952b0826 Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" 2020-08-01 02:32:08 +00:00
Betty Chang
48b44acaa1 Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev am: b8437f1c68 am: 481db1eff9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271445

Change-Id: I468ea7573857f9ce81a7c029098d0febc4fe2d06
 2020-07-31 14:45:43 +00:00
Betty Chang
481db1eff9 Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev am: b8437f1c68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271445

Change-Id: I1739c80b479db6be75041e94716babf66d7609d6
 2020-07-31 14:33:16 +00:00
Betty Chang
b8437f1c68 Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev 2020-07-31 14:11:05 +00:00
Julia Reynolds
184271e7e4 Merge "Add 'all apps' to notification filters" 2020-07-31 14:03:33 +00:00
Al Sutton
44dd1aa26e Update OWNERS to reflect current team 
Test: CI verifies email addresses
Change-Id: I3da2759a28e715667ce594aea15508522bdd72c6
 2020-07-31 11:54:57 +01:00
Arc Wang
33cde5dbee [Wi-Fi] Remove 'Do not validate' option in CA certificate spinner 
"Do not validate" is not secure and must not be used in any production
network. R Suggestions API already does not allow connections with
no Root CA certificate.

Bug: 162466484
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
      Manually add or edit  an EAP method Wi-Fi network and observe CA
      certificate spinner options.
Change-Id: Ica5ecf8805c51d7cdce7b16e02e0dd79d5f64754
Merged-In: Icf97199967faa2e359b0120a8c989bd1df2c6cea
 2020-07-31 10:28:11 +08:00
TreeHugger Robot
dcff57ce27 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 2ce9a48f56 -s ours am: 873b675292 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: Ia2c1b4d11087808683fdb7fa8b81aa83a7d4767d
 2020-07-31 02:26:01 +00:00
TreeHugger Robot
b83c7e3014 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: eccf377941 -s ours am: 024b5785b2 -s ours am: ffb6f25613 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I1b65cf1e1f64180d3cce01fed944073579128bad
 2020-07-31 02:25:43 +00:00
TreeHugger Robot
18e4e317af [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 352e0cec50 -s ours am: 2c6bcf8b89 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: Ie74a91304170da0b93b43c44b2e201fb42f19cdb
 2020-07-31 02:25:17 +00:00
Arc Wang
8734b131fb Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" 2020-07-31 02:22:02 +00:00
Arc Wang
94b8579607 [Wi-Fi] Check if domain field is not empty when users choose a ca certificate 
Domain is required for client to validate server's certificate.
This change disable Save button for a new Wi-Fi network of a
specified CA certificate but empty domain.

Bug: 161378819
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
      manual
      1. Install a certificate.
      2. Add a new Wi-Fi network of EAP method PEAP
      3. Set CA certificate to the certificate installed at 1.
      4. Save button should be disabled.
      5. Input something in domain field.
      6. Save button should be enabled.
Change-Id: I65c8b29ec7a03b21403ddbfc087ce48c2a4a69e4
 2020-07-31 10:06:48 +08:00
TreeHugger Robot
873b675292 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 2ce9a48f56 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I220a2a387723eb74e6cdd22c86b6ab2d7a7e0e68
 2020-07-31 02:05:46 +00:00
TreeHugger Robot
ffb6f25613 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: eccf377941 -s ours am: 024b5785b2 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I95798437b0a7f1bb33decf85210d008c9e7c49ba
 2020-07-31 02:05:02 +00:00
TreeHugger Robot
2c6bcf8b89 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 352e0cec50 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: Icb046278ddeed700303792caaba38dfe1c66bbc4
 2020-07-31 02:04:35 +00:00
Arc Wang
21faffa23c [Wi-Fi] Remove 'Do not validate' option in CA certificate spinner 
"Do not validate" is not secure and must not be used in any production
network. R Suggestions API already does not allow connections with
no Root CA certificate.

Bug: 162466484
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
      Manually add or edit  an EAP method Wi-Fi network and observe CA
      certificate spinner options.
Change-Id: Icf97199967faa2e359b0120a8c989bd1df2c6cea
 2020-07-31 09:58:20 +08:00
TreeHugger Robot
024b5785b2 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: eccf377941 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I8491880cb9ad719a9f4b7507f04932cdd1e391d2
 2020-07-31 01:48:08 +00:00
TreeHugger Robot
2ce9a48f56 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: Id6362bc0a6bc8c81a6618249460e5baa258eda89
 2020-07-31 01:48:06 +00:00
TreeHugger Robot
352e0cec50 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I7ef267b59cb7cdc483c51a571e98d90ec37036e5
 2020-07-31 01:46:38 +00:00
TreeHugger Robot
26bcb5227a [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-dev am: 5894b6fff0 -s ours am: 4de63443e5 -s ours am: 757bb926c4 -s ours am: 68670e66bb -s ours am: a0b71099a1 -s ours am: bfb77aad73 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I21d87a2ce7cc863f8e04010365309d3260fb4bf4
 2020-07-31 01:29:11 +00:00
TreeHugger Robot
f271d9e28a [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: dd285067fa -s ours am: 8c2af47193 -s ours am: 35fb5bd2d2 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: Ic20ba09a83b2a6be9042c72923401786b568b76a
 2020-07-31 01:28:32 +00:00
TreeHugger Robot
03c99f4243 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-dev am: 5894b6fff0 -s ours am: 4de63443e5 -s ours am: 757bb926c4 -s ours am: a39609069d -s ours am: 656da9da88 -s ours am: 60fa4115a3 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: Idd92f7052a696183bbde5e3de70241535c5b96d3
 2020-07-31 01:27:30 +00:00
TreeHugger Robot
eccf377941 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I61c7eac90eca4440f210da976b3476851ae7720a
 2020-07-31 01:27:07 +00:00
TreeHugger Robot
2c6cc855a4 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: Ia25d559c8ece4cb3f8ac07634be18031f96aa6e9
 2020-07-31 01:26:59 +00:00
TreeHugger Robot
16f97498c0 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: 1c64519a1b -s ours am: c1c90a2f95 -s ours am: fb020898bb -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I257426ce41c34603dad97cd6b491107bf6667ae1
 2020-07-31 01:18:45 +00:00
TreeHugger Robot
f8512ccafd [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-dev am: 5894b6fff0 -s ours am: 4de63443e5 -s ours am: 757bb926c4 -s ours am: a39609069d -s ours am: b6ef1c8a8e -s ours am: a6695c6a6b -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I83c4d1c6bb7a09747a78b08b01293b01aabf5ef9
 2020-07-31 01:17:31 +00:00
TreeHugger Robot
ab5ba2ac03 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: 1c64519a1b -s ours am: 83244c0722 -s ours am: 5917f239f6 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I116e5ee8ade5e2ff428d35b362baa511aea9b76d
 2020-07-31 01:14:06 +00:00
TreeHugger Robot
1229c54068 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: f3f682446d -s ours am: 08d93061f5 -s ours am: ecb9abf8fc -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: Id3d1b2e5f09b3cbd159e84a8fcde43f4111a4707
 2020-07-31 01:09:55 +00:00