Bill Yi
89ae91f7cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I3d548bafd75b267eda401f03d688edae9f8c0565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:33:00 +00:00
TreeHugger Robot
fb1a655d43
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Icc9667b3aee16b4427d2cf6152f4681c22c80745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:31:33 +00:00
Bill Yi
fdc0cac006
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I521168c647bdb9206bc761ab03400536e62b847f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:31:22 +00:00
Bill Yi
7e6afc5894
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I327cd9cef8cc65110a765c287df93689ca7bedda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:31:15 +00:00
TreeHugger Robot
e91b230bac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I8d9fe810fae9f907eaaee43681b54b047c2cedf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:35 +00:00
Bill Yi
9b8d62847e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Iacfaa7a89d11000f8e5218661d404cad0e435795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:28 +00:00
Bill Yi
c64165dc4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I08ee6f10b0daff666ef0100551f50405a59f3132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:17 +00:00
Automerger Merge Worker
cd4e51939f
Merge changes from topic "am-33955e9c70784617ba9185fd3fa3dfcc" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70faf92894768f6e59b16b1a6b09835d1e
2022-08-12 20:18:59 +00:00
TreeHugger Robot
d0223cc521
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours am: f92894768f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: Ib84637b04cd657d064844de33db328b6fdf7f068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:17:45 +00:00
Bill Yi
563cb22c41
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours am: 6b09835d1e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: Icb75ad5b3cc5a7aaf7395f27b9f4e5801f57ee5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:17:24 +00:00
TreeHugger Robot
59f982a6b3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours am: f0361b3188 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I8e0cb90dc526eccdf738165ae9dfb6553bb41d1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:16:05 +00:00
Bill Yi
0bb9bea783
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours am: b530fcdd2f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I6c94529d3be751f99ad02f9bf568806f3c5d8f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:15:43 +00:00
Automerger Merge Worker
a72452db78
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours" into tm-d1-dev-plus-aosp am: 4fec01b98a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I04469b260b2588684c3390de9336ae8fe68f0e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:13:41 +00:00
Bill Yi
877d23dded
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours am: e001721f49 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: Ic4f09d13d2e31bdb1a980863cbce19504238fadc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:13:16 +00:00
TreeHugger Robot
f0361b3188
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I59064adc6cbf5ccd656e966f149943dd57798b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:35 +00:00
TreeHugger Robot
f92894768f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I98da540c0dc07551a1ecdf8c7bf7b87f16be53c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:30 +00:00
Automerger Merge Worker
e36e9757ef
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours am: b3eb862b70 -s ours" into tm-qpr-dev-plus-aosp
2022-08-12 20:10:25 +00:00
Bill Yi
b530fcdd2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I3c09e2d6b833257910a84819c7b08b8dac696dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:10 +00:00
Bill Yi
6b09835d1e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: Ib0c9054563ab03e9075de4b3c55bdd8fe02ddc71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:08 +00:00
Bill Yi
42dd80e568
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours am: b3eb862b70 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I9dc268cb3347ee8480f643a49044f21bb7d3a18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:09:20 +00:00
Bill Yi
c5569d9d42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours am: 76182fe42d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I77aeeafdb3edfef16a181dff0626fa6059ebd283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:08:44 +00:00
Bob Badour
2e005f4cec
Remove luyota from OWNERS.
...
Test: n/a
Change-Id: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Merged-in: I6a8139e569a31ea3983df0db970a36b841e646d4
2022-08-12 19:57:37 +00:00
TreeHugger Robot
ba19ab70fa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-12 19:50:01 +00:00
Automerger Merge Worker
4fec01b98a
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours" into tm-d1-dev-plus-aosp
2022-08-12 19:43:18 +00:00
Bill Yi
b3eb862b70
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I340b51276529f1b25278b1fe728d1b9f96ac40ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:42:11 +00:00
Bill Yi
e001721f49
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I7b4e7ae5ba8cb265e33694cb3c4130019edfff60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:42:09 +00:00
Bill Yi
76182fe42d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I499779bbd3cca72249b731b4a0f9572d27bfa3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:42:06 +00:00
Bill Yi
1d60978515
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: Icd7bb1e1eb6caba9610276ed3660e919c2be94c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:06:24 +00:00
Bill Yi
a87c5a5641
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I4393f4ae54b277c694110ace08d1a6ce48acbec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:04:44 +00:00
TreeHugger Robot
957768ce00
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-12 18:52:01 +00:00
Ats Jenk
7dad9f50a9
Merge "Developer tile for toggling desktop mode" into tm-qpr-dev am: 3f000fa764
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18975659
Change-Id: I11cc8ff6ad5b704ecb6c20f5b5975c7cb2cb14a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 16:40:24 +00:00
Ats Jenk
3f000fa764
Merge "Developer tile for toggling desktop mode" into tm-qpr-dev
2022-08-12 16:22:44 +00:00
TreeHugger Robot
5cf9730c31
Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev am: cfd4e87ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19604134
Change-Id: Iece6c6ec5fa09ff8fb5861175742c739b653f92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 15:49:19 +00:00
TreeHugger Robot
cfd4e87ac8
Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev
2022-08-12 15:05:49 +00:00
Bill Yi
9d4bf7b223
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f852ef2312fc59d8aa1cb46ee7b04c33ec2b13f
2022-08-12 07:30:07 -07:00
Bill Yi
0d14a19eee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3e12999c8049c46ebdc24abce1b01aa5bd90b103
2022-08-12 07:26:23 -07:00
Yanting Yang
ea6a06c8e8
Check DISALLOW_APPS_CONTROL before performing reset app preferences
...
When DISALLOW_APPS_CONTROL restriction is enabled, users should not be
able to enable/disable apps, clear app caches and clear app data.
The function of reset app preferences will re-enable the disabled apps,
it can let users bypass DISALLOW_APPS_CONTROL to enable an app disabled
by IT admin to see sensitive information.
To fix this vulnerability, we add a check for DISALLOW_APPS_CONTROL
restriction before users reset app preferences. Once the restriction is
enabled, it will show dialog “Blocked by your IT admin” instead.
Bug: 238745070
Test: Verify change by turning on/off DISALLOW_APPS_CONTROL with TestDPC.
Change-Id: Iffee73cf4952b686a78b4c7aaa54747971337d03
(cherry picked from commit 4356c9c653
2022-08-12 12:25:48 +00:00
TreeHugger Robot
b88e71b1c0
[automerger skipped] Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev am: 5ab0a976de -s ours
...
am skip reason: Merged-In I52547d10f0579fddb21091b641925910db17ef38 with SHA-1 91aec69fdchttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19603838
Change-Id: Id7f285b8394b5d8d24b94ed4ab7d47c8d8f1b5ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 10:12:10 +00:00
Zaiyue Xue
0a71d08b7d
[automerger skipped] Fix import of anyLong in BatteryChartPreferenceControllerTest. am: 2e7957727f -s ours
...
am skip reason: Merged-In I52547d10f0579fddb21091b641925910db17ef38 with SHA-1 91aec69fdchttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19603838
Change-Id: I136ba7fbeaf21b60067a5a2d163222cb43c8126c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 10:12:05 +00:00
TreeHugger Robot
5ab0a976de
Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev
2022-08-12 10:00:55 +00:00
Zaiyue Xue
2e7957727f
Fix import of anyLong in BatteryChartPreferenceControllerTest.
...
This is to fix the merge conflicts within tm-qpr-dev,
tm-qpr-dev-plus-aosp and master.
Bug: 236101166
Test: manual
Change-Id: I2f4531ccc7c59b279d14bc5c0bd6c1fe51dd475d
Merged-In: I52547d10f0579fddb21091b641925910db17ef38
2022-08-12 13:57:53 +08:00
Treehugger Robot
bf0cb88417
Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a am: 62fa667b26
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455
Change-Id: If86acd9982d50238c1ed31f78735ef805857bc9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 04:02:56 +00:00
Treehugger Robot
62fa667b26
Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455
Change-Id: I49eb01dd9ecf0f6bb606c778bbd0acbc99b11a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 03:47:12 +00:00
Treehugger Robot
2aa8cd1d1a
Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455
Change-Id: Ib7211f190336de2c318f117ebe2ab71ed5b35062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 03:20:59 +00:00
Treehugger Robot
e194aa42eb
Merge "Fix permissions for internal links." am: 24f45fbd63
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455
Change-Id: I633c22a73b0d160c0fbf662768a92e4f0dfac85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 03:03:53 +00:00
TreeHugger Robot
79bdae659c
Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev am: 0077129094
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590401
Change-Id: Ic53e1282db41bf8c8c66e8d750179189b3b1af1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 02:46:52 +00:00
Treehugger Robot
24f45fbd63
Merge "Fix permissions for internal links."
2022-08-12 02:44:31 +00:00
TreeHugger Robot
0077129094
Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev
2022-08-12 02:27:36 +00:00
Betty Chang
0c2a3ead2b
Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987
Change-Id: Ia2f4ab79a90b7733d0ad23b3573b55a527da84df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 01:40:05 +00:00
TreeHugger Robot
d208da6546
Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am: 2cd733dcdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19553474
Change-Id: Ib8bb80d10095f4de2d14bbe4facd1534977e0b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 01:39:40 +00:00
