PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,989 Commits 1 Branch 0 Tags
ee78e77aae26e8697b62b54de33b20420edfb7e0
Commit Graph

91989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
ee78e77aae Fix LaunchAnyWhere in AppRestrictionsFragment am: f600c05a5a am: 52c173bb2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730678

Change-Id: I95f8e4d6928b084544671966889e9bf47883e31e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:53:46 +00:00
Edgar Wang
52c173bb2e Fix LaunchAnyWhere in AppRestrictionsFragment am: f600c05a5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730678

Change-Id: I8ed8792698b508aaaf1b019aa7640a04b0ef2ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:48:58 +00:00
Edgar Wang
52180e031d Fix LaunchAnyWhere in AppRestrictionsFragment am: 019eb77224 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730679

Change-Id: I489e5b8ff03e563cd71cb413c8b24a2cc049c096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:20 +00:00
Xiao Ma
d60998396a Merge "Remove the legacy config_ethernet_iface_regex from Settings." am: 73d83b69d3 am: a8ff1f723c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2052707

Change-Id: Ie6ace4dda17b456042295b9104d2ca0246a1ad7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 01:34:45 +00:00
Xiao Ma
a8ff1f723c Merge "Remove the legacy config_ethernet_iface_regex from Settings." am: 73d83b69d3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2052707

Change-Id: I9aaf20d105029e379dc8c6c28b3c88d4a75e7424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 01:11:22 +00:00
Xiao Ma
73d83b69d3 Merge "Remove the legacy config_ethernet_iface_regex from Settings." 2022-04-14 00:50:31 +00:00
Xiao Ma
ce9b4447c4 Remove the legacy config_ethernet_iface_regex from Settings. 
Bug: 214348333
Test: m Settings
Test: manually verify that device can access the Internet via Ethernet
Test: manually verify that device can share the Internet via Ethernet
      tethering
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherEnablerTest
Change-Id: I822ff60ee8be63ff0c518d2972ad8b30dfacadcd
 2022-04-13 18:37:26 +09:00
Edgar Wang
019eb77224 Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3)
 2022-04-13 04:51:09 +00:00
Edgar Wang
f600c05a5a Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3)
 2022-04-13 04:50:33 +00:00
TreeHugger Robot
f6bc991eca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcf3abb8947dddfdf7db01c7ed7a7a8fb8b95042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:45:50 +00:00
Bill Yi
772b675c21 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2141797b3768ad979ff4dd600687ec17e4b28a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:45:41 +00:00
TreeHugger Robot
6a8dbf49bd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-11 06:23:57 +00:00
Bill Yi
f89aa3ca1a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I21a2962c5ae08b820a33b14a9a2c0243776cf792
 2022-04-09 13:30:52 +00:00
Bill Yi
7df6d79353 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ied5fd9d22e8a7567f921d24c344a6419ccf1fbbe
 2022-04-09 13:15:09 +00:00
Bill Yi
a8dc008745 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic7c984e8829ae72309c1fc673d8b5efda52cac25
 2022-04-09 13:15:01 +00:00
Bill Yi
74fc91b313 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours 
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I8ccdc0914ae332731dbc24330bb7d42b05356ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:14:45 +00:00
Bill Yi
fdcf2eed39 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours 
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I24893b4908756aceef98fd3edf3ed0d68e5c27ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:14:30 +00:00
Bill Yi
6df1ae4e5f [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours 
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I50b41ddcca4b5d93a80d7cb274c7bc6aee8e97cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 18:31:36 +00:00
Bill Yi
ee5c8c915e [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours 
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: Iae1f5f9c4b22fdd8aa1e82185a64c07d8c65a979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 18:31:20 +00:00
Bill Yi
c854c108a2 Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:25 +00:00
TreeHugger Robot
191b3c66f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cbe6e45fe2c432891eafd33960e2114b602e2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:41:15 +00:00
Bill Yi
6d933dc234 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic87c9242df5d2da4163fe06cdc4a3ef52b271261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:41:03 +00:00
TreeHugger Robot
71308f95e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a5175a3977c16809128da77a7fba4438135952d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:38:33 +00:00
TreeHugger Robot
0e17e61443 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:22:54 +00:00
TreeHugger Robot
dd199c11cb Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-08 16:20:46 +00:00
TreeHugger Robot
e07b5149fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:20:46 +00:00
Treehugger Robot
a1e66c3aca Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I67259014672c0cac5375b25d6c05a73b5ffc30da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 10:41:07 +00:00
Treehugger Robot
02701dd8b1 Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I686382ad702fb8e9fc090ea8441f9a1b3cae0716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 10:03:46 +00:00
Treehugger Robot
d6d6c5c020 Merge "Settings: Fix sometimes reset progress dialog not dismissed" 2022-04-08 09:46:39 +00:00
Arc Wang
106834efae [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: 88f4d41a82 -s ours am: 58402f2e9f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iade58839f7c094a43b5386190c44f8f2e4056165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:06:06 +00:00
Arc Wang
18e01b28e1 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: e80a3dda3c -s ours am: 13a95907d8 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Id13203fcbe712651e2dc98aff35bc2776ec416df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 04:06:03 +00:00
Arc Wang
58402f2e9f [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours am: 88f4d41a82 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iaf390a8742ca82ab9f5eb4023ce35f2b0bf598b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 03:28:21 +00:00
Arc Wang
13a95907d8 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours am: e80a3dda3c -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I46a08791fda8dc955f2980effefa48fbe731b542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 03:28:20 +00:00
Arc Wang
88f4d41a82 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours am: 6b70d3b6ec -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4929ded7641c64da2331ef184e08a90d7e31df6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:53:16 +00:00
Arc Wang
e80a3dda3c [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours am: cf3835db35 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4ce3bc069c05b36c61dcb97204ec3eadb9a0a541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:53:15 +00:00
Arc Wang
6b70d3b6ec [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours am: 3fc5b81efe -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I2f92dcd0ce9c7e0075b2bb0147547e65ef5802c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:19:30 +00:00
Arc Wang
cf3835db35 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours am: 4bf19c2271 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ieb785f34e2f09e855d511a22994d6869589d77f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:19:28 +00:00
Arc Wang
ed46f3e357 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours am: 1d7d6ec5b8 -s ours am: bb5620a06d -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I60df12535cd4a15c60973b384a9a56d2990e47bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:11:03 +00:00
Arc Wang
b55e56b5a9 [automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev am: c2c5b15855 -s ours am: 017fe0895f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4511c5642bc67356e3414a4ca723094ef45f2282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:10:51 +00:00
Arc Wang
e29e6ba72e [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 am: 3357f3071a -s ours am: 31c51f18fc -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iff0b47ee51292c1b7f408691c8cbb63543b1b093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 02:10:46 +00:00
Arc Wang
3fc5b81efe [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 91481f8a1f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ied0f1e36a2d67fa9681f60c89ce0748af48148b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:50:59 +00:00
Arc Wang
4bf19c2271 [automerger skipped] Hide non-system overlay window on ActivityPicker am: d10662cf97 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ib0ff605c1ed18d9053248dace8087fab90c3234c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:50:58 +00:00
Bill Yi
35525a5617 Merge SP2A.220405.004 to aosp-master - DO NOT MERGE 
Merged-In: I2a97159d0de32a6262bbace7bb82b09897447bdb
Merged-In: I58aad30729443e148da154a0d1125a6e8cb8c9d3
Change-Id: I593218f8417ab99d88c16705eef2cef705e0fcf7
 2022-04-07 18:41:02 -07:00
Arc Wang
bb5620a06d [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours am: 1d7d6ec5b8 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I7ef9834c36d7aed6196e408d917b35fb700e6f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:09 +00:00
Arc Wang
017fe0895f [automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev am: c2c5b15855 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ie8771d1f169bb4299b0aafce6ced2dae9e8cf270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:02 +00:00
Arc Wang
31c51f18fc [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 am: 3357f3071a -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I856e903afba4e53c2a527886f7fab8527e427349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:36:01 +00:00
Arc Wang
1d7d6ec5b8 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e0a -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I20a17544720140fd1fc62b91f538c89d06184a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 01:35:56 +00:00
Arc Wang
91481f8a1f Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev 2022-04-08 01:19:01 +00:00
Arc Wang
f2b1582e0a Merge "Hide non-system overlay window on ActivityPicker" into sc-dev 2022-04-08 01:01:27 +00:00
Arc Wang
c2c5b15855 Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev 
* changes:
  [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
  Hide non-system overlay window on ActivityPicker
 2022-04-08 01:01:27 +00:00