PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,136 Commits 1 Branch 0 Tags
0d8ed82e9ca811f1d02ee2952d7d0e108bdecccc
Commit Graph

124136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chiu
8666ed7ac1 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 23bcaf74e8 -s ours am: a01c5efd63 -s ours am: 7efa1c8090 -s ours 
am skip reason: contains skip directive

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

Change-Id: I3dfeaf4f28497dc5f9347a0499128a8499803e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:38 +00:00
Treehugger Robot
ebf3f4cee6 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4 am: ba599569fd -s ours am: ebefb83789 -s ours 
am skip reason: contains skip directive

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

Change-Id: I06806f376737ae09894da936a9af96815b9709a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:28 +00:00
Treehugger Robot
b1cdb2abae [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 5e90b5cfbb -s ours am: ef935895f9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I735f7f4d36e80e97f57285c78fb1bddba04e56b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:18 +00:00
Jason Chiu
e28d3aaa38 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 19019740e0 -s ours am: 2e2afe97df -s ours 
am skip reason: contains skip directive

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

Change-Id: I21f27be0c29c55c3479cbca5c32a63aefd7b36c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:15 +00:00
Treehugger Robot
296a7877e9 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: 9e311f362a -s ours am: 4c59ec6eaf -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib4188d0d43873de613df0fcda2ee5a4dc12b3960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:50:03 +00:00
Treehugger Robot
352bcbcbc4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 506fc66f7c -s ours am: 1120050213 -s ours 
am skip reason: contains skip directive

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

Change-Id: I193844aa8bf3765981c94c5d6b250435d14282fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:42:18 +00:00
Jason Chiu
7efa1c8090 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 23bcaf74e8 -s ours am: a01c5efd63 -s ours 
am skip reason: contains skip directive

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

Change-Id: I5c903948aab5c8bd5b45a4bf872eff21cf4be3c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:42:14 +00:00
Treehugger Robot
ebefb83789 [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4 am: ba599569fd -s ours 
am skip reason: contains skip directive

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

Change-Id: I106744d88035ce315d5491b5de5e88db7568cc75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:41:52 +00:00
Treehugger Robot
ef935895f9 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 5e90b5cfbb -s ours 
am skip reason: contains skip directive

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

Change-Id: Iab945a284de0e514117d5e4632437fad8dcdf528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:28:48 +00:00
Jason Chiu
2e2afe97df [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 19019740e0 -s ours 
am skip reason: contains skip directive

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

Change-Id: I788d8e2f400345bcc503340b78b8da1d5067f029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:28:38 +00:00
Treehugger Robot
4c59ec6eaf [automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: 9e311f362a -s ours 
am skip reason: contains skip directive

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

Change-Id: I5ce8ca87021a09185cd28e1c849a552ec42911fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:28:17 +00:00
Treehugger Robot
1120050213 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours am: 506fc66f7c -s ours 
am skip reason: contains skip directive

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

Change-Id: I34cd431d434255ceae21126d48739865cd94ea18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:28:10 +00:00
Jason Chiu
a01c5efd63 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours am: 23bcaf74e8 -s ours 
am skip reason: contains skip directive

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

Change-Id: I742ab432c52d3c3a29744f4275714890bc1bf918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:28:05 +00:00
Treehugger Robot
ba599569fd [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a am: ffb480aee4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008

Change-Id: I877be6871e43eb5d42c695b5cdb1faecdbc5305f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:27:49 +00:00
Treehugger Robot
506fc66f7c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours 
am skip reason: contains skip directive

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

Change-Id: I3704d899f9346dbf3d5656cb1129c936420065be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:13:33 +00:00
Treehugger Robot
5e90b5cfbb [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours 
am skip reason: contains skip directive

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

Change-Id: Ibcfc0351a402dc967f216ef3e78d625e5ee897be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:13:30 +00:00
Jason Chiu
23bcaf74e8 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours 
am skip reason: contains skip directive

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

Change-Id: I6a2ca71c7e51e72934b6308e0bb406adffc27c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:13:28 +00:00
Jason Chiu
19019740e0 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours 
am skip reason: contains skip directive

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

Change-Id: Ibb5909cd0770cd53024555073ee9ebb03c899c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:13:24 +00:00
Treehugger Robot
ffb480aee4 [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008

Change-Id: Ic0f5293649e322c4da6bbfcbce8486270436442e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:13:16 +00:00
Treehugger Robot
9e311f362a [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008

Change-Id: I4d3131026ca10b12c0b3bc16fa7d62b6562e5cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 20:13:11 +00:00
Treehugger Robot
357d9ecbdb [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours 
am skip reason: contains skip directive

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

Change-Id: I4a44ebe4dcfb8b12ebcadef6c746c0d8145a63c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 19:47:03 +00:00
Jason Chiu
8e61964dec [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib30d02c3219aa0f4cb99ae0dc93de2a443133af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 19:46:56 +00:00
Treehugger Robot
a339d8ea9a [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546875

Bug: 333364513
Fix: 345375093
Change-Id: Ifdebf7a60f3695f83d8fa04e05f4dbd6e177f62b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 02:49:14 +00:00
Treehugger Robot
20f8ad98fb [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours 
am skip reason: contains skip directive

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

Change-Id: I126a187cd8b358a2f5f0bfad8ebf2f7eec5665c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 07:56:53 +00:00
Jason Chiu
e0b4c24d20 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours 
am skip reason: contains skip directive

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

Change-Id: I0f81495f91b6c7fde96a5a3b4c745cb81c9611ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 07:56:47 +00:00
Treehugger Robot
d0f5ccb499 Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218

Change-Id: I9ba35ae426561f7ed7f69151b114d5645230a62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 07:42:17 +00:00
Jason Chiu
d0a4db88bb [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218

Change-Id: Iffc1b1f41b5cd22cec1bcfa530ad879f25b9073c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 07:42:10 +00:00
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
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
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
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