TreeHugger Robot
2d3e0c8bb2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e1e9adc14
-s ours am: eb3e22d6f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591753
Change-Id: I5d06593619eee1b6825e3c11e688cb13c7cc5507
2022-01-11 01:20:05 +00:00
Treehugger Robot
d7b3c851b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943804
Change-Id: Ia9a27700f722dc98f1ba8f9ff8f21ce7a2dbc0bd
2022-01-11 01:18:26 +00:00
Bill Yi
e407f4e902
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a027938e
-s ours am: 7973db12a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591754
Change-Id: I22fdc9eea1877cf46254b26a47feea6a937bc027
2022-01-11 01:16:59 +00:00
Treehugger Robot
8b4a0a04f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943805
Change-Id: If6ce83076908961edfe95a2f388d87a06a0efdf2
2022-01-11 01:15:44 +00:00
TreeHugger Robot
eb3e22d6f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e1e9adc14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591753
Change-Id: I1c6b3ef2d40215c682ba5ff59b758e9a091ac75a
2022-01-11 01:03:43 +00:00
Bill Yi
7973db12a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a027938e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591754
Change-Id: Iac3fa529e4c286e699f140a779a56c3500c5391d
2022-01-11 01:02:26 +00:00
Treehugger Robot
48c90fde8a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-11 00:46:54 +00:00
Treehugger Robot
fe140a6410
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-11 00:46:30 +00:00
TreeHugger Robot
8e1e9adc14
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-01-11 00:41:52 +00:00
Bill Yi
0b57480c1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f04568a54e4b9ed91a16579f210fd320e317e5e
2022-01-10 17:06:49 +00:00
Bill Yi
87d6f1f523
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I52253a63ba60867e86c9f85474062a03155bf0aa
2022-01-10 17:03:04 +00:00
Bill Yi
e9a027938e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id3b3a757c9db72f3349a135e3b0e28ce34a35d16
2022-01-10 05:45:14 +00:00
Bill Yi
6bc95e2783
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibeeefa1a48fbbebd0779d942f354eb1389130f51
2022-01-10 05:41:40 +00:00
TreeHugger Robot
f61b4d1500
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4
-s ours am: ad7ea804d8
-s ours am: f48a240945
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001
Change-Id: I9d412f5723d5b7a462f8d0796304b79049bf66b5
2022-01-09 05:51:35 +00:00
Bill Yi
96b65ea4c0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1
-s ours am: dcd2b90022
-s ours am: 5950ef489f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993
Change-Id: I562acc3cc17334eeff5fe00e45bc72abf6250ae1
2022-01-09 05:51:29 +00:00
TreeHugger Robot
73f4a6ef55
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28
-s ours am: f2c222c977
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581997
Change-Id: I400750354cbecd804ae6d442d081d0c517ed7667
2022-01-09 05:51:01 +00:00
Bill Yi
6572de6e78
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34
-s ours am: 3710710bc5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582265
Change-Id: I126901224bd7f1dc3b98fb71b544dc76abdf36c3
2022-01-09 05:50:18 +00:00
TreeHugger Robot
73c95c1ac3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4
-s ours am: ad7ea804d8
-s ours am: 6437b8590b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001
Change-Id: I94760890a5fbd36af6a210251279160f4d14d0fb
2022-01-09 05:48:21 +00:00
Bill Yi
9e22464ec0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1
-s ours am: dcd2b90022
-s ours am: 9d02a7114f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993
Change-Id: I25859b60d5a3d6add12471b4be91fcecf1d5cae1
2022-01-09 05:45:40 +00:00
TreeHugger Robot
f48a240945
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4
-s ours am: ad7ea804d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001
Change-Id: I3172d86558003edbeafd7dc8480ae7cb4cafd9fd
2022-01-09 05:36:59 +00:00
Bill Yi
5950ef489f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1
-s ours am: dcd2b90022
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993
Change-Id: Ie4733b05be99789d6564e3d1e93fcdac87dfa75c
2022-01-09 05:36:53 +00:00
TreeHugger Robot
6437b8590b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4
-s ours am: ad7ea804d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001
Change-Id: I47fad93803ce4dc9461c8f1c763a182641cfa157
2022-01-09 05:36:09 +00:00
TreeHugger Robot
661c9295b2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28
-s ours am: fbc1a45d59
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581997
Change-Id: I7b97577a11da6b2381d86dced3e16e31e3e4d78c
2022-01-09 05:35:52 +00:00
TreeHugger Robot
f2c222c977
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581997
Change-Id: I745c361ee221f9a9dbfe2275de5b095fda0cdfb0
2022-01-09 05:35:49 +00:00
Bill Yi
9d02a7114f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1
-s ours am: dcd2b90022
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993
Change-Id: I4a20b42fe8fd94ddb726ab7e7364f371db547370
2022-01-09 05:35:49 +00:00
Bill Yi
422501a5a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34
-s ours am: edc751bbaa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582265
Change-Id: I6e026a5b12c8c4dd389fb6e27263a30d56e9ea01
2022-01-09 05:35:39 +00:00
TreeHugger Robot
fbc1a45d59
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581997
Change-Id: Id72341e0cb3eb113002eb574ac48caa738a79c32
2022-01-09 05:35:24 +00:00
TreeHugger Robot
8f3bd108d7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9dd4542560
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582266
Change-Id: I1db59b3b259e08f46b4584bafe39458b2522e5a0
2022-01-09 05:34:59 +00:00
Bill Yi
edc751bbaa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582265
Change-Id: I0799eb79c1f6c4bae9bdf6ed1c639e9de03350d4
2022-01-09 05:34:42 +00:00
TreeHugger Robot
ad7ea804d8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001
Change-Id: Ibf86012a9197656e463869fa55785efadf1230c8
2022-01-09 05:34:35 +00:00
Bill Yi
3710710bc5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582265
Change-Id: Idd3f900e12d87f0da38157f8ba2a130c9e058ae5
2022-01-09 05:34:35 +00:00
Bill Yi
dcd2b90022
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993
Change-Id: I07cdae04675495c5ed06cd0effdf2381939e54f2
2022-01-09 05:34:28 +00:00
TreeHugger Robot
0f91d91d56
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: da2e65e4ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581998
Change-Id: I8eb8acddb66b72c37413d62585b3a735287c4f21
2022-01-09 05:34:13 +00:00
TreeHugger Robot
fad8ac95a4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2022-01-09 05:14:26 +00:00
TreeHugger Robot
cc94febb28
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-01-09 05:14:18 +00:00
TreeHugger Robot
9dd4542560
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-01-09 05:13:52 +00:00
TreeHugger Robot
da2e65e4ee
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-01-09 05:13:48 +00:00
Bill Yi
9d0825f6bd
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3
-s ours am: 5ef6e53bf5
-s ours am: 6930ac9588
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736
Change-Id: I9f6e7ad04936045fed004c2b97ecbe1169491924
2022-01-07 18:34:09 +00:00
Bill Yi
6930ac9588
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3
-s ours am: 5ef6e53bf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736
Change-Id: I5a9ec3301f4d4649584a57abc8d3776ae2e78311
2022-01-07 18:16:20 +00:00
Bill Yi
5ef6e53bf5
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736
Change-Id: I08d291860f76cb1993aae826cb6bd85b4430e52e
2022-01-07 17:48:51 +00:00
Bill Yi
75205dc6b3
Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE"
2022-01-07 17:29:12 +00:00
Bill Yi
fbe6fd97b9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8b732b18aa1e28bd59972d3ad51f2fa00d0e7973
2022-01-07 10:32:46 +00:00
Bill Yi
f69d80aa34
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iec8d44a0966c47b347de5290f9a3bc5f5c54dc6c
2022-01-07 10:29:08 +00:00
Bill Yi
9fed0efc79
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I089bd7964eff40566f6e0e5f29419ffffd0e8525
2022-01-07 10:25:35 +00:00
Bill Yi
64a765a14c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifcad6860e4664730c2d0e5826018623ab161db4a
2022-01-07 10:17:54 +00:00
Bill Yi
6ad216fce4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0a648477cbd18dc003cae1dfa61a3387d8f76536
2022-01-07 10:16:21 +00:00
Bill Yi
ac0bd999f1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If79c3e0fd0ebe9847befbf0f32184782cbc5f7e2
2022-01-07 10:14:50 +00:00
Weng Su
0a1ef933ac
Check WiFi restrictions for WiFi QR code intent am: fe5690598c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16544954
Change-Id: Id2ef05626ba9adce5365ab0f928b7bfc3d556246
2022-01-07 07:47:20 +00:00
Edgar Wang
4fb753d22e
Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
...
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.
We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.
Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95
)
2022-01-07 04:25:25 +00:00
Edgar Wang
181c7e32f5
Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
...
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.
We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.
Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95
)
2022-01-07 04:25:09 +00:00