Weng Su
36a13c0cfe
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours am: f41979632a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I4c861b96d01934a4fd1146df29a77ee9e7dd00ab
2021-10-06 19:29:34 +00:00
Weng Su
f41979632a
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I5bdcc75fa22cd4cd5763075b5912c55d56914eb5
2021-10-06 19:20:04 +00:00
Weng Su
395ac6073c
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours
...
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 4fb84a3737
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: Ie68ac2947f392a8046c2f62d9c357c852493eb2b
2021-10-06 19:08:50 +00:00
Weng Su
d5ff68889c
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207911
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I18755f444c82aa7f3241812a1f51e0e06c009c07
2021-10-06 19:08:49 +00:00
Weng Su
457a63ce84
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I90af118b9033a7ee53b35aa2b435d2ba95281181
2021-10-06 19:04:56 +00:00
Weng Su
ed4abe8483
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev
2021-10-06 18:47:52 +00:00
Weng Su
259742ebb2
Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev
...
* changes:
[RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add permission checking to WifiDialogActivity"
[RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add SafetyNet logging"
2021-10-06 18:47:52 +00:00
Weng Su
18043562c1
[RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add permission checking to WifiDialogActivity"
...
Revert submission 15207347-add_permission_wifidialog
Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
If7ca069c8:[DO NOT MERGE] Add permission checking to WifiDial...
I1535f6f2d:[DO NOT MERGE] Add SafetyNet logging
Bug: 185126813
Change-Id: Ifc3b53dc91fc8d5aa31c1a10d4eb033bbe54c47d
2021-10-05 06:47:46 +00:00
Weng Su
1c93d29b73
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
...
This reverts commit fa1e3870d8
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I77a027075465b5685a857b4c8c68203ef812a172
2021-10-05 03:25:13 +00:00
Weng Su
12dcd5034a
[RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add SafetyNet logging"
...
Revert submission 15207347-add_permission_wifidialog
Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
If7ca069c8:[DO NOT MERGE] Add permission checking to WifiDial...
I1535f6f2d:[DO NOT MERGE] Add SafetyNet logging
Bug: 185126813
Change-Id: I41721dbb34612144d00dba7885944d834bf93c7d
2021-10-05 03:24:34 +00:00
Weng Su
d05686b431
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
...
Revert submission 15220072-add_permission_wifidialog-qt-dev
Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
I1535f6f2d:Add SafetyNet logging
If7ca069c8:Add permission checking to WifiDialogActivity
Bug: 185126813
Change-Id: I42b77ac420d9438c741b28ce33bcadf1c74b19eb
2021-10-05 03:23:45 +00:00
TreeHugger Robot
416206347b
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-24 16:32:30 +00:00
Bill Yi
20df40e783
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia87ff5a7993ad94c6b9e910380d5b758dfb6363e
2021-09-23 17:49:59 +00:00
Bill Yi
6d56b2dce8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id60fd628884560576a270ab93f49a235cfc8b932
2021-09-23 17:46:38 +00:00
TreeHugger Robot
7a8b043da7
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-20 14:04:47 +00:00
Bill Yi
7b93c3ea98
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaa16a73368d1b88512291d10b9c46abd127ab62e
2021-09-18 17:06:21 +00:00
Bill Yi
57b68bafb9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I78923511c8cd2c48b25e2105d234d4b510b5fe6b
2021-09-18 17:02:50 +00:00
Bill Yi
98945e949e
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-12 12:57:50 +00:00
Bill Yi
b2e42cabd4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a37f3d6526c53393d047d99f8c19f2054e932f7
2021-09-11 09:05:32 +00:00
Bill Yi
24917c6fce
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id7feff6bce69e46b992f5062c6fe2679f3fdd429
2021-09-11 09:02:07 +00:00
TreeHugger Robot
a08ae6df50
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-03 20:03:25 +00:00
Bill Yi
8382ada407
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie45277d6008c75304a24f48190cf27e6ed197a88
2021-09-02 13:26:44 +00:00
Bill Yi
fd1a0ef0ac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I12d781cb74cf9be4f67fd75b397d5d05ea244818
2021-09-02 13:23:16 +00:00
TreeHugger Robot
41642f5ba8
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-08-28 08:05:30 +00:00
Bill Yi
af04cc6ba7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5a77348c77e612c03205df8f99434e19242984a1
2021-08-27 22:14:52 +00:00
Bill Yi
5785856ca7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I568912c51296854b465c0aa429f06d26e1d017a0
2021-08-27 22:11:23 +00:00
Bill Yi
70b0c311a5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I53bc4eea899bfa40183a478e99878438c78f2d7b
2021-08-21 10:31:37 +00:00
Bill Yi
c748a50c90
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I51d44b97eafa5c3d0afba3314060168c75c0cc7c
2021-08-19 18:45:15 +00:00
Bill Yi
214068856c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I1ec620bc435cc8cade11eedcd40b14aecd74a5bc
2021-08-19 18:45:10 +00:00
Bill Yi
5333f656cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I282f2eb8c069e363b31ff018ff51f1a45b37e757
2021-08-19 18:30:11 +00:00
Bill Yi
d26b631da5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I034015cd37baa3a0e64c4821684ecaf08348c2b8
2021-08-19 18:30:04 +00:00
Bill Yi
2906d7dceb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I3258ebd4e22af98fd20e0310512cd3db1ed2d160
2021-08-19 18:17:06 +00:00
Bill Yi
6718e1ee7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Ia7592c1857dab18371f6284e5f6583217b148be9
2021-08-19 18:13:12 +00:00
Bill Yi
6a0b815394
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: Ib07c6a9383e2256c8e995ad1d6b67ee4bfb02cb8
2021-08-19 18:12:15 +00:00
Bill Yi
57f1c163d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I7cf4e45992855e576ad9f0e4a25d1ea6e4405a1a
2021-08-19 18:05:22 +00:00
Bill Yi
88a0994ed8
Import translations. DO NOT MERGE ANYWHERE
...
BUG:167403112
Auto-generated-cl: translation import
Change-Id: Id5c579245cf72f10f4d15fcb69d24bcf58dd281a
2021-08-17 22:14:24 -07:00
Bill Yi
f391df2089
Import translations. DO NOT MERGE ANYWHERE
...
BUG:167403112
Auto-generated-cl: translation import
Change-Id: I64cf73c3bf8cfc4e1135a40d5c6fa26066fc287e
2021-08-17 22:10:17 -07:00
Bill Yi
15b602ca6e
Import translations. DO NOT MERGE ANYWHERE
...
BUG:167403112
Auto-generated-cl: translation import
Change-Id: I6301742cc4a1941e287bd8824a55ef5f17f72f4d
2021-08-17 22:02:57 -07:00
TreeHugger Robot
a26ca75570
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-08-17 23:08:15 +00:00
Bill Yi
25b3ab76e4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4be1756b35504ec9d49bc7b8d6bd7b7e753aae8b
2021-08-16 22:29:11 -07:00
Bill Yi
f82b80a567
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie28ab84cb3ef23d6602af63e2e531d7057000d2f
2021-08-16 22:24:38 -07:00
TreeHugger Robot
1fca8341c4
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-08-13 17:59:41 +00:00
Bill Yi
dff93bb6b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I42ad0edeea635e7c8c12ebffad01b2e0d6bba1a8
2021-08-13 03:28:24 +00:00
Bill Yi
d54aa0fb4c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id8e88bc2762dcd1996cbaa52d7ac66d58320bfc9
2021-08-13 03:24:52 +00:00
Bill Yi
c8bb1d57d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5ba752738776fe16d802cb3a87cdff5da5f6481
2021-08-10 15:08:45 +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
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
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
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