Vania Januar
072d8b90d0
Merge "Replace placeholder icons with stylus icons" into udc-dev
2023-05-05 09:50:11 +00:00
Chaohui Wang
39bf7dd530
Fix dialog leak in RequestPermissionActivity
...
Dialog still show when activity destroyed will cause leak.
Dismiss dialog when activity onDestroy to fix this issue.
Fix: 279522922
Test: Manually with "Don't keep activities"
Test: Robolectric Test
Change-Id: I445f4b160020823a6f6e2883055218c1224e2c48
2023-05-05 17:30:02 +08:00
Chaohui Wang
ee0a1b5224
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
am: 3d06aec9ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: Ie1b0bc84ff0a286544815d1b8e860b403ef157cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 09:22:02 +00:00
Chaohui Wang
112e3233fd
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
am: 3d06aec9ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: I2626fc0a38e21f319a50f413203b0aae086f3ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 09:21:43 +00:00
Chaohui Wang
b39729c7aa
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
am: 48c93451a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: I07bddd6922e9aea9270eeb9d769ee6b63f46dafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 09:18:56 +00:00
Chaohui Wang
48c93451a8
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: Iab82a75f8a991c54397839e208e19f426a1997a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 08:19:39 +00:00
Chaohui Wang
3d06aec9ab
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: Id277b59be091126b986475450cc36c89bf24f52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 08:19:39 +00:00
Chaohui Wang
7c042f374b
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev
2023-05-05 07:57:39 +00:00
Chaohui Wang
27038fcffe
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
am: 8b550ddb4c
am: 2adf3aa527
am: bdb1c526c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: I7bbc58e7e3cf61012dc077bdc522b017c7ee4957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 05:23:23 +00:00
Automerger Merge Worker
cc78024e03
Merge "Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 5f12c8fcf8
am: daf2c793d1" into udc-qpr-dev-plus-aosp am: d933136371
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: Id0d9de041964719fbd327ae51f8c1e23f32bc53e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 05:22:08 +00:00
Chaohui Wang
308d4d0e00
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
am: 8b550ddb4c
am: f7e0171059
am: 0dc4869b93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: I394917e3a23e42c32df639326ba3eeb39484f797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 05:18:34 +00:00
Daniel Huang
b99b40bdd6
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 5f12c8fcf8
am: 719d54a0ed
am: 72c357abc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: I951382542a6765a910cf3b5ec857e92a617c6916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 05:16:40 +00:00
Chaohui Wang
e790765a05
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
am: 534f046035
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: Ic93c794cabf05b997b980fc00111d67ac2f035cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 04:19:30 +00:00
Daniel Huang
07a0572fa9
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 319351aaf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: I2e821256729615e2bbe68faa1ec2cd2bda0a8dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 04:14:38 +00:00
Chaohui Wang
bdb1c526c4
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
am: 8b550ddb4c
am: 2adf3aa527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: I73331127fc3d89a3688db73a14caffc84e18fcfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 04:07:00 +00:00
Automerger Merge Worker
d933136371
Merge "Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 5f12c8fcf8
am: daf2c793d1" into udc-qpr-dev-plus-aosp
2023-05-05 04:04:33 +00:00
Chaohui Wang
0dc4869b93
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
am: 8b550ddb4c
am: f7e0171059
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: I5009be1df800c5ce0412de26e6793116a4ca96b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 04:04:23 +00:00
Daniel Huang
cc32700bf0
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 5f12c8fcf8
am: daf2c793d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: I0796b0de9f56332c6745a786796fb5d3ccdae6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 04:04:23 +00:00
Daniel Huang
72c357abc9
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 5f12c8fcf8
am: 719d54a0ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: If525f9127dab9fb661ee9970af420d360cd29c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 04:02:58 +00:00
Chaohui Wang
2adf3aa527
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
am: 8b550ddb4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: I84a2cf46197e91fc0e840f7916fa34434914b548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:35:22 +00:00
Chaohui Wang
f7e0171059
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
am: 8b550ddb4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: Ia903e4ca45754258386e9142007d5c9af03b7b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:33:35 +00:00
Chaohui Wang
8b550ddb4c
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: I64197b730225942a2cab8cf154b1ad6f4b438e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:19:04 +00:00
Chaohui Wang
534f046035
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: I7ee9048d652ffd68da7b9dc7d713e8451603fd3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:18:05 +00:00
Daniel Huang
daf2c793d1
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 5f12c8fcf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: I206f901fc41f60a6a825b107dfa1cfeb94e5c608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:15:39 +00:00
Daniel Huang
719d54a0ed
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 5f12c8fcf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: Id9d40a85143dc91f7831af69c9fa0b28825a3390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:15:25 +00:00
Becca Hughes
9b36bd4ed3
Use isPrimary bit to determine top provider am: 3096997718
am: 1955e67933
am: b1e0308d8f
am: b16290301e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: Ibfcfa06e5aee49113bc1ce1e86db8885e551a5a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:05:43 +00:00
Chaohui Wang
804214c160
Merge "Log app special permission change for SPA" into udc-dev
2023-05-05 03:03:52 +00:00
Becca Hughes
7cc601625c
Use isPrimary bit to determine top provider am: 3096997718
am: 4c657e3635
am: c54ac1369e
am: e94f177748
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: I5d5c21fd8b36c824045952e4905eee0c4fc7d6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 02:56:06 +00:00
Becca Hughes
e346126f17
Use isPrimary bit to determine top provider am: 3096997718
am: 1955e67933
am: 28e5ef06b4
am: e69657227a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: If318ecf53d9c7b3406127a43d3e79970754b2a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 02:39:56 +00:00
Daniel Huang
319351aaf4
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: Icb0a6739f47101b83e9d6d634b22c084b039b515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 02:34:58 +00:00
Daniel Huang
5f12c8fcf8
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: I6d1705a4e749d9d46d1c52433e6d7b3a3766f713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 02:34:58 +00:00
Daniel Huang
08b2b68e22
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev
2023-05-05 02:33:13 +00:00
Becca Hughes
b16290301e
Use isPrimary bit to determine top provider am: 3096997718
am: 1955e67933
am: b1e0308d8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: Ie12b30c8f334458d98bfb382de779f90b2388943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 01:40:26 +00:00
Becca Hughes
e94f177748
Use isPrimary bit to determine top provider am: 3096997718
am: 4c657e3635
am: c54ac1369e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: I6dd68d0ef31e3aa2a59ff0c8743c01305a932683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 01:29:23 +00:00
Becca Hughes
e69657227a
Use isPrimary bit to determine top provider am: 3096997718
am: 1955e67933
am: 28e5ef06b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: Ic885a62a7273e27b26235bd5a05f2ca5f2dfbce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 01:27:56 +00:00
Bill Yi
bdba9f43ad
[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f
-s ours am: eb890c8bf8
-s ours am: bdeb587767
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: I103a5c2037a652321ed436047be159e845879b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:43:56 +00:00
Bill Yi
54f6fc6d11
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c
-s ours am: 3f186b6b1c
-s ours am: 649fb33ad4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: I5a2219a23ac792a1d8583b6345e8c46005f8e1d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:43:35 +00:00
Becca Hughes
b1e0308d8f
Use isPrimary bit to determine top provider am: 3096997718
am: 1955e67933
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: I00fc7b3c48ff0e921a07e9bebd8baccbb3211b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:26:23 +00:00
Treehugger Robot
b57cfb62a9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: e1e392ba22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975960
Change-Id: I19350eb0722050b10de4c0f85f63ecdb1e061530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:22:02 +00:00
Becca Hughes
c54ac1369e
Use isPrimary bit to determine top provider am: 3096997718
am: 4c657e3635
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: Icd1551c9a1bd5867480201659ee96cb76ab9f613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:21:57 +00:00
Becca Hughes
34e0a12753
Use isPrimary bit to determine top provider am: 3096997718
am: 6464b82525
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: Ib2ca71277a44069e1b0f91ac704374e3056d72de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:20:25 +00:00
Becca Hughes
28e5ef06b4
Use isPrimary bit to determine top provider am: 3096997718
am: 1955e67933
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: Ibdba4a4a9d9e581ab2ab4b365a124dc3fb6ed5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:19:06 +00:00
Treehugger Robot
e1e392ba22
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-05-05 00:04:14 +00:00
Treehugger Robot
8f24e139c2
Merge changes from topic "tc_change_23050307_132"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5e4956845b
Import translations. DO NOT MERGE ANYWHERE
2023-05-05 00:04:14 +00:00
Bill Yi
bdeb587767
[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f
-s ours am: eb890c8bf8
-s ours
...
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: I1912e8a1b21aae82c5ebd9c3f7daa14235d66978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:01:08 +00:00
Bill Yi
649fb33ad4
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c
-s ours am: 3f186b6b1c
-s ours
...
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: Ib13a4b9830161df33f6d36827fbdb6e584d9e54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:00:53 +00:00
Becca Hughes
1955e67933
Use isPrimary bit to determine top provider am: 3096997718
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: I9f410931f805bbf05bf3a7956a48483ed4388bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 23:49:42 +00:00
Becca Hughes
6464b82525
Use isPrimary bit to determine top provider am: 3096997718
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: I496a9ca5f2712cb3017502d8c99acea125aeff84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 23:46:40 +00:00
Becca Hughes
4c657e3635
Use isPrimary bit to determine top provider am: 3096997718
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: I8e6537d62ca6802adbdfadf9535cc4395dd6154c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 23:39:14 +00:00
Bill Yi
eb890c8bf8
[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f
-s ours
...
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: I93c612069bd783894cfbc07e1f7e1028dd1a7780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 23:21:20 +00:00