Commit Graph

45310 Commits

Author SHA1 Message Date
Aaron Huang
2caa55c19d Merge "Test a template matches mobile and mobile wildcard" am: 3cbd991ab4 am: 952f97c84b am: fc01806b57 am: 3db9d3691a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784390

Change-Id: Ib9c666acc705868ea1a5807ab33018877599bec3
2021-09-16 10:44:30 +00:00
Aaron Huang
3db9d3691a Merge "Test a template matches mobile and mobile wildcard" am: 3cbd991ab4 am: 952f97c84b am: fc01806b57
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784390

Change-Id: Ida6883962f4df67800931145b5f2ca7d47dc182e
2021-09-16 10:33:34 +00:00
Aaron Huang
fc01806b57 Merge "Test a template matches mobile and mobile wildcard" am: 3cbd991ab4 am: 952f97c84b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784390

Change-Id: Iac083d8cbb4c77a4f13a20df1ee6a4675d282aa9
2021-09-16 10:18:44 +00:00
Aaron Huang
952f97c84b Merge "Test a template matches mobile and mobile wildcard" am: 3cbd991ab4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784390

Change-Id: Ia33a4d9fb1e543680af7c6a25df619bed80799a9
2021-09-16 10:03:56 +00:00
Aaron Huang
3cbd991ab4 Merge "Test a template matches mobile and mobile wildcard" 2021-09-16 09:42:22 +00:00
Chiachang Wang
09054c58a5 Merge "Correct the calling method in removeDefaultNetworkActiveListener" am: a6e3069c27 am: 7c04a51a95 am: 97fa4cc109 am: 3007db2308
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827914

Change-Id: I160212a4320fd4abe4aa8a3f63734917e450fd9a
2021-09-16 07:16:59 +00:00
Chiachang Wang
3007db2308 Merge "Correct the calling method in removeDefaultNetworkActiveListener" am: a6e3069c27 am: 7c04a51a95 am: 97fa4cc109
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827914

Change-Id: I2bfa4942fb9696189f9973553f250e859b1c8df2
2021-09-16 07:03:33 +00:00
Chiachang Wang
97fa4cc109 Merge "Correct the calling method in removeDefaultNetworkActiveListener" am: a6e3069c27 am: 7c04a51a95
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827914

Change-Id: I7dfc06f15683c4e4502636cc0eab1285d1e6ee02
2021-09-16 06:50:32 +00:00
Chiachang Wang
7c04a51a95 Merge "Correct the calling method in removeDefaultNetworkActiveListener" am: a6e3069c27
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827914

Change-Id: I69a199d8253aca744a43b04e89a88da65f6bd8b9
2021-09-16 06:39:32 +00:00
Chiachang Wang
a6e3069c27 Merge "Correct the calling method in removeDefaultNetworkActiveListener" 2021-09-16 06:29:36 +00:00
Chiachang Wang
e54c8199aa Correct the calling method in removeDefaultNetworkActiveListener
The removeDefaultNetworkActiveListener should do the
unregisteration but it's incorrectly calling
registerNetworkActivityListener into the ConnectivityService.

Bug: 199753782
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I65a2ddc82989d736316d51f5058e707f5b261a82
2021-09-16 02:25:48 +00:00
markchien
f6bebb063a Test QosSocketInfo.getNetwork am: 059bfa6149 am: 3e14f7df9f am: 0b21a5c104 am: 749338fd19
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826063

Change-Id: Ic52104f80d9dea635dcf734849b95c4d9ba9928c
2021-09-15 11:54:41 +00:00
markchien
749338fd19 Test QosSocketInfo.getNetwork am: 059bfa6149 am: 3e14f7df9f am: 0b21a5c104
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826063

Change-Id: I972aff619886aeb9b5495dd2f4b1fc461d4247c0
2021-09-15 11:46:22 +00:00
markchien
0b21a5c104 Test QosSocketInfo.getNetwork am: 059bfa6149 am: 3e14f7df9f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826063

Change-Id: I7c348c5524e3c2c003d9b166b4f5872f458fa213
2021-09-15 11:33:23 +00:00
markchien
3e14f7df9f Test QosSocketInfo.getNetwork am: 059bfa6149
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826063

Change-Id: I29e01f008d6dfeb516dc71f7c3cf4637828b2b6c
2021-09-15 11:19:50 +00:00
markchien
059bfa6149 Test QosSocketInfo.getNetwork
Bug: 183239152
Test: atest NetworkAgentTest
Change-Id: I9848608e0aa500ff7668350a080537dd4a549214
2021-09-15 03:09:26 +00:00
Aaron Huang
cbb4d498c2 Test a template matches mobile and mobile wildcard
Add two test cases for matchesMobile and matchesMobileWildcard

Bug: 183776809
Test: FrameworksNetTests:NetworkTemplateTest
Change-Id: I14d31071655204fe6ad36c71f7f521640e01c96e
2021-09-14 23:36:04 +08:00
Treehugger Robot
fdedf2a232 Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c am: e41baf1752 am: c25331f111 am: 0bb8639bc0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: I027188a95e1c8397b78bcf4579767f1b2a36afda
2021-09-13 03:26:21 +00:00
Treehugger Robot
0bb8639bc0 Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c am: e41baf1752 am: c25331f111
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: I9cfc82e726b3b5ed7699eb0455c9349199f10f20
2021-09-13 03:14:48 +00:00
Treehugger Robot
c25331f111 Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c am: e41baf1752
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: I612f1e6631ca2a8193ae32d2079128ca3d726f9c
2021-09-13 02:58:02 +00:00
Treehugger Robot
e41baf1752 Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: Id8aa8e2c460891500b2926b0585edd0bfd972fa9
2021-09-13 02:46:35 +00:00
Treehugger Robot
f2ddb4151c Merge "Add logging on UnfinishedStubbingException" 2021-09-13 02:34:27 +00:00
Bill Yi
db40a96d96 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev am: 814a8e4d90 am: f5b69c6e64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I5b16155921accc5a7d11fdb8b4226b73ddc21617
2021-09-12 13:42:44 +00:00
Bill Yi
8d249217d7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2 am: cf16330636 -s ours am: d5e882db02 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I20e180c5ce25591756f647a43c3c08fcc02e306e
2021-09-12 13:42:43 +00:00
Bill Yi
66884a69c0 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev am: 814a8e4d90 am: d5e28474f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I540ccf12ff81f6b680b8f9ac8410d75945aaf842
2021-09-12 13:42:35 +00:00
Bill Yi
87502df1ac [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2 am: cf16330636 -s ours am: b60415ce32 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: Ia6cb4822c43b919d822156096a8364835a86106d
2021-09-12 13:42:32 +00:00
Bill Yi
1504a3b37a Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-dev-plus-aosp am: 1dcc8f8ab2 am: c5a3438483
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: Ia7745f634e8961a4496fcc4ecce78e72f2444d6c
2021-09-12 13:42:17 +00:00
Bill Yi
a00cce3401 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2 am: 826d98b7fa -s ours am: dec586c025 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: Iab26667b79d2264d24e3ae1ba04a52931103e389
2021-09-12 13:42:13 +00:00
Bill Yi
d5e28474f7 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev am: 814a8e4d90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I215f6d9652d78191cf4e622c53a6c64deeb93335
2021-09-12 13:22:31 +00:00
Bill Yi
b60415ce32 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2 am: cf16330636 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: Ib389e4f065815e7947fd53fd0085193f85209cbb
2021-09-12 13:22:30 +00:00
Bill Yi
f5b69c6e64 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev am: 814a8e4d90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: Ia3919ae1e66f94ee8a3fe37853a49ad328577d7d
2021-09-12 13:22:26 +00:00
Bill Yi
d5e882db02 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2 am: cf16330636 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I4757cb41f3574cb494b1f2e4b56a1ac7048e8e0b
2021-09-12 13:22:24 +00:00
Bill Yi
c5a3438483 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-dev-plus-aosp am: 1dcc8f8ab2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I8a3d167b51c24d37d493cb39cdc314b42f88f9c2
2021-09-12 13:22:01 +00:00
Bill Yi
dec586c025 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2 am: 826d98b7fa -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I27f40f7a9576db0e5cdd481cd69c20f627ebf1e6
2021-09-12 13:22:00 +00:00
Bill Yi
1dcc8f8ab2 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2
  Import translations. DO NOT MERGE ANYWHERE
2021-09-12 13:03:49 +00:00
Bill Yi
814a8e4d90 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2
  Import translations. DO NOT MERGE ANYWHERE
2021-09-12 13:03:49 +00:00
Bill Yi
c4e8c3d168 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 166f5fe82b -s ours am: e69f09a1b8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806603

Change-Id: Iae19586e2c0156b01335f74d625e85c3d317ec14
2021-09-12 08:54:32 +00:00
Bill Yi
c12978ef68 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 166f5fe82b -s ours am: 7fc05636f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806603

Change-Id: Ia02837f0bffc4ad861478733d30f43daccd0bfba
2021-09-12 08:29:36 +00:00
Bill Yi
e69f09a1b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 166f5fe82b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806603

Change-Id: I80d05215fff665f65de1e845097edfd210c42760
2021-09-12 08:29:01 +00:00
Bill Yi
605af4323d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2d0f0bb123 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806604

Change-Id: Icff11f1a800b6a6b256d53ce399197e9a9ca0596
2021-09-12 08:28:57 +00:00
Bill Yi
7fc05636f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 166f5fe82b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806603

Change-Id: Id1ab88235a28fe8c33ebb7568963dbabf062f170
2021-09-12 08:28:55 +00:00
Paul Hu
affad9f9a7 Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd am: acffb5cc5a am: 31f4fd40b0 am: f8270ee51e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1775930

Change-Id: I03e56a3ecfe672bedda705e8f13f0f9b7376478c
2021-09-11 07:04:23 +00:00
Paul Hu
f8270ee51e Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd am: acffb5cc5a am: 31f4fd40b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1775930

Change-Id: Iad4b613d78cb3ad3d362a823daf2684405d4649f
2021-09-11 06:54:41 +00:00
Paul Hu
31f4fd40b0 Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd am: acffb5cc5a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1775930

Change-Id: I9543ed320b47fa38558dfe9ab3f1bbaebfba59d1
2021-09-11 06:36:55 +00:00
Paul Hu
acffb5cc5a Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1775930

Change-Id: Id19cdd1a8ff7dfb4093ca09b4397619097310dc4
2021-09-11 06:11:55 +00:00
Paul Hu
c7d5ea0bbd Merge "Remove NetworkUtils.queryUserAccess in test" 2021-09-11 05:56:45 +00:00
Bill Yi
2d0f0bb123 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic149bd5a99e8521cf55f7bc6741f90b685ab46be
2021-09-10 22:27:23 +00:00
Bill Yi
166f5fe82b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I60afaececda2b6b0216db73056b4eff658e168a1
2021-09-10 22:26:08 +00:00
Bill Yi
826d98b7fa [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I64943c434ce685f98917be1c42dc2b8b02e2aead
2021-09-10 22:25:04 +00:00
Bill Yi
cf16330636 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I55c96e736f9f5a9f98dd4fe4940ee4f05d9999d8
2021-09-10 22:25:03 +00:00