Treehugger Robot
952dbb9aa3
Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev
2024-06-06 07:30:05 +00:00
Treehugger Robot
324e36b19d
Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev
2024-06-06 07:30:05 +00:00
Chaohui Wang
acb62012e4
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
am: a61b3964c2
-s ours am: 178f7a0806
-s ours am: 1720630e6e
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 092668676a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: Iad192c356baaf0b041cbda0114d75e6e8e749443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 19:01:25 +00:00
Chaohui Wang
d7d1839227
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 9dfeabd51b
am: bc56517fe9
am: 52f79ff225
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I17adb5badb8ea92de3f9b98ec5a909f50648ce39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 19:01:12 +00:00
Chaohui Wang
1720630e6e
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
am: a61b3964c2
-s ours am: 178f7a0806
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 092668676a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I8d8966af423daca4a639f188fcf457cd88cae486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:46:36 +00:00
Chaohui Wang
178f7a0806
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
am: a61b3964c2
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 092668676a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I573404e110ca4979a2ef11963529dbefaaf92747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:40:50 +00:00
Chaohui Wang
52f79ff225
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 9dfeabd51b
am: bc56517fe9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: Ic4efeb96e0aa9eabbd77b58d344eba517eeee768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:40:37 +00:00
Chaohui Wang
bc56517fe9
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 9dfeabd51b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: Ife3fc06e681f0ba7e5e167630e8b25e70b2c760a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:16:10 +00:00
Chaohui Wang
a61b3964c2
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I005572a454c3c809b7658aa7a20f3d7255316051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:15:41 +00:00
Chaohui Wang
9dfeabd51b
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I37b1dd03af999c43a99a1fd8984670ebeafd8d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:02:03 +00:00
Chaohui Wang
5d7cc10daa
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I157e23b564e04f9aa136bfc476f8bfb20584fdb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:02:02 +00:00
Chaohui Wang
2f6a54d7de
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: Ibee19fb0bf3bd66c3828e70c30418d4bdee56b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 17:41:47 +00:00
Chaohui Wang
d80e331ede
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: Iaa904bec8c34a61266169129f6a863bc0a476ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 17:23:32 +00:00
Chaohui Wang
0a57f0589f
Limit wifi item edit content's max length to 500 am: 092668676a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I51c391273d6d7c6d56a227df9f3df15404d5a0fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 16:46:22 +00:00
Chris Antol
7e0b376b11
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:16:42 +00:00
Chris Antol
f5e9b0167a
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:16:32 +00:00
Chris Antol
24e2f2d2f6
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:16:14 +00:00
Chris Antol
e2dc98c21d
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:15:53 +00:00
Chris Antol
abf11e7350
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:15:21 +00:00
Chris Antol
d43f82be7a
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:14:58 +00:00
Chris Antol
8607f3a34e
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:13:51 +00:00
Jason Chiu
b86569b274
[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()
...
getLaunchedFromPackage() reports who launched this Activity or built
PendingIntent used to launch it, whereas getCallingActivity() reports
who will get result of Activity.
Bug: 316891059
Bug: 333364513
Test: robotest, manual
Change-Id: If97018c2741caef622f0596bbfeaa42ef1788b78
(cherry picked from commit ddc11bc03a
)
2024-05-29 01:31:38 +00:00
Chaohui Wang
092668676a
Limit wifi item edit content's max length to 500
...
Bug: 293199910
Test: manual - on "Add network"
Merged-In: I303b8c6e0f3c3a1174a047ba98f302042e5db9ae
Change-Id: I303b8c6e0f3c3a1174a047ba98f302042e5db9ae
(cherry picked from commit 855053ca41
)
2024-05-28 10:41:48 +00:00
Jason Chiu
8bdbb580da
Replace getCallingActivity() with getLaunchedFromPackage()
...
getLaunchedFromPackage() reports who launched this Activity or built
PendingIntent used to launch it, whereas getCallingActivity() reports
who will get result of Activity.
Bug: 316891059
Test: robotest, manual
Change-Id: If97018c2741caef622f0596bbfeaa42ef1788b78
Merged-In: If97018c2741caef622f0596bbfeaa42ef1788b78
(cherry picked from commit ddc11bc03a
)
2024-05-28 02:40:04 +00:00
Weng Su
0abcc6d070
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours am: 1112a774e0
-s ours am: c70a02037d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I2ef9b190b078c7449241c91e3456dee2174363ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 17:23:50 +00:00
Weng Su
c70a02037d
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours am: 1112a774e0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I9c69e4b2f3a0e595d3b7ea39961a269b1275a7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 17:11:14 +00:00
Weng Su
1112a774e0
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
am: 981673f940
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814
Change-Id: I074db2071f87741f334c35459655b1946d92339a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-05 16:53:53 +00:00
Weng Su
fe84674bf9
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours am: 70d03ec35b
-s ours am: 74c1cf0e7b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I3554a4f09f2aca6f1f39c69d4564faed19615e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:51:21 +00:00
Weng Su
74c1cf0e7b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours am: 70d03ec35b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I3fd4e0ecb10c7bf587ad45fc174ad0fb2f2ccb4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:33:36 +00:00
Weng Su
981673f940
[conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 3d6b2b688e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I7f37ea9867aff063d8a22580d84ab0007abad77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:29:43 +00:00
Weng Su
70d03ec35b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
am: 4a93bd9f39
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I190f6f720fa4a6f1fe6f737414a2b8f485a5a4ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:19:13 +00:00
Weng Su
1f2fc04f17
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
am: 146d51f2cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: If2fb5dea84a4e7f26186a062bd9b946709642da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:19:04 +00:00
Weng Su
146d51f2cc
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26804708
Change-Id: I2f57a28bbc46a1f648d6ecf0a72eab3a884e69e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:34 +00:00
Weng Su
3d6b2b688e
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I475d313032f26d9e835f04d4b8f6ed0e03fb4075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:12 +00:00
Weng Su
4a93bd9f39
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831
Change-Id: I1c23b0952d7e372848fe7486f2efea34b94e9253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-04 20:06:11 +00:00
Weng Su
254ba087c2
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
...
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG
- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG
Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
SettingsUnitTests:WifiDppConfiguratorActivityTest
Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 07:50:24 +00:00
Weng Su
0ea027a71c
[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
...
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG
- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG
Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
SettingsUnitTests:WifiDppConfiguratorActivityTest
Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 03:52:07 +00:00
Jason Chiu
19ae28f1eb
Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a
am: 930a9f3180
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861
Change-Id: I0ef0c89fe3f3c0f9d8addef766b74f9b637eea92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 05:33:46 +00:00
Jason Chiu
930a9f3180
Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861
Change-Id: I01598c3f2fa5432dc27357701ddcbb29b4c97776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 04:47:38 +00:00
Bill Yi
6b558097e2
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-02-23 00:07:24 +00:00
Jason Chiu
ddc11bc03a
Replace getCallingActivity() with getLaunchedFromPackage()
...
getLaunchedFromPackage() reports who launched this Activity or built
PendingIntent used to launch it, whereas getCallingActivity() reports
who will get result of Activity.
Bug: 316891059
Test: robotest, manual
Change-Id: If97018c2741caef622f0596bbfeaa42ef1788b78
Merged-In: If97018c2741caef622f0596bbfeaa42ef1788b78
(cherry picked from commit 901880a1d2
)
2024-02-22 03:43:50 +00:00
Bill Yi
1dcaca0925
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b8f1a51ba36d13d5196d03285a996b76016652c
2024-02-21 16:01:20 -08:00
Bill Yi
5c8799994d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iac5066bd452c29cf0c7ebe8f9de2cd0596061d22
2024-02-21 15:58:17 -08:00
Bill Yi
0e856c1a68
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-02-15 21:28:56 +00:00
Bill Yi
09454f8635
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2d59d3beebc4e0d05779836201fd704c4a5a62fc
2024-02-14 10:16:01 -08:00
Bill Yi
3d8af28675
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iac69519b9a3a9023a16096ebcacec2e97b41cdc8
2024-02-14 10:14:30 -08:00
Treehugger Robot
09a89e2771
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-02-08 22:07:13 +00:00
Treehugger Robot
1dc33e2d40
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-02-08 22:07:13 +00:00
Bill Yi
4d6d1f66d3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1334ce697598fabc251dd937c47036a90de7ff2a
2024-02-07 15:21:40 -08:00
Bill Yi
a11618f1e5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I307d5a243bb3d7938ab89dc84b3446ab6ad193a4
2024-02-07 15:20:08 -08:00