Bill Yi
798e2adb59
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp am: 93e7956a7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: Ib1965639952ad39d8c94229b0c02b94f996ea688
2021-09-24 17:15:20 +00:00
Bill Yi
27649a27e9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
am: 2175bf57c6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: Id1d9ce2eaa7b8a59362e88c53c4ccf3b84e74eb8
2021-09-24 17:15:20 +00:00
Bill Yi
b8dff25882
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp am: 3d46803aee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I35df749b6c90df88c39b385a6fe6b973d30ce5ad
2021-09-24 17:15:11 +00:00
Bill Yi
767ce7ca1b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
am: fab8681446
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I84c2a01d26139d8b82755e98b052b60751dc3153
2021-09-24 17:15:11 +00:00
TreeHugger Robot
df6573b91e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-s ours am: 58a441f611
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: I264dbd4f666e93d707ddc9b4486f55552a9a7a46
2021-09-24 17:14:45 +00:00
Bill Yi
e2bf04f17b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours am: 78abb83343
-s ours am: 7f395f18b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898483
Change-Id: I119c980481b99e5ef5db212fdf324fcd29fffce0
2021-09-24 17:14:32 +00:00
Bill Yi
1b857d20ac
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:13:34 +00:00
Bill Yi
d43653e80d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-24 17:13:34 +00:00
Bill Yi
93e7956a7e
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:13:34 +00:00
Bill Yi
6553465417
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:56 +00:00
Bill Yi
ffa2c65c22
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-24 17:10:56 +00:00
Bill Yi
3d46803aee
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:56 +00:00
TreeHugger Robot
16ab663f53
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: Ic29e3bfc8ee0d8837ea923f3a80f333a7578f9af
2021-09-24 17:01:46 +00:00
Bill Yi
f78bbdeedc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours am: 78abb83343
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898483
Change-Id: I7965d6f1a57b2e26c13d88d00c81d051f197ac1b
2021-09-24 17:01:35 +00:00
TreeHugger Robot
6a3ff3a0f6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: de59a250f8
-s ours am: f78cb86b4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898517
Change-Id: Iabb1e278da9198b0e80bc2d7a3822c83eb78445c
2021-09-24 17:01:03 +00:00
TreeHugger Robot
58a441f611
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: If2f43424484cec92cc2fb2fa481162bc3a3b6db8
2021-09-24 17:00:54 +00:00
TreeHugger Robot
de9f58d841
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27
-s ours am: bf23269e34
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898514
Change-Id: I7ded137ed8869192e22dc0bf244ca4141866b837
2021-09-24 17:00:32 +00:00
Bill Yi
7f395f18b2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours am: 78abb83343
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898483
Change-Id: I0ff01146a726074ee24afd7c141df16750ec611f
2021-09-24 17:00:07 +00:00
TreeHugger Robot
f78cb86b4b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: de59a250f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898517
Change-Id: Ib0cd151dcd0d64b6c18213408573989f8ea3d085
2021-09-24 16:49:50 +00:00
TreeHugger Robot
bf23269e34
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898514
Change-Id: I9208b4608cf8c105f69edf032709ee6072766047
2021-09-24 16:49:45 +00:00
TreeHugger Robot
85214e918e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: I86e538594b008a280a542665306978afaba1e771
2021-09-24 16:45:20 +00:00
TreeHugger Robot
60fc50f537
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 504cc273ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898518
Change-Id: Ib38b2e25557bc850795b22813c6d16914c70ebf7
2021-09-24 16:45:04 +00:00
TreeHugger Robot
0e520dd82c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 86c7df45c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898515
Change-Id: I03c106450e08cd2f71552d5fea56e4f8beb404ef
2021-09-24 16:44:52 +00:00
Bill Yi
78abb83343
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898483
Change-Id: I37b3fc803bb1b033f24467dc54f43a8d7e1f4cb1
2021-09-24 16:44:26 +00:00
TreeHugger Robot
de59a250f8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-24 16:32:45 +00:00
TreeHugger Robot
f337947e27
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-24 16:32:43 +00:00
TreeHugger Robot
416206347b
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-24 16:32:30 +00:00
TreeHugger Robot
504cc273ab
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-24 16:29:15 +00:00
TreeHugger Robot
86c7df45c9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-24 16:29:10 +00:00
Treehugger Robot
7f24ff7dc9
Merge "[Settings] backport missing CL" am: a8ee80e95a
am: 15c0678ca8
am: da36a07df1
am: 577abc36f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333
Change-Id: I2ce19df31bed53387b96a7a1104380a939994753
2021-09-24 11:13:57 +00:00
Yanting Yang
31d9ec3356
Fix crash of PictureInPictureDetailPreferenceController
...
PackageManager.getPackageInfoAsUser() will throw DeadObjectException
when the package is too large which is a known issue to PackageManager
but very low priority given resourcing constraints. As per the
PackageManager team suggestion, catch the exception on the app side to
alleviate the impact to the App info page.
Bug: 198861478
Test: manual
Change-Id: I3115cf1b99a305efef192a0dcf3e809eb7903d0a
2021-09-24 19:11:28 +08:00
Treehugger Robot
577abc36f7
Merge "[Settings] backport missing CL" am: a8ee80e95a
am: 15c0678ca8
am: da36a07df1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333
Change-Id: I684ceac5e6c70a2766b0dc3e14f2c8b40e4ad806
2021-09-24 10:53:17 +00:00
Treehugger Robot
da36a07df1
Merge "[Settings] backport missing CL" am: a8ee80e95a
am: 15c0678ca8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333
Change-Id: I687c80bc2f50b242151edffdb8ab97307d08b9d9
2021-09-24 10:40:36 +00:00
Treehugger Robot
15c0678ca8
Merge "[Settings] backport missing CL" am: a8ee80e95a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333
Change-Id: I09f384d8d7073270d4bf460e91a52021a69e3e19
2021-09-24 10:24:31 +00:00
Treehugger Robot
a8ee80e95a
Merge "[Settings] backport missing CL"
2021-09-24 10:10:37 +00:00
Bonian Chen
dc3c1e8a4b
[Settings] backport missing CL
...
aosp/1258356 got missing when merging several CLs of refactor code in
aosp/1281915.
Bug: 186543910
Test: local
Change-Id: I34287b22fec4da660c7b44b5953eb16591cfb2d7
2021-09-24 15:45:30 +08:00
Arc Wang
ca79841b3a
Show full screen 'Free up space' for large screen devices am: ec350919ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809064
Change-Id: Id5287dc07781158bdabe502e831a0a29e463e6dc
2021-09-24 06:44:26 +00:00
Peter_Liang
af5f355b35
Add the max height restriction into the illustration view.
...
Bug: 191721423
Test: manual test
Change-Id: I3829ead500eaf586f6d543855690ee8f0d0913ff
2021-09-24 14:42:53 +08:00
TreeHugger Robot
734ad243bf
Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7
am: 59461a5836
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168
Change-Id: Ib26aa0459ddaec88e8c6eb935e57acfb7cf3a771
2021-09-24 06:07:09 +00:00
TreeHugger Robot
59461a5836
Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168
Change-Id: I869ee6339bce5342b023ca65bba44afc9e594a68
2021-09-24 05:54:39 +00:00
TreeHugger Robot
cc1cc9a5f7
Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev
2021-09-24 05:44:36 +00:00
Arc Wang
ec350919ea
Show full screen 'Free up space' for large screen devices
...
Uses Intent.FLAG_ACTIVITY_NEW_TASK to start the Activity
and it will shows in different Activity stack.
Then it shows full screen 'Free up space' for different
Activity stack.
Bug: 197703552
Test: manual
Storage -> click 'Free up space'
Change-Id: I8ce16aa23438424d4990171449884755e36cf21d
2021-09-24 05:23:35 +00:00
Arc Wang
94a4bd82ba
Ues permission to protect DeepLinkHomepageActivity
...
DeepLinkHomepageActivity needs the permission
android.permission.LAUNCH_TWO_PANE_SETTINGS_DEEP_LINK
to limit the apps that can show Activity in Settings 2-pane.
The permission is of protectionLevel signature|preinstalled.
System grants the permission automatically to all the
preinstalled apps and the apps that signed with platform key.
Bug: 197048599
Test: build pass
Change-Id: I1c2de3c9cddae432c5ff6e5d6ad56959b8117f8b
2021-09-24 03:24:14 +00:00
YUKAI HUNG
e401e37369
Merge "[Security] resolve overlay attack on RequestIgnoreBatteryOptimizations" into sc-v2-dev am: d24f289548
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898228
Change-Id: I27699bd328f33a95b18cedf3f497bf358d30bca5
2021-09-24 02:44:14 +00:00
YUKAI HUNG
d24f289548
Merge "[Security] resolve overlay attack on RequestIgnoreBatteryOptimizations" into sc-v2-dev
2021-09-24 02:28:41 +00:00
ykhung
a8a2075fd0
[Security] resolve overlay attack on RequestIgnoreBatteryOptimizations
...
we should put the addSystemFlags() after onCreate() method rather than the original onStart() method (refer the proposed solution in b/199167909)
Bug: 199167909
Test: make SettingsRoboTests
Change-Id: Ic7361443bfa2e1a6d8d962708c794fa0122a691c
2021-09-24 02:27:40 +00:00
YUKAI HUNG
3691ddaea2
Merge "[Security] resolve CRLF attack on RequestIgnoreBatteryOptimizations" into sc-v2-dev am: 93f6df76be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898227
Change-Id: Ib506e95ea5bbdf2c92b640e8df01f5233460e7c7
2021-09-24 02:20:31 +00:00
YUKAI HUNG
93f6df76be
Merge "[Security] resolve CRLF attack on RequestIgnoreBatteryOptimizations" into sc-v2-dev
2021-09-24 02:09:08 +00:00
Curtis Belmonte
b7838414c5
Merge "Support "less secure" info row on face enroll intro" into sc-v2-dev am: 6368379a25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15900429
Change-Id: I43291babbf5a505393a819130aabd40d056d43bc
2021-09-24 00:48:05 +00:00
Curtis Belmonte
6368379a25
Merge "Support "less secure" info row on face enroll intro" into sc-v2-dev
2021-09-24 00:30:49 +00:00