Bill Yi
ef9aa836f5
[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: 54f6fc6d11 -s ours am: c654f7fe7b -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: I8a97e31c51716bcf24f28c5b7be100aa3c071f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 23:15:19 +00:00
Bill Yi
c654f7fe7b
[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: 54f6fc6d11 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: If70f3624ac139e400eecec0650448f316d14a049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 22:52:06 +00:00
Becca Hughes
016b0bee12
Fix newly installed providers bug am: 17a0266b16 am: fa5c54dcaf am: e150bb8a57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200
Change-Id: Icadb06b5a78962056e61754bdb8f9c240febb6f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 22:26:44 +00:00
Becca Hughes
97d865845c
Fix newly installed providers bug am: 17a0266b16 am: fa5c54dcaf am: b15ed12119
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200
Change-Id: I93dab6fc16e7888bdef5886d857897cbafa93085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 22:21:18 +00:00
Becca Hughes
e150bb8a57
Fix newly installed providers bug am: 17a0266b16 am: fa5c54dcaf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200
Change-Id: I51e4b23ea053e27c31586c1efe3fe7f3368b006a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 21:43:34 +00:00
Becca Hughes
b15ed12119
Fix newly installed providers bug am: 17a0266b16 am: fa5c54dcaf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200
Change-Id: I4364111601f67e6661dd7b6f09ef7f36361769db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 21:39:26 +00:00
Becca Hughes
fa5c54dcaf
Fix newly installed providers bug am: 17a0266b16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200
Change-Id: I8060e38ff4ae2d05c0f63b0ac1ceac49379ac2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 21:01:01 +00:00
Guangjie (Jerry) Shi
4489cf5c71
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578 am: 9c922641c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: I9e9ac2cdab52ffbd3c878bc972ca8a12ec99a995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 18:53:27 +00:00
Guangjie (Jerry) Shi
7096d488d4
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578 am: b9853fd9f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: Ic6462c987370c9c3ba3731747328fcab2b5a31d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 18:51:02 +00:00
Becca Hughes
17a0266b16
Fix newly installed providers bug
...
Package monitor was not registered
properly.
Change-Id: Ifde2e6027b2aee2355114c8ff9b0d1f542fa2f8d
Test: treehugger
Bug: 280867431
2023-05-05 18:27:26 +00:00
Guangjie (Jerry) Shi
9c922641c1
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: Ida6d4cc55ec83fe30a75fb577170f47b60bd0eb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 18:08:37 +00:00
Guangjie (Jerry) Shi
b9853fd9f4
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: Id318cb90a4fe3d364cb91c4a6b3228835860c6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 18:06:33 +00:00
Guangjie (Jerry) Shi
5ea3d20578
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: If4dc87d555834f8c89e2de23b09d2c0cad78ac46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 17:27:57 +00:00
Guangjie (Jerry) Shi
2898e3b527
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev
2023-05-05 16:45:37 +00:00
Jerry Shi
8d167d55f3
Do null check to account for the case where provider is only autofill
...
provider.
Test: local build
Bug: 281047738
Change-Id: I9f3dca118a0d4182e2d727fa011dcb48db2a553f
2023-05-05 14:59:27 +00:00
Chaohui Wang
ae26811b46
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2 am: 3a164bc0db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: I5865f54eda7456ee9a1630e3d1bec7a0f8470450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 13:34:01 +00:00
Chaohui Wang
1589d91e42
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2 am: d91ec4c6ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: Ie5cbd3133fb810621a7e1b8ebfde524edd4aa563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 13:25:48 +00:00
Chaohui Wang
3a164bc0db
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: I2d6c0af8414dc753ebba0d82ef188ea136558749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:51:21 +00:00
Chaohui Wang
d91ec4c6ce
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: Ia558ba2a9d668942483164792899339d355e9bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:47:14 +00:00
Vania Januar
2c77f5a3ed
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4 am: a2f4601fa8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: I1c9d10acc836e6a1cb6ddd34f987c2292f9880b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:10:18 +00:00
Chaohui Wang
72f42fe9f2
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: I4c0efabd30e2e9cf0d46477672741474bb8203f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:09:38 +00:00
Vania Januar
75d8bf6b10
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4 am: aa438742ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: I043d7acab120d6d9fc3b1aed4833466b358b4542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:06:04 +00:00
Chaohui Wang
5b18837a49
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev
2023-05-05 11:32:13 +00:00
Vania Januar
a2f4601fa8
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: I63c9b6e5bdd23a0f57cc7729bcbd6606cb89c4a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 11:27:18 +00:00
Vania Januar
aa438742ed
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Ie8ee82c7ec38135b7f8bba33e171aece1bf337a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 11:23:05 +00:00
Vania Januar
247fed89c4
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Icc6d64627bba5370c4d68a0456c0d2641540cdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 10:45:36 +00:00
Chaohui Wang
dbe6495c31
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: 3d06aec9ab am: 112e3233fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: I8c56224290c812975dcf93a1d6e266869537025b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 10:05:38 +00:00
Chaohui Wang
9c30db071c
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: 3d06aec9ab am: ee0a1b5224
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: I6f19ceea151d73bb6a9f1c79ff723326260c26cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 10:00:49 +00:00
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
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
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
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
Chaohui Wang
804214c160
Merge "Log app special permission change for SPA" into udc-dev
2023-05-05 03:03:52 +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