Bill Yi
5f08e8ace3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0d848cb0ac
-s ours am: fdcb8480d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20738962
Change-Id: I35b03d27edbd36f305f6cf1d138c5910f16d590d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 23:15:31 +00:00
Bill Yi
d00fdfc8ab
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b66bdeb77f
-s ours am: 58b243bd47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20738962
Change-Id: Iacb436e70a856583b8e65fb8d848dc5ba48aabef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 23:15:00 +00:00
Florian Mayer
2be085005b
Merge "[MTE] allow device policy to control setting"
2022-12-15 18:40:14 +00:00
Bill Yi
fdcb8480d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0d848cb0ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20738962
Change-Id: I94f490d83c21235c9c500c4a6fa8c2659dbe87fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 14:30:47 +00:00
Bill Yi
58b243bd47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b66bdeb77f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20738962
Change-Id: I769be6cbdc13dcca0e325bef5558ee3abc66b73e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 14:30:12 +00:00
Bill Yi
0d848cb0ac
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-15 14:08:52 +00:00
Treehugger Robot
2f96743835
Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee
am: 24835ea2f9
am: 8a26d010d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884
Change-Id: I6b4edd0be16e090b56b628af51a0558c87822ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 13:41:13 +00:00
Treehugger Robot
8a26d010d0
Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee
am: 24835ea2f9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884
Change-Id: Ie89e48f670b7e3cc8d8d607149d35c678b67ae8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 12:59:37 +00:00
Treehugger Robot
24835ea2f9
Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884
Change-Id: I5f73183e359038b48df0a83c4ce76c3dbc4cc42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 12:25:52 +00:00
Treehugger Robot
d03411f0ee
Merge "Align SETTINGS_PACKAGE_NAME reference to a single place"
2022-12-15 12:03:36 +00:00
YK Hung
e047b4f400
Merge "Move setup optimization mode to main thread"
2022-12-15 10:56:09 +00:00
Edgar Wang
6e0ac2699e
Merge "Fix NPE crash in MainClearConfirm"
2022-12-15 09:27:46 +00:00
TreeHugger Robot
87498a19e6
Merge "Add a new field elapsed_time_millis into Settings' atom"
2022-12-15 09:17:47 +00:00
TreeHugger Robot
abe7e28a1e
[automerger skipped] Merge "Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION" into tm-qpr-dev am: 8ccf48b0fc
am: e2fa501390
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0c18e8990c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727250
Change-Id: I8e163226958eb0812315eee9cb705b05106a5bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 07:10:46 +00:00
TreeHugger Robot
e2fa501390
Merge "Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION" into tm-qpr-dev am: 8ccf48b0fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727250
Change-Id: I230322f17eb8335240e655e1d8af24776d82d6ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 06:32:57 +00:00
Kuan Wang
6c4f83f33d
Load app usage events data in the hourly job.
...
Test: make RunSettingsRoboTests + manual
Bug: 260964679
Change-Id: Iaccaa77bd52fb7356cdcb786c64523f21040b128
2022-12-15 06:32:54 +00:00
Kuan Wang
52ad3ba925
add OWNER for protos directory
...
Test: NA
Bug: NA
Change-Id: I985a4918d7bac938dc843c8cdce1f139b5449609
2022-12-15 06:31:25 +00:00
TreeHugger Robot
8ccf48b0fc
Merge "Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION" into tm-qpr-dev
2022-12-15 06:06:22 +00:00
Arc Wang
29e6a8c0f9
[automerger skipped] Merge "Allow 2-pane deep link to access unexported Activity" into tm-qpr-dev am: e8e2d9c68f
am: c743f44644
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 1a49146508
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20704230
Change-Id: I2687004add2e20b85685248644bcddcc88c7e6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 05:53:51 +00:00
TreeHugger Robot
ca390cd6c2
Merge "Fix b/262378515: NullPointerException in TabPreference.onDetached()"
2022-12-15 05:28:42 +00:00
Arc Wang
c743f44644
Merge "Allow 2-pane deep link to access unexported Activity" into tm-qpr-dev am: e8e2d9c68f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20704230
Change-Id: Ic7b667e5d12c125769feabc0ac13f79eaafab771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 05:16:14 +00:00
Arc Wang
e8e2d9c68f
Merge "Allow 2-pane deep link to access unexported Activity" into tm-qpr-dev
2022-12-15 04:23:13 +00:00
Arc Wang
95ff075244
Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION
...
To improve security, calling app must be granted Uri permission
if it sets FLAG_GRANT_READ/WRITE_URI_PERMISSION in the Intent of
ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY.
Bug: 250589026
Test: manual
Change-Id: I48f88c662b843212b1066369badff84cf98935a8
Merged-In: I48f88c662b843212b1066369badff84cf98935a8
2022-12-15 03:40:08 +00:00
Arc Wang
c8b31a5170
[automerger skipped] Settings 2-pane deep link vulnerabilities am: d1549f2243
-s ours
...
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 c3141fa911
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727214
Change-Id: I28575cf0dba875e1c0f2cd9a17cf09f98f33522e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 03:17:30 +00:00
Bonian Chen
b7c309b075
Merge "[Settings] Try to reduce the time pending on BroadcastReceiver"
2022-12-15 01:16:24 +00:00
Abel Tesfaye
2404e07ad1
Create unique metrics category for DeviceStateAutoRotateDetailsFragment
...
DISPLAY_AUTO_ROTATE_SETTINGS is being used by two separate fragments.
Test: none
Bug: 260071662
Change-Id: I8f02e1df54451f0f7501edcf31d8060fdcc604e6
2022-12-14 21:15:11 +00:00
Bill Yi
b66bdeb77f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I57333cf8b71834cba7ad120d25795998abc7cb9a
2022-12-14 12:52:47 -08:00
Arc Wang
d1549f2243
Settings 2-pane deep link vulnerabilities
...
Settings app must not start an deep link Activity if
1. The deep link Activity is not exported.
or
2. Calling package does not have the permission to
start the deep link Activity.
Bug: 250589026
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
Change-Id: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
Merged-In: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
2022-12-14 11:59:57 +00:00
Bonian Chen
3ac629f04e
[Settings] Try to reduce the time pending on BroadcastReceiver
...
This is not a design which could resolve the issue, but try to improve
it through reducing the time blocking on BroadcastReceiver and reducing
the happening of ANR.
Bug: 262209170
Test: local and auto
Change-Id: Idec4da3d1deaffb121a5c7a73aeb84b4b0331374
2022-12-14 10:06:12 +00:00
Zaiyue Xue
a944ee2a02
Fix b/262378515: NullPointerException in TabPreference.onDetached()
...
Bug: 262378515
Fix: 262378515
Test: presubmit
Change-Id: I9c0629d570538a664c361eae74e8f7818f4210df
2022-12-14 15:33:34 +08:00
SongFerng Wang
b64d2b2f9e
Merge "Revert "Remove "Backup Calling" button from Settings UI""
2022-12-14 05:56:43 +00:00
Arc Wang
86afd10ada
Merge "Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION"
2022-12-14 05:52:29 +00:00
Arc Wang
aef9355579
Merge "Allow 2-pane deep link to access unexported Activity"
2022-12-14 05:52:15 +00:00
Sunny Shao
d21c97e9a7
Add a new field elapsed_time_millis into Settings' atom
...
- Add a new field elapsed_time_millis to keep the elapsed time
since setup wizard finished.
Fixes: 260660970
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Change-Id: I28d13c4987ae1e4ef12eaff27e26a5121cf8093b
2022-12-14 12:53:54 +08:00
Jason Chiu
a3cb36777b
Merge "Fix IllegalArgumentException from RecyclerView in PanelFragment" into tm-qpr-dev am: 0b0d8ace66
am: 95c7c63fc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20715247
Change-Id: I06a8740c4ebb5114f9248b68e069f075e56111de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-14 03:47:06 +00:00
Jason Chiu
95c7c63fc1
Merge "Fix IllegalArgumentException from RecyclerView in PanelFragment" into tm-qpr-dev am: 0b0d8ace66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20715247
Change-Id: I963a95fb9787778579a1c9a1a0237b84b4384a1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-14 03:12:23 +00:00
Jason Chiu
0b0d8ace66
Merge "Fix IllegalArgumentException from RecyclerView in PanelFragment" into tm-qpr-dev
2022-12-14 02:49:58 +00:00
Jason Chiu
79d282bbfb
Merge "Revert "Remove FLAG_ACTIVITY_FORWARD_RESULT in 2-pane flow""
2022-12-14 02:49:17 +00:00
XingHai Lu
fd39b53f51
Merge "Cleanup plurals in Settings, change <one> to <1> in string res file."
2022-12-14 02:10:08 +00:00
TreeHugger Robot
a464ca0e47
Merge "Make BatteryStatsHistoryIterator API compatible with Iterator"
2022-12-14 01:49:18 +00:00
TreeHugger Robot
3518578331
Merge "Remove redundant method in LocalMediaManager"
2022-12-14 01:47:02 +00:00
Florian Mayer
8b9d792692
[MTE] allow device policy to control setting
...
Test: unit tests
Test: TestDPC with COPE and DO
Test: make RunSettingsRoboTests
Bug: 244290023
Change-Id: I0e03d0dbe44ef595d813652f85529c1fe5fd6cec
2022-12-14 00:54:46 +00:00
Diya Bera
942df78886
[automerger skipped] Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev am: 2d343061d3
am: c52d4922cc
-s ours
...
am skip reason: Merged-In I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23 with SHA-1 37858ea1f2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20523590
Change-Id: I59dff6dc0f9d03af3dd1c5cf96409ca53f8195d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 22:10:29 +00:00
Diya Bera
c52d4922cc
Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev am: 2d343061d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20523590
Change-Id: I8fdd0725e4c0a1b0d2f7ced3ce058522566528f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 21:37:51 +00:00
Diya Bera
2d343061d3
Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev
2022-12-13 21:15:08 +00:00
TreeHugger Robot
9ff5eb35ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 47302fda11
-s ours am: 240835c715
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20715276
Change-Id: Ib7044e12a6c6d571d93e0b7b60f2ddc077a9eabd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 21:04:02 +00:00
Bill Yi
33b252d545
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4453455aae
-s ours am: 2c7ca303ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20715276
Change-Id: I7a763c6ea7e9802a34bbc716e84b75ad51d24cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 21:03:39 +00:00
TreeHugger Robot
240835c715
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 47302fda11
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20715276
Change-Id: I41d2cb5a62ffa6d03e24dfb143a4816881be2494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 20:25:39 +00:00
Bill Yi
2c7ca303ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4453455aae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20715276
Change-Id: I44b33cf33b581726795713834e56a6cf15ca5415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 20:25:07 +00:00
TreeHugger Robot
47302fda11
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-13 19:49:15 +00:00