Commit Graph

124015 Commits

Author SHA1 Message Date
Chaohui Wang
fb7538a911 [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: I72b47aa24486bce5d8fb144c39b76fe17d1d19f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 18:41:12 +00:00
Chaohui Wang
8901efd7e5 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: Iae1647ee825d50fd4a1caec326af0dda95e34e0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 18:40:59 +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
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
Treehugger Robot
db26a77b37 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-06-04 18:11:48 +00:00
Bill Yi
53d3d950dc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I73480046cd6ab5ac2a310f67e883a38ac75c8587
2024-06-03 17:28:19 -07:00
Bill Yi
994dc22a81 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I71d42c126dbc6be33ddf3447e6853ccd210fc3de
2024-06-03 17:26:47 -07:00
Treehugger Robot
17850eba10 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-05-29 18:39:00 +00:00
Bill Yi
88815b8cbf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib10266f4f4e744e3115e97b717aa6068ad3e6be6
2024-05-28 22:12:56 -07:00
Bill Yi
a27faaa3ed Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ice51fda33549e4d4e95a29e5c3e6f99b1213ccba
2024-05-28 22:11:35 -07: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
Bill Yi
f24ce25bf0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0d49889374971412df625e1bfc1a65de6842f44d
2024-05-27 22:02:05 -07: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
Bill Yi
a11d3f5527 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic053db3d0f3738da4064fa0a9e165cc7d23f7038
2024-05-23 21:20:51 -07:00
Treehugger Robot
81c59a0158 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-05-22 17:43:54 +00:00
Bill Yi
a2ab468c05 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iec619125c681e660b3e1b268207e946aa9df13df
2024-05-21 06:56:51 -07:00
Bill Yi
6b307af577 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I031113a5593e3f5e3ef35bd0e5318abf14e3d415
2024-05-21 06:55:26 -07:00
Treehugger Robot
c98da894f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-05-13 18:28:11 +00:00
Bill Yi
163789e60e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib3d12bcc4aa3efbcab08a95474711bd73f1c3448
2024-05-12 17:24:24 -07:00
Bill Yi
75a4637eba Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1d6f65dc534d84befba2f14868ec94f2d9b83962
2024-05-12 17:22:52 -07:00
Bill Yi
6cacee0ce4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I22cc98432c61957dfc19658420aa8a4174fab55d
2024-05-07 17:57:36 -07:00
Bill Yi
1d686943a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-05-03 23:24:26 +00:00
Bill Yi
903dd6c8a2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie51aea579d0254db21ebae51a7354eaa5392e2cd
2024-05-03 07:00:31 -07:00
Bill Yi
a3bc754019 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib9d7e360a7317037c69207731b0616ba2277a1fb
2024-05-03 06:59:04 -07:00
Bill Yi
058348474d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iac6ff76b8df06e6ea3037acc1b0d0ff8a4db3a29
2024-04-28 19:37:08 -07:00
Treehugger Robot
962fd16b95 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-04-26 23:03:43 +00:00
Bill Yi
4d0305f4d9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia39d6ecc18e4d74f279cc56d32f62fef51f803b8
2024-04-25 17:31:43 -07:00
Bill Yi
c594852361 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2e472a2fc8fea0698577f3be1856120282709faa
2024-04-25 17:30:20 -07:00
Bill Yi
bf184534f5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9a4e2efaecb33609fdba57b66fe69e6c639c73f0
2024-04-22 01:20:55 -07:00
Bill Yi
1e60ade37f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7cdbc3f87bf136fc25dcac0979d7bda194a78348
2024-04-18 22:21:10 -07:00
Bill Yi
1b10cde727 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-04-16 18:20:34 +00:00
Bill Yi
1550742adf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia1a2162c398a61ac17bd03dbb8ef71c07c87905f
2024-04-15 17:16:46 -07:00
Bill Yi
451d90c8b5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I57d8e9f09cf42e3ab75181bfc6409334fba8c29c
2024-04-15 17:15:07 -07:00
Treehugger Robot
5ef10b2975 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-04-11 17:26:34 +00:00
Bill Yi
f855da2413 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8917daa052c0502868a8f65e70fa96c2994f70ca
2024-04-10 20:28:05 -07:00
Bill Yi
80d2d9b9e3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib34986fb5c66ecbbd5d8438b4f21c251b2a8df03
2024-04-10 20:26:39 -07:00
Weng Su
8695639429 [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: I0039d044f1164349132f2cdc969d2930d708c566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-05 17:11:31 +00:00