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

93298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
518a63fd83 [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: 2f5424ba2c -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: Ibfcafd612f7875541cdb8a01a5973a6f3953c9ce
 2021-08-08 14:12:37 +00:00
TreeHugger Robot
2d1e24e446 [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 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: I8707b6e063a9730b0e34be8f00848d8ee51b51de
 2021-08-08 14:04:28 +00:00
Weng Su
28db8e5cc0 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 3cb57e2769 -s ours am: 44ceeecf3f -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: Iaf597118a86d0f25832a06b5f1a7c059f53e195a
 2021-08-08 14:04:23 +00:00
Weng Su
4740c1f4b8 [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 skip reason: skipped by user wengsu

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

Change-Id: I1baba5810c5753e651792db6ce52aab6a9b9ae60
 2021-08-08 14:04:23 +00:00
TreeHugger Robot
310afc56fb [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 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: I0b753a2b821093afab682c17985d02ca50172f4f
 2021-08-08 14:03:47 +00:00
TreeHugger Robot
555070bcdd [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 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: I8ca95141902cef14dfdbf2d6677fb10c5a358934
 2021-08-08 14:03:42 +00:00
Weng Su
8de45e2c78 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 3cb57e2769 -s ours am: 44ceeecf3f -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: I4d804c38976d04e9d9257d00dc24b2d41ac0b31a
 2021-08-08 14:03:42 +00:00
Weng Su
2f5424ba2c [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 skip reason: skipped by user wengsu

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

Change-Id: I9832592fe099e2248dd3e3ab695976cf2137b45e
 2021-08-08 14:03:41 +00:00
Weng Su
eae6ec79e3 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 3cb57e2769 -s ours am: 44ceeecf3f -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: Ie39e155402d9df57deabb2788b425d2757d2480c
 2021-08-08 14:03:37 +00:00
Weng Su
47a2b175e9 [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 skip reason: skipped by user wengsu

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

Change-Id: Iaffa3b2a5437d48e59d23446d904dc1bcfd61610
 2021-08-08 14:03:36 +00:00
TreeHugger Robot
0ae43531ef [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 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: Ic6f4a9f4af7a15d86aa7f7569141875590f91192
 2021-08-08 13:54:13 +00:00
Weng Su
44ceeecf3f [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 3cb57e2769 -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: I8593c428c1337dd5f331af664fd6b14e79733785
 2021-08-08 13:54:08 +00:00
Weng Su
ead0c8eb2d [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: d93ffd8c3a -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: I6f6f7d911c9d769e4e47727540fc4691319a9b18
 2021-08-08 13:54:06 +00:00
TreeHugger Robot
b1119ffc7c [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -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: Id9fe7fd0621bd78ac529c5ce07097a871d5d3818
 2021-08-08 13:39:53 +00:00
TreeHugger Robot
37a5ccd1f0 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -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: I05e285d6d57f7c9c757b5e7628f1a76678214c7a
 2021-08-08 13:39:48 +00:00
Weng Su
3cb57e2769 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -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: I5328b3400289af6d6195233efe3addffc3b6306c
 2021-08-08 13:39:48 +00:00
Weng Su
d93ffd8c3a [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -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: I621f6cddee8b915afdd479a536043b2b50fa48ee
 2021-08-08 13:39:46 +00:00
Weng Su
90e455e519 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -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: I193f178c5fd49e19b07fe7d011777674a6d6865e
 2021-08-08 13:39:44 +00:00
Weng Su
eb1e97e195 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -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: I8980230d20465854434b004e18eca553cb2b222b
 2021-08-08 13:39:42 +00:00
Weng Su
f973f2ac69 [DO NOT MERGE] Add permission checking to WifiDialogActivity 
- Use getCallingPackage() to get calling package.

- Check if the calling package has ACCESS_COARSE_LOCATION or
ACCESS_COARSE_LOCATION permission.

- Only set result data to permission granted callers

Bug: 185126813
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Merged-In: If7ca069c842ed2bd1aed23f9d4041473c68a4dad
Change-Id: If7ca069c842ed2bd1aed23f9d4041473c68a4dad
(cherry picked from commit 71e728e934)
 2021-08-08 13:21:52 +00:00
TreeHugger Robot
24f87e15e2 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -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: I39d5571947793d0164cf470942f36d82800f6405
 2021-08-08 13:02:10 +00:00
Weng Su
b1c88160e2 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -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: I7621025b320cc47c10535daa8dbf48c77c1cf2f6
 2021-08-08 13:02:04 +00:00
Weng Su
586ca2dfa8 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -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: If5de8e30d74531914febee1636c1b123a6bf0754
 2021-08-08 13:02:03 +00:00
TreeHugger Robot
8eff11f477 Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212651

Change-Id: I4394ae315b4458b9d62c825075a120d214f49161
 2021-08-07 17:37:47 +00:00
TreeHugger Robot
189d26ff2a Merge "Add comment to AndroidManifest" into qt-dev 2021-08-07 17:18:31 +00:00
Weng Su
8df9b236f8 Add SafetyNet logging am: 62041d683b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220072

Change-Id: I5a821a0c9bd39e0267635ebfb7ce4a2234f14696
 2021-08-07 15:02:15 +00:00
Weng Su
fa62e69c1d Add permission checking to WifiDialogActivity am: 8800cdf527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212404

Change-Id: Iaa937ab9fe9b071fa27dd9306e9f28ddbd8a00b0
 2021-08-07 15:02:13 +00:00
Weng Su
3b226354a3 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 9bc34092c5 -s ours am: 5d7f8217ea -s ours am: b45c5d0970 -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/+/15212754

Change-Id: If795001f17dac57252e5b8d6ec3bf38cd9771c41
 2021-08-07 14:52:41 +00:00
Weng Su
25070d0827 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 4be07137ed -s ours am: a51cf93712 -s ours am: b315686a50 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: I0bf8263dba3089139fc87dc88f26ec4f91b0cea1
 2021-08-07 14:52:36 +00:00
Weng Su
ff80b3c8f9 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 9bc34092c5 -s ours am: 643ebcefe7 -s ours am: 2ff9679b47 -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/+/15212754

Change-Id: Id21902229189a6fe0392a1d92b8e635e7d9aa3cd
 2021-08-07 14:52:31 +00:00
Weng Su
49924c41e1 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 4be07137ed -s ours am: 911f5834ea -s ours am: f602af0086 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: I5d264233fefc9e73bf5a1be9587e0bd5e4772747
 2021-08-07 14:52:25 +00:00
Weng Su
16ae2e5076 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 2b7ed69c38 -s ours am: 2378decda4 -s ours am: 654aa7c6f4 -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/+/15212754

Change-Id: I2ba54a72400e1c16c96ae2d733a6fc9278eb6dfc
 2021-08-07 14:52:20 +00:00
Weng Su
6c61bfe73b [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 8a7f073e63 -s ours am: 97423591da -s ours am: 64db783b7f -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: I5b10a9206eb5bb99791c732acce64a17a75eefda
 2021-08-07 14:52:13 +00:00
Weng Su
b45c5d0970 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 9bc34092c5 -s ours am: 5d7f8217ea -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/+/15212754

Change-Id: I988e48deafacf22c5a1fb38ce4cbefbbe9bd652b
 2021-08-07 14:40:25 +00:00
Weng Su
b315686a50 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 4be07137ed -s ours am: a51cf93712 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: Ic6c2f6e4ef98ad685844ab2dbc99e821de8fa912
 2021-08-07 14:40:21 +00:00
Weng Su
2ff9679b47 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 9bc34092c5 -s ours am: 643ebcefe7 -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/+/15212754

Change-Id: I065e1ee3165d8daacff38036f28cfefb6a7d9cd2
 2021-08-07 14:40:05 +00:00
Weng Su
f602af0086 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 4be07137ed -s ours am: 911f5834ea -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: I74a756680b55ff6e0d5d74bb4d8802bdda23698c
 2021-08-07 14:40:01 +00:00
Weng Su
654aa7c6f4 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 2b7ed69c38 -s ours am: 2378decda4 -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/+/15212754

Change-Id: Idf17eaf8a5f4d644e746c28c22dc6dc139fd541f
 2021-08-07 14:39:57 +00:00
Weng Su
64db783b7f [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 8a7f073e63 -s ours am: 97423591da -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: I79989224d7abd818f27bf8453de9380e8aea5e22
 2021-08-07 14:39:53 +00:00
Weng Su
5d7f8217ea [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 9bc34092c5 -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/+/15212754

Change-Id: I7da3b6b12e9547816a83b77fa56332dee15d9aa0
 2021-08-07 14:26:54 +00:00
Weng Su
643ebcefe7 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 9bc34092c5 -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/+/15212754

Change-Id: I13095c03a59fe8d36d023623de696401c96badfe
 2021-08-07 14:26:54 +00:00
Weng Su
a51cf93712 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 4be07137ed -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: I5f37094049ff33de6881fd9ff6645d2143fbc897
 2021-08-07 14:26:50 +00:00
Weng Su
911f5834ea [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 4be07137ed -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: I376d743eda6363bd3f9a46469b73abfc38f88876
 2021-08-07 14:26:50 +00:00
Weng Su
2378decda4 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 2b7ed69c38 -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/+/15212754

Change-Id: I1234cef9c8095e544099d768474d72fee33e629e
 2021-08-07 14:26:35 +00:00
Weng Su
97423591da [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 8a7f073e63 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: Ia25b39166f6de513396f124f7fc951db6dd384d3
 2021-08-07 14:26:32 +00:00
Weng Su
ee8c6a5a62 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: c85dfdf1a3 -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/+/15212754

Change-Id: Icc40622e7f830d222f5a9e5c2fa2c6294f944673
 2021-08-07 14:26:12 +00:00
Weng Su
de5bed7ba6 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: aa317b0608 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: I7ee78fb5d51539bf9f91660edc053c0c0b9f8b6a
 2021-08-07 14:26:05 +00:00
Weng Su
9bc34092c5 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -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/+/15212754

Change-Id: I3694ac5dadb33fc6488631a2b008ec39c0ac9240
 2021-08-07 14:14:25 +00:00
Weng Su
4be07137ed [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: I02e45b3c9021b7f7d351e8fc9b3a9d7fdfee4c6b
 2021-08-07 14:14:21 +00:00
Weng Su
c85dfdf1a3 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -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/+/15212754

Change-Id: I62011953f6a135e59877b5e26b901f1f01b21159
 2021-08-07 14:13:42 +00:00