PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,329 Commits 1 Branch 0 Tags
50ecf12ece28d7d94e34e18b6c58f07b79766d1b
Commit Graph

93329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
7b6c01cf2c Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I236d8868058f70fdbe31c8da383ced210f36009d
 2021-08-09 12:51:56 +00:00
TreeHugger Robot
329b5f412e Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: Iab98e9f744d06532d382f71cd07d39a8f7f2cfe5
 2021-08-09 12:51:50 +00:00
TreeHugger Robot
4a3bbeee1a [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I51036566e38a1909f07146ea93c6df89b37805df
 2021-08-09 12:44:21 +00:00
TreeHugger Robot
876d9ec0dc [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I7922d372f0a6867af34b93bf852bdda93a6e4c7a
 2021-08-09 12:44:20 +00:00
TreeHugger Robot
82fee52083 Merge "Fix launch flags for channel panel" into sc-dev 2021-08-09 12:38:47 +00:00
TreeHugger Robot
9d509c0b31 Merge changes from topic "add_permission_wifidialog" into rvc-dev 
* changes:
  [DO NOT MERGE] Add SafetyNet logging
  [DO NOT MERGE] Add permission checking to WifiDialogActivity
 2021-08-09 12:28:48 +00:00
Weng Su
b9b493d39d [DO NOT MERGE] Add SafetyNet logging 
- Add SafetyNet log if the calling package is no the permission for
result

Test: checked eventlog in the bugreport
Bug: 185126813

Merged-In: I1535f6f2ded2445702df0d723518b773cd094164
Change-Id: I1535f6f2ded2445702df0d723518b773cd094164
(cherry picked from commit 199528d460)
 2021-08-09 12:28:31 +00:00
Weng Su
83ccc8f7c5 The wifi dialog text should be Google Sans Text 
- Add fontFamily to override the "google-sans-text" font for SUW theme
only.

Bug: 195089787
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest

Change-Id: I578658fc82ad4d25e5e2e57868cd3aeecb2ab37f
 2021-08-09 15:19:31 +08:00
Julia Reynolds
1129429a7c Fix launch flags for channel panel 
To fix the interaction with the sound picker

Test: launch sound picker from panel, ensure result saved
Test: launch sound picker from panel, cancel
Test: launch more than one panel, make sure all can be edited
Test: change sound from full channel settings page

Fixes: 195739942
Change-Id: I9df86507f8f0cfdd1b0935ca9fe056d24b6d6eac
 2021-08-09 00:55:39 +00:00
TreeHugger Robot
cb7181f164 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: 688eccdf1f -s ours am: 07a060de51 -s ours am: f8e4c546cc -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: Icb4be9e9bb8ef78a867ba967d61fb1bc92c286c1
 2021-08-08 15:19:49 +00:00
Weng Su
16178a9d01 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours am: 456c9fe228 -s ours am: fbc3469d22 -s ours am: d43fdfbae5 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: If918f8bcee995b83729335e6b82606a029807729
 2021-08-08 15:19:43 +00:00
Weng Su
2d8f2d31e2 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours am: beea2f4822 -s ours am: a1200f154c -s ours am: e2c92501e4 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Id47103d8ffccc59905104356907cc23b5d76225c
 2021-08-08 15:19:42 +00:00
TreeHugger Robot
3f4ef397f6 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: 688eccdf1f -s ours am: 93ff6ee02d -s ours am: 5b1aa5ba0e -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I256f75c787656db0a47eca9a05350591b12ff7a7
 2021-08-08 15:19:33 +00:00
Weng Su
e61392b684 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours am: 456c9fe228 -s ours am: 1ec3031b52 -s ours am: 877de6de30 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I414a7e446140c4deb35a18930638c0b87886ba4f
 2021-08-08 15:19:26 +00:00
Weng Su
96b9326ea7 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours am: beea2f4822 -s ours am: 12c3ee2331 -s ours am: 1ae40e4e61 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I9a5253d67bc96bf7f83362ed8be80208a17cc9c5
 2021-08-08 15:19:25 +00:00
TreeHugger Robot
ae05222303 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: 0bafcc8d12 -s ours am: 31cbc9a6e1 -s ours am: 4d05d6fd62 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: Icd770ed964c9820ab547597d8ce647e79e98fcfc
 2021-08-08 15:19:16 +00:00
Weng Su
953c30d3f5 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours am: e0d5070bba -s ours am: e746b094d0 -s ours am: a1a64b2735 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I3d22b06224527af38589f68e58e812bff9993980
 2021-08-08 15:19:09 +00:00
Weng Su
865ddace90 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours am: 021a09136f -s ours am: 702a1c4349 -s ours am: 968c724e46 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I8e86dc6d3b134ada190de9f4488a2f328d4af62d
 2021-08-08 15:19:06 +00:00
TreeHugger Robot
f8e4c546cc [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: 688eccdf1f -s ours am: 07a060de51 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I27de176391c4c108ea9a51a0460421ad7edeeaa0
 2021-08-08 15:07:24 +00:00
Weng Su
d43fdfbae5 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours am: 456c9fe228 -s ours am: fbc3469d22 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I0ccdc05778d936e8881a4d8e2bd78ed7c83d8193
 2021-08-08 15:07:19 +00:00
Weng Su
e2c92501e4 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours am: beea2f4822 -s ours am: a1200f154c -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Ic9a5e0e5f0c0bb6eab4339254047215fc027ffa7
 2021-08-08 15:07:18 +00:00
TreeHugger Robot
5b1aa5ba0e [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: 688eccdf1f -s ours am: 93ff6ee02d -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: Id0b06eafdeabf55c9313443fc417fe31e029edf1
 2021-08-08 15:06:58 +00:00
Weng Su
877de6de30 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours am: 456c9fe228 -s ours am: 1ec3031b52 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Iebd06949ef301c0d36babdaef2009e92fd21690e
 2021-08-08 15:06:53 +00:00
Weng Su
1ae40e4e61 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours am: beea2f4822 -s ours am: 12c3ee2331 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Ib196c3ab8c98f0456ddfb327d0c4c0aee9119859
 2021-08-08 15:06:52 +00:00
TreeHugger Robot
4d05d6fd62 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: 0bafcc8d12 -s ours am: 31cbc9a6e1 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I10035bbce2ffbda53ef01b45314edddc78e462de
 2021-08-08 15:06:46 +00:00
Weng Su
a1a64b2735 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours am: e0d5070bba -s ours am: e746b094d0 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Iaa89d0286a072443f659f3724d8381089235c7e8
 2021-08-08 15:06:34 +00:00
Weng Su
968c724e46 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours am: 021a09136f -s ours am: 702a1c4349 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I1713a700a51e08ebafd741f7c050795f0053bc26
 2021-08-08 15:06:31 +00:00
TreeHugger Robot
07a060de51 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: 688eccdf1f -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I04b2c9b2d310fff725cac43c990d674405b95440
 2021-08-08 14:55:35 +00:00
TreeHugger Robot
93ff6ee02d [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: 688eccdf1f -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I0e277297026cacb17532e35d7cbaaa937672c02c
 2021-08-08 14:55:35 +00:00
Weng Su
fbc3469d22 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours am: 456c9fe228 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I40b59b3d5ce7b631cf02b5549abfaac8f7e443f7
 2021-08-08 14:55:31 +00:00
Weng Su
1ec3031b52 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours am: 456c9fe228 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I7f1f9027136fb9d84150354d6815bb1d12fb61eb
 2021-08-08 14:55:31 +00:00
Weng Su
a1200f154c [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours am: beea2f4822 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Ia6ebd474a16609a73341ea387c8f29e3d97bb322
 2021-08-08 14:55:30 +00:00
Weng Su
12c3ee2331 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours am: beea2f4822 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I709d5e985a989324785faadcb9c7c04bcf0f6b65
 2021-08-08 14:55:30 +00:00
TreeHugger Robot
31cbc9a6e1 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: 0bafcc8d12 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I56712832e186fa81c6f4f7237a7fa1e2d5e4bd0c
 2021-08-08 14:55:21 +00:00
Weng Su
e746b094d0 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours am: e0d5070bba -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I116e0eb2f800dc3f339daa2e0b9579fa4d9234b0
 2021-08-08 14:55:11 +00:00
Weng Su
702a1c4349 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours am: 021a09136f -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I6e741ab286ba92a28d6e6678e5022008ebe543ca
 2021-08-08 14:55:10 +00:00
TreeHugger Robot
e7edac023c [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours am: e90c24580e -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I8a3478f2aa7adf6805fb4a5857baec1da82ad5bc
 2021-08-08 14:54:53 +00:00
Weng Su
41ae959c7b [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours am: 7f80c94da0 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I483b3f0f4202c660129460200d4907f3d2d112e2
 2021-08-08 14:54:47 +00:00
Weng Su
716b1b4c2a [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours am: 62bf24ec8f -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I528d35c348f82a334f2001a8924128ab51ab93f4
 2021-08-08 14:54:45 +00:00
TreeHugger Robot
688eccdf1f [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I6ecf83615758a8cc62adda6412660958011cb1a2
 2021-08-08 14:42:02 +00:00
Weng Su
456c9fe228 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I5f6641e6894120efc57f2ede0ddd856f9ac0c673
 2021-08-08 14:41:59 +00:00
Weng Su
beea2f4822 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Id639dbe0480f6de49a7a778360cc6499fe064602
 2021-08-08 14:41:58 +00:00
TreeHugger Robot
e7f4c97c1d [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: b1119ffc7c -s ours am: 0ae43531ef -s ours am: 2d1e24e446 -s ours am: c4681051da -s ours am: 307427d81a -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I68bf4f5c740b654a38448bad7fafaa65a48930e3
 2021-08-08 14:41:55 +00:00
Weng Su
3397d5e66b [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 3cb57e2769 -s ours am: 44ceeecf3f -s ours am: 28db8e5cc0 -s ours am: de9d770068 -s ours am: 618f4c2443 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I496bf7925376af6bc17a9495c5ae9c1a57ec8d9c
 2021-08-08 14:41:50 +00:00
Weng Su
cd23109783 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: d93ffd8c3a -s ours am: ead0c8eb2d -s ours am: 4740c1f4b8 -s ours am: ea3b323e4f -s ours am: 835ddb4e06 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Id9e6b0d718a81848faccbdbcae8da0e10b05db48
 2021-08-08 14:41:48 +00:00
TreeHugger Robot
09fd33dd3e [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: b1119ffc7c -s ours am: 0ae43531ef -s ours am: 2d1e24e446 -s ours am: c48d797307 -s ours am: 68f80bf14f -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: Ib009eeb946d3ef720e5fc8686847d3dbaad23120
 2021-08-08 14:41:40 +00:00
Weng Su
fb4c1ee5b3 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 3cb57e2769 -s ours am: 44ceeecf3f -s ours am: 28db8e5cc0 -s ours am: e90a5f435e -s ours am: b57703c0f3 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I9902185d7b1b0e33d3bad27886bb5b22a4be4a8f
 2021-08-08 14:41:34 +00:00
Weng Su
b6c7781c81 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: d93ffd8c3a -s ours am: ead0c8eb2d -s ours am: 4740c1f4b8 -s ours am: 403246fc30 -s ours am: acde66a494 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I490986f36f1d2f1a18962d5c564998001898af09
 2021-08-08 14:41:33 +00:00
TreeHugger Robot
4de41ea15b [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: b1119ffc7c -s ours am: 0ae43531ef -s ours am: 555070bcdd -s ours am: cd27c9ac50 -s ours am: 2ab939f5f1 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: Ib1302e972fe499929039d3ea1b92eff5bb3baead
 2021-08-08 14:41:25 +00:00
TreeHugger Robot
e90c24580e [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I303aeacc61e43ad38df648751458d22209b31244
 2021-08-08 14:41:21 +00:00