PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,342 Commits 1 Branch 0 Tags
71814b355c6ab63d6e96d1b5af6b2edd14d4867c
Commit Graph

112342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoey Chen
eef6d0cb24 Merge "[Settings] Update the title if launch the fragment from search app" 2022-12-07 08:43:10 +00:00
Zhenwei Chen
47fa893358 Merge "Fix batteryInfo unit test" into tm-qpr-dev 2022-12-07 08:31:44 +00:00
Zoey Chen
a3c97876bb [Settings] Update the title if launch the fragment from search app 
Bug: 245613972
Change-Id: I937a4acf0917a16660ff237d0511a5883864a1b9
Test: manual
Merged-In: I07bf9a8f59ea14fc8133e2473746a59a5c187d47
 2022-12-07 07:18:42 +00:00
Zhenwei Chen
36c1e7dc20 Fix incorrect dock defender banner icon. 
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png

Bug: 261156455
Test: Unit tests passed and manual test on the device
Merged-In: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 52323128dc)
 2022-12-07 05:46:57 +00:00
Tsung-Mao Fang
ff5bfb40c8 [DO NOT MERGE] FRP bypass defense in the settings app 
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-07 03:09:30 +00:00
Tsung-Mao Fang
b34ff2f272 [DO NOT MERGE] FRP bypass defense in the settings app 
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-07 03:08:58 +00:00
Android Build Coastguard Worker
95707640ef Snap for 9376496 from 1c6313d8c0 to tm-qpr2-release 
Change-Id: I197de8e153c9b84568c0ff933fe31a5936e3692c
 2022-12-07 00:25:56 +00:00
Tsung-Mao Fang
1ebb665b71 [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640996

Bug: 258422561
Bug: 202975040
Change-Id: I33d8635f6695619b415285f67001135f695a880c
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-06 11:45:18 +00:00
Tsung-Mao Fang
71f2d83688 FRP bypass defense in the settings app 
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-06 11:45:08 +00:00
Tsung-Mao Fang
22869d9019 FRP bypass defense in the settings app 
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-06 11:44:29 +00:00
William Escande
0adc966d8c Merge "Update log for BluetoothPairingService" am: cfb4ed4b7f am: cf36286d05 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2328877

Change-Id: I48c191048a87cf6dd4e3433d412836c25aae5bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 09:51:34 +00:00
Tsung-Mao Fang
1cf31d17aa FRP bypass defense in the settings app 
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-06 09:27:45 +00:00
William Escande
cf36286d05 Merge "Update log for BluetoothPairingService" am: cfb4ed4b7f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2328877

Change-Id: I1ce055ca532311ad813fdf5be80ee78e84c48d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 09:13:43 +00:00
William Escande
cfb4ed4b7f Merge "Update log for BluetoothPairingService" 2022-12-06 08:30:23 +00:00
Zhenwei Chen
b41e06a5fb Fix batteryInfo unit test 
Bug:261139453
Test: Unit test passed
Merged-In: I8f94f984dc1bf833653ae49557fdd02f736b365c
Change-Id: I8f94f984dc1bf833653ae49557fdd02f736b365c
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 54615b3bec)
 2022-12-06 06:22:38 +00:00
TreeHugger Robot
2f55f40ff3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1c6313d8c0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20631324

Change-Id: Ib266cb576c92d7f3d7da9831d3eed972bc8624e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 04:11:32 +00:00
Bill Yi
73015c5fc6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8433161d48 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20631324

Change-Id: Ifc169ef3535ae6a6c8db983b49c5b45cc11e2584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 04:11:01 +00:00
TreeHugger Robot
1c6313d8c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-06 03:44:10 +00:00
Android Build Coastguard Worker
c2d6e1848a Snap for 9371302 from 674bb29538 to tm-qpr2-release 
Change-Id: Ifedfd4c277a53a7eeac513ff832299d7ece506a1
 2022-12-06 00:27:21 +00:00
William Escande
cd231dc047 Update log for BluetoothPairingService 
ACTION_PAIRING_CANCEL does not contain an EXTRA_BOND_STATE

Test: Log change is no-op
Bug: 253775131
Change-Id: Ida67374e9369991d7e016b38df9c17a8fa5418cc
 2022-12-05 15:30:51 -08:00
Ale Nijamkin
092de727b9 Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev am: 674bb29538 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20623875

Change-Id: Ib2cfda862a53c9093db4b21de3c4ebbf32d33a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 20:00:02 +00:00
Ale Nijamkin
674bb29538 Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev 2022-12-05 19:38:16 +00:00
Bill Yi
e4cea181d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1c80356b98 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628220

Change-Id: I08a087d268c1267da267161d52962de22ab574d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:06:00 +00:00
Bill Yi
e5cc812e6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38cec4fba6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628220

Change-Id: I0e7ac80475aed3dffc036592b273e1aaf64b424d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:05:57 +00:00
Bill Yi
62a4b0a359 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6ef73d18e1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628219

Change-Id: I93671bd7a40c2f11b47f6ff1a90d25df6ddf4c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:05:55 +00:00
Bill Yi
49fdb5dc4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aeba23203 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628219

Change-Id: I4dcb605d252bfa22203d675d3d11726bc1f1cb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:05:43 +00:00
Bill Yi
3663fc792a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3408280369 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628218

Change-Id: Ie507c358a3a33f75f9a46f2ffda37a6f22d861c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:05:31 +00:00
Bill Yi
ba1266b431 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4076fea0ca -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628218

Change-Id: I41f2f812405ae6d63c1392662689c98f3ba31939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:05:17 +00:00
Bill Yi
1c80356b98 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:22:29 +00:00
Bill Yi
6ef73d18e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:22:29 +00:00
Bill Yi
3408280369 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:22:29 +00:00
Edgar Wang
f39285a722 Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev am: cb27771fd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20608287

Change-Id: I541d2fd5f50812fbd675e7ba9466a15558bb6ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 03:47:35 +00:00
Arc Wang
da847e7f00 Fix SettingsHomepageActivity crash during configuration change 
Attempt to remove the animator to avoid a RecyclerView crash.

Bug: 260208703
Test: compile
Change-Id: I568cf964107f832fde4d82306fc84772bb208e20
 2022-12-05 11:35:15 +08:00
Edgar Wang
cb27771fd5 Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev 2022-12-05 03:02:59 +00:00
Treehugger Robot
82dd9c34cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 939f6eed12 -s ours am: 8667f5efee -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123

Change-Id: I72150161019572481547375a88fd73d9e1e70e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:35:15 +00:00
Bill Yi
54e98aa86e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd -s ours am: 3a9e2e401d -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123

Change-Id: I61f1583cdf06f489a89b110324f4d932238daa3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:34:58 +00:00
Treehugger Robot
e92ac63e41 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847 -s ours am: 41f417f87b -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122

Change-Id: I9c8f91fd8dd93cb1aeeb43d9728e55500da6e477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:34:41 +00:00
Bill Yi
976ce75e87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9 -s ours am: fa8111eca1 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122

Change-Id: Iecd6456a5d1ffb4233abd2e53951bd4ee129c695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:34:28 +00:00
Treehugger Robot
1539b81ad4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a -s ours am: 891c3ab05a -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121

Change-Id: Ibab1bf0a44759ae952722c2e95ade28d4d5ec93e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:20:39 +00:00
Bill Yi
deec7d5a91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1 -s ours am: 14e15aaaa1 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121

Change-Id: Ia8737c4f76c3ee0cdcf19b27e5f47e9f444c6916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:20:34 +00:00
Treehugger Robot
8667f5efee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 939f6eed12 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123

Change-Id: I07e5c3448aec9e82e9742aa2b94de373dd46556e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:49:12 +00:00
Bill Yi
3a9e2e401d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123

Change-Id: Idd2dd91b94e3dd1e59030db9bdc5f176097c8f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:49:01 +00:00
Treehugger Robot
41f417f87b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122

Change-Id: Ie0a7bfc3f350cb049e821416ec1f80ace595c8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:48:46 +00:00
Bill Yi
fa8111eca1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122

Change-Id: Ie432f5295ba262e7caf41fcc33da65d77e9a7395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:48:12 +00:00
Treehugger Robot
891c3ab05a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121

Change-Id: I81ea24c30ed1c174c965e8fde4b3da633eb802e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:24:56 +00:00
Bill Yi
14e15aaaa1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121

Change-Id: I93b034a8d56b908a412475771db25f4bf81dd2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:24:40 +00:00
Treehugger Robot
939f6eed12 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-12-04 17:53:51 +00:00
Treehugger Robot
db2fea9847 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-12-04 17:53:51 +00:00
Treehugger Robot
e1c63ece9a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-12-04 17:51:55 +00:00
Bill Yi
8433161d48 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie497d67fdc9024e2e54f7580b4fa83778c26e3f3
 2022-12-04 00:42:56 -08:00