TreeHugger Robot
ed4f4693c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591584
Change-Id: Ia9a9c923f760ac6cd829b2606f84c57c2b5ae0cd
2021-08-17 19:56:50 +00:00
TreeHugger Robot
d9754e6900
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591591
Change-Id: I2a8a5b3f77780d0b5923784cf7360869a5929ea0
2021-08-17 19:56:23 +00:00
TreeHugger Robot
8013ac32c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591584
Change-Id: Iacbf620cd9e7bfffe08a9027ccdcee0e9e2f47d9
2021-08-17 19:56:21 +00:00
TreeHugger Robot
3c63e65b2c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591591
Change-Id: I45e2a124c17b21a9202e6101dbb645c62a62522e
2021-08-17 19:56:03 +00:00
TreeHugger Robot
2ace4acb04
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 478207eda5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591592
Change-Id: I365e1ea376400e8027b52a72f095dae5797347f7
2021-08-17 19:50:01 +00:00
TreeHugger Robot
70a5bd4c62
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1c58e43cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591585
Change-Id: I762388b6d96ba80d2f5c632dc16ce812c607aad1
2021-08-17 19:49:47 +00:00
Xin Li
0313c67921
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182
-s ours am: c1853be4d0
-s ours
...
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15571802
Change-Id: I1456d89f8a7d4bbc347715fbf9ac8150db07e075
2021-08-17 19:46:34 +00:00
TreeHugger Robot
1bdc58284d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-17 19:46:30 +00:00
TreeHugger Robot
6a41d25bcc
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-17 19:44:13 +00:00
TreeHugger Robot
478207eda5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-08-17 19:39:11 +00:00
TreeHugger Robot
a1c58e43cb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-08-17 19:31:32 +00:00
Xin Li
c1853be4d0
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182
-s ours
...
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15571802
Change-Id: Ib85f7f13d04e651389e95994dd4854b92292a34b
2021-08-17 18:36:03 +00:00
Xin Li
7d646a5182
Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master
2021-08-17 18:14:14 +00:00
YUKAI HUNG
55eba2589c
Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev am: 0a308d056b
am: c4234a86a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15583411
Change-Id: Iafcdf0f301f859b4ad78b991e22f846cc9ab28a0
2021-08-17 17:48:09 +00:00
YUKAI HUNG
c4234a86a8
Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev am: 0a308d056b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15583411
Change-Id: I547b749bf8186e08ef33f7eb7635842b4895d1c8
2021-08-17 17:27:51 +00:00
YUKAI HUNG
0a308d056b
Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev
2021-08-17 17:10:26 +00:00
Treehugger Robot
1254e6b856
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
am: 9ee42fc623
am: e016e0b03f
am: e53111b6a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I56db10cad198f321a3146b70f0f760cd71e67afd
2021-08-17 10:01:24 +00:00
Treehugger Robot
e53111b6a0
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
am: 9ee42fc623
am: e016e0b03f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I49dcaf8ffe6c206087ac920b18fa73f36a2c2a39
2021-08-17 09:48:26 +00:00
Treehugger Robot
e016e0b03f
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
am: 9ee42fc623
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I4e704c29fa65197dbe1ba6e6471d925c0ad19a60
2021-08-17 09:37:38 +00:00
Treehugger Robot
9ee42fc623
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I56890f77bf79e84953a0ce01f2cec4089682fbf4
2021-08-17 09:22:56 +00:00
Treehugger Robot
2fbbcd3d9d
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I355edf3a1ff7efb93a3c8eff94bb77104e60a5cb
2021-08-17 09:12:11 +00:00
Treehugger Robot
9689490c22
Merge "Add biometric OWNERS to unit tests."
2021-08-17 08:43:12 +00:00
Bill Yi
7ff4b20c22
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1a80b91df8a3a635763fc178757662a07df3874a
2021-08-16 22:59:49 -07:00
Bill Yi
73f4597617
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib8067f7f7b9ce0b3c3c9b164c16c2124754259f4
2021-08-16 22:54:27 -07:00
Bill Yi
81c97af835
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
2p: 8d94de2962
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587
Change-Id: I4dac108fb9b72bb7180e3870ac0133ee0f4138c3
2021-08-17 05:49:52 +00:00
Bill Yi
635d7a2949
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587
Change-Id: I4c5f57616aa0bda605f4fcd4f7de90a6c8b64853
2021-08-17 05:49:49 +00:00
Bill Yi
8d94de2962
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587
Change-Id: I82e01f7a48919bec7e5d1d97788d7b72e239d831
2021-08-17 05:49:49 +00:00
Bill Yi
d1e4f888fb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icabf059c62f547d2bf1bef0bc04e8e22d1613bc9
2021-08-16 22:49:25 -07:00
Bill Yi
a9674f1e17
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I645acc726b56601af6ae2a58959dd514a1140ee2
2021-08-16 22:44:16 -07:00
Bill Yi
33816cbd55
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icc69636a8f76732319cc24c5bf7e842150ab5692
2021-08-16 22:39:23 -07:00
Bill Yi
d49b8b74d0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibe35735e2e3ab8087dfc0f2303e4b32318ac95a3
2021-08-16 22:37:14 -07:00
Bill Yi
1f5111f15b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
2p: 1e656787ee
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583
Change-Id: I28137b9f9c63c7247fbbed413bea2d7e7e080484
2021-08-17 05:35:24 +00:00
Bill Yi
cd0d73535b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583
Change-Id: Iab4d8828f2a190ed85f24dc2ec2f58f7082744f3
2021-08-17 05:35:19 +00:00
Bill Yi
1e656787ee
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583
Change-Id: Ia8dff8797c03100a053ce9182e4b38b4b65a6ead
2021-08-17 05:35:19 +00:00
Bill Yi
21392f9ffb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0e71e551f5efede9979e39aa215cfb597bb3135d
2021-08-16 22:35:06 -07:00
Bill Yi
53e3aea5b1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I01389260be009ebfb0a3393909063a0e51a6cd8c
2021-08-16 22:32:57 -07: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
Bill Yi
62a6495cfa
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 04d698d1f6
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590653
Change-Id: I98f7d7d5526c18e63acf41c5f8221895bfe1f8e0
2021-08-17 05:15:03 +00:00
Bill Yi
04d698d1f6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic2f525f57921de3a484758f4513e98310b41bab3
2021-08-16 22:14:41 -07:00
Bill Yi
6f047583bc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6680983f470525631710e359072fe27a81a322be
2021-08-16 22:09:54 -07:00
Bill Yi
a269d50b3a
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9b333b2dcb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590650
Change-Id: Iff09f1740622370aee760d6ad043576de2b7e2dc
2021-08-17 05:05:28 +00:00
Bill Yi
9b333b2dcb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If452267fcdb2a76d571f3526b1da4aa1261dec64
2021-08-16 22:05:07 -07:00
Bill Yi
a687e17227
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaed09e1a4628fec8391ad74d6eb451c8dbb997a0
2021-08-16 22:02:55 -07:00
Treehugger Robot
4056b335ce
Merge "Update OWNERS." am: 0544dc7b92
am: b294717b4c
am: 78ed3bb6ee
am: 5f69669adb
am: bba477b3ed
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467
Change-Id: Id2ad6188daec7edc8eadd67aaa8d7e9a52ff8208
2021-08-17 05:01:37 +00:00
Treehugger Robot
bba477b3ed
Merge "Update OWNERS." am: 0544dc7b92
am: b294717b4c
am: 78ed3bb6ee
am: 5f69669adb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467
Change-Id: Ifc7949ccb9eb3e9b15eaa3fea78d2a90c0024a6e
2021-08-17 04:53:01 +00:00
Treehugger Robot
5f69669adb
Merge "Update OWNERS." am: 0544dc7b92
am: b294717b4c
am: 78ed3bb6ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467
Change-Id: Ibf4c5605ece3d2f49602b60602c523d1e7c4877b
2021-08-17 04:41:07 +00:00
Treehugger Robot
78ed3bb6ee
Merge "Update OWNERS." am: 0544dc7b92
am: b294717b4c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467
Change-Id: I3d44a009fc1fb653a074c0b5075b673dcbee82d8
2021-08-17 04:28:48 +00:00
Treehugger Robot
b294717b4c
Merge "Update OWNERS." am: 0544dc7b92
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467
Change-Id: I8cef16ea650efa1d2f2479055779a84d266b7085
2021-08-17 04:09:55 +00:00
ykhung
518d6df4f4
[Security] resolve RequestIgnoreBatteryOptimizations info disclosure
...
after discussed with kdeus@ we will remove the setResult() from the
dialog action to avoid the caller apps can distinguish the users
interaction behavior, and declared REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
in other applications.
Bug: 195963373
Test: make SettingsRoboTests
Change-Id: Ia2e47c493c206e96b0bc1d9f08735c0f9474c233
2021-08-17 12:06:59 +08:00