Commit Graph

9001 Commits

Author SHA1 Message Date
junyulai
2ca49e8ad4 [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a am: 43ff860cf2 -s ours am: 5f7339c644 -s ours am: a54c216cf9 -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 2cb4c9359a is in history

Change-Id: I9e09cf7be805757e5e76fddb7831c6f09d0c6bf7
2020-03-18 00:39:28 +00:00
Junyu Lai
d92c230dc7 Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d am: 3e5cf4797b am: 35ed012437 am: 8033ab1788
Change-Id: I54bfdf98273ed4c78f035124edb2fb5a6aa9a7f2
2020-03-18 00:37:18 +00:00
junyulai
0a37411c82 [SP25] Rename functions that add Entry conditionally am: 5d89df732b am: 0dbffa4ad5 am: 451c47629e am: c3d7524be0
Change-Id: Ia0473dc09f439216321e4571aa0b1e6c01e68173
2020-03-18 00:33:47 +00:00
junyulai
b3655ae519 [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 -s ours am: 08da9375a6 -s ours am: 6a7726457c -s ours am: 62feb0da00 -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 2521ad7386 is in history

Change-Id: I3e643366f1932d99e068e7afbab29f6281bf1796
2020-03-18 00:33:44 +00:00
junyulai
127bfee382 [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a -s ours am: 180557c20a -s ours am: 76a9658f9e -s ours am: 809ac22e18 -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 f8660076c0 is in history

Change-Id: Id1ee0b834ff1f6ec0e79316657e8a87e393605c1
2020-03-18 00:33:38 +00:00
junyulai
5f7339c644 [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a am: 43ff860cf2 -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 2cb4c9359a is in history

Change-Id: I778c34aed7223a82d8c0238aaf7995bd4171a2c2
2020-03-18 00:02:50 +00:00
Junyu Lai
35ed012437 Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d am: 3e5cf4797b
Change-Id: Ic1397a8b02104b52d595621e1eae9cd8ac131071
2020-03-18 00:00:42 +00:00
junyulai
451c47629e [SP25] Rename functions that add Entry conditionally am: 5d89df732b am: 0dbffa4ad5
Change-Id: I22d32f9cbc9c2694160ad5cd30d7b637529b8e44
2020-03-17 23:56:28 +00:00
junyulai
6a7726457c [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 -s ours am: 08da9375a6 -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 2521ad7386 is in history

Change-Id: Ib807d1cf6bf4c2a9be054bf5df7377f540201c63
2020-03-17 23:56:26 +00:00
junyulai
76a9658f9e [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a -s ours am: 180557c20a -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 f8660076c0 is in history

Change-Id: I47afb9f93dc191b4e04e4d5bd5ff4a1cfd566b02
2020-03-17 23:56:20 +00:00
Junyu Lai
3e5cf4797b Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d
Change-Id: If92a47eab97936b6228d32388834d8ca81279d0d
2020-03-17 23:37:07 +00:00
junyulai
0dbffa4ad5 [SP25] Rename functions that add Entry conditionally am: 5d89df732b
Change-Id: I5f9924cf5b3eccfcdaa6dda991a102b97cebd11a
2020-03-17 23:35:57 +00:00
junyulai
08da9375a6 [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 2521ad7386 is in history

Change-Id: I480e66ff5b65a1ba24ecffb288ba429c2f94219e
2020-03-17 23:35:52 +00:00
junyulai
180557c20a [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 f8660076c0 is in history

Change-Id: I80ab45b6a34b66f1bed766b3e2fb72926325021e
2020-03-17 23:35:48 +00:00
junyulai
43ff860cf2 [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a
Change-Id: I77a249ad66acf360ec1b0acfe14f9db704040c11
2020-03-17 23:35:40 +00:00
Junyu Lai
3e09da5d5d Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev
* changes:
  [SP25] Rename functions that add Entry conditionally
  [SP24] Rename functions that add Entry unconditionally
  [SP23] Address misc API review comment about NetworkStats
  [SP21] Address comments for API council review about aosp/1172143
  [SP20] Check signature permission when accessing network stats provider
2020-03-17 23:11:34 +00:00
Automerger Merge Worker
4190f34cec [automerger skipped] Merge "Update ConnectivityDiagnosticsCallback function name." am: ff5be42146 am: a076070c56 -s ours am: 35175b3239 -s ours am: 809906ec3a -s ours am: a8ea58635e -s ours
am skip reason: Change-Id Ieea727ecee6cf358a53a215fd4b06233dfe967ea with SHA-1 b5411218f8 is in history

Change-Id: If5aeb21a71e9e955a75dd2da8cb7b41dc4033403
2020-03-17 20:25:40 +00:00
Automerger Merge Worker
809906ec3a [automerger skipped] Merge "Update ConnectivityDiagnosticsCallback function name." am: ff5be42146 am: a076070c56 -s ours am: 35175b3239 -s ours
am skip reason: Change-Id Ieea727ecee6cf358a53a215fd4b06233dfe967ea with SHA-1 b5411218f8 is in history

Change-Id: I3cd0938b9367a5b1f382d30e0cd52aca61ed8827
2020-03-17 19:41:25 +00:00
Automerger Merge Worker
35175b3239 [automerger skipped] Merge "Update ConnectivityDiagnosticsCallback function name." am: ff5be42146 am: a076070c56 -s ours
am skip reason: Change-Id Ieea727ecee6cf358a53a215fd4b06233dfe967ea with SHA-1 b5411218f8 is in history

Change-Id: I593e009d15d961fc44f5433cb8638aa7686d2b16
2020-03-17 19:28:24 +00:00
Automerger Merge Worker
a076070c56 Merge "Update ConnectivityDiagnosticsCallback function name." am: ff5be42146
Change-Id: I51d625ac3c086aceba9c06be7585e0e4f5022f1a
2020-03-17 19:13:39 +00:00
Cody Kesting
ff5be42146 Merge "Update ConnectivityDiagnosticsCallback function name." 2020-03-17 19:00:39 +00:00
Automerger Merge Worker
940514efb8 Merge "Shorten the output of NetworkAgentInfo#toString()." am: 5d089181a8 am: c2dcb2f8e5 am: 22e22c3b3e am: 0970f1ef60 am: ae376b4282
Change-Id: I32f4768c6d534235f06f88c17f65bbb51ad42924
2020-03-17 17:12:34 +00:00
Cody Kesting
e4d2df5726 Update ConnectivityDiagnosticsCallback function name.
API Council feedback suggests renaming ConnectivityDiagnosticsCallback
'onConnectivityReport' function to be 'onConnectivityReportAvailable'.

Bug: 150598997
Test: atest FrameworksNetTests
Change-Id: Ieea727ecee6cf358a53a215fd4b06233dfe967ea
Merged-In: Ieea727ecee6cf358a53a215fd4b06233dfe967ea
2020-03-17 17:10:38 +00:00
Automerger Merge Worker
4abb0a22e3 [automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f -s ours am: 1ae67980c2 -s ours am: b94cce7dd9 -s ours am: 2a76ccb0ea -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 539cd36a1d is in history

Change-Id: Ice74b84340372cae9ab001468b38e57bab14132e
2020-03-17 17:09:12 +00:00
Automerger Merge Worker
e669767e6d [automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 -s ours am: 27d2d10b8b -s ours am: 86f1d4eef7 -s ours am: 13b654e9b0 -s ours
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 30762e1e07 is in history

Change-Id: Iad090df35de2523880f2b5c63be591861555d727
2020-03-17 17:08:59 +00:00
Automerger Merge Worker
f26ffda5ec [automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f am: cbc2ca4681 -s ours am: 98604b57c9 -s ours am: dec7470980 -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 c5941bb7a3 is in history

Change-Id: Ib38f02ecff80d6e353617e15220c7b33220a218f
2020-03-17 17:08:18 +00:00
Automerger Merge Worker
bf83d523d8 [automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 am: 579c2bd4af -s ours am: 56848eadfe -s ours am: 253da1cd26 -s ours
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 5df8e985df is in history

Change-Id: I3e9be1398f27db10d18820cd9e374105c4726e79
2020-03-17 17:08:03 +00:00
Automerger Merge Worker
d20a3f1a5e Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: 5bc1ba2198 am: e95e9bdfc4 am: 890d7de258
Change-Id: I2544415c46b659798e74b0f5fa476407fcd59313
2020-03-17 17:07:48 +00:00
Automerger Merge Worker
780aa9ae2d Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: ba4aecf53c am: 0d6fdd3098 am: 33a0734fe7
Change-Id: Ie7374784ccf523e6dcf28f207e9639405e82c220
2020-03-17 17:07:19 +00:00
Automerger Merge Worker
d7b1ed63fc [automerger skipped] Merge "Removing some of the API don't have to be @SystemApi" am: c4d6a4f566 am: 86ba38a5ba -s ours am: 8df9d88504 -s ours am: 4ac7ae7348 -s ours am: b063f2422b -s ours
am skip reason: Change-Id Ie30efa172f93a7557fb6ef56f4daf80e958c3787 with SHA-1 e93348f00d is in history

Change-Id: I878489901b16336316dfb53c3475b4912887d8c9
2020-03-17 16:53:28 +00:00
Automerger Merge Worker
08144aab6b Merge changes I97015365,Ic9db4b9b am: d080a4a32d am: 1c25e4ff44 am: ba33556f86 am: 6667dbb0af am: 63a8145c91
Change-Id: I68172e245c2ac50e590903fb3d4664686202ea4c
2020-03-17 16:22:48 +00:00
Automerger Merge Worker
f54871310c [automerger skipped] Merge "services.net: Add a static library needed by wifi module" am: a0f5e8f3c2 am: 5cc4a63246 -s ours am: 56ccf539c3 -s ours am: 4bd3e6dacb -s ours am: b2847be801 -s ours
am skip reason: Change-Id Ifde69b579cfe5b813766f676acb10e436e64a44c with SHA-1 7cf9cb25e3 is in history

Change-Id: I7c2b39a6843e480105c826c88d7e86589b7da2fa
2020-03-17 16:22:04 +00:00
Automerger Merge Worker
a6e7f64094 [automerger skipped] Merge "services.net: Use the new ModuleNetworkStackClient" am: bcd6edb9d6 am: 8ad449dff9 -s ours am: 8d5189d6fb -s ours am: 349bfe3f32 -s ours am: 6a8a3f4d16 -s ours
am skip reason: Change-Id I065525fdbd64b9509ef0f47bb35954d267c65fd2 with SHA-1 1ce72ca363 is in history

Change-Id: I20a22aa0630fea86b55f415af1a1b9a39be0828e
2020-03-17 16:21:40 +00:00
Automerger Merge Worker
62c5ab4e5d [automerger skipped] Merge "Add test for NetworkAgentConfig" into rvc-dev am: b8f5f43f67 -s ours am: 2966ce4bee -s ours am: ad7dad2742 -s ours am: 340f0d0b52 -s ours
am skip reason: Change-Id If9158d086bacb0ade94d59898ac223e4c8f4f73a with SHA-1 a97418446e is in history

Change-Id: Ib988d7b3594388c5cd78ae5775143ca9dd5657d6
2020-03-17 16:20:08 +00:00
Automerger Merge Worker
706556994a [automerger skipped] Merge "Add test for NetworkAgentConfig" into rvc-dev am: b8f5f43f67 am: 10e6b23cab -s ours am: 41d452c5f0 -s ours am: ad869fb63f -s ours
am skip reason: Change-Id If9158d086bacb0ade94d59898ac223e4c8f4f73a with SHA-1 1feaacee76 is in history

Change-Id: I673e9d1414b06bc9850c5e6a1ec74bc0375aa783
2020-03-17 16:19:02 +00:00
Automerger Merge Worker
0970f1ef60 Merge "Shorten the output of NetworkAgentInfo#toString()." am: 5d089181a8 am: c2dcb2f8e5 am: 22e22c3b3e
Change-Id: I2684ca967356da99766738f323e90465b245858a
2020-03-17 16:11:53 +00:00
Automerger Merge Worker
b94cce7dd9 [automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f -s ours am: 1ae67980c2 -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 539cd36a1d is in history

Change-Id: Idf2b13a076c0025d4a4dbf2d202ba953573d3651
2020-03-17 16:10:34 +00:00
Automerger Merge Worker
86f1d4eef7 [automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 -s ours am: 27d2d10b8b -s ours
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 30762e1e07 is in history

Change-Id: Iab7f7292cb6e60f5646e47bbcf9656cd5c7cea86
2020-03-17 16:10:14 +00:00
Automerger Merge Worker
98604b57c9 [automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f am: cbc2ca4681 -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 c5941bb7a3 is in history

Change-Id: I78027470b880d52593d0920600b62e940144f3da
2020-03-17 16:04:48 +00:00
Automerger Merge Worker
56848eadfe [automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 am: 579c2bd4af -s ours
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 5df8e985df is in history

Change-Id: Ic965376fbf895252141d4d3ed9c3898d6e1bd8a9
2020-03-17 16:04:32 +00:00
Automerger Merge Worker
e95e9bdfc4 Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: 5bc1ba2198
Change-Id: Ia7a1ebbada866e5f6745ac2e19442f5138809f16
2020-03-17 16:04:13 +00:00
Automerger Merge Worker
0d6fdd3098 Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: ba4aecf53c
Change-Id: I499ae9ec841be5be465cc8341f4385d857cc0168
2020-03-17 16:04:04 +00:00
Automerger Merge Worker
82f7da5284 Merge "Move sensitive field parceling bool to constructor" am: 9e2a0cb322 am: 82280b8bb9 am: 91a66f29ac am: 7d617c0cd4 am: 70db65d01c
Change-Id: Ia087e55b6a03623db5c2eee09ce1ebf8707e364c
2020-03-17 16:02:25 +00:00
Automerger Merge Worker
0de06c2a23 [automerger skipped] Merge "Ensure that NetworkFactory objects cannot be reused." am: 3b2d608aa8 am: f95a726ac4 -s ours am: 6111724f31 -s ours am: 6f9b4cec6b -s ours am: c2384b51a2 -s ours
am skip reason: Change-Id I793436ee0f4b5d778788ad34b8a2575d2ad0ed80 with SHA-1 62fd0c1ab8 is in history

Change-Id: Ia80519b477cb99c0c7c0e84e1c7b967570e9efce
2020-03-17 15:58:18 +00:00
Automerger Merge Worker
22e22c3b3e Merge "Shorten the output of NetworkAgentInfo#toString()." am: 5d089181a8 am: c2dcb2f8e5
Change-Id: I4fb9efa69133ce8f960a37cfbb73264a4bfbf97a
2020-03-17 15:54:48 +00:00
Automerger Merge Worker
cbc2ca4681 Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f
Change-Id: Id6e807272dca79a2e02974a7e6985eb6e7515326
2020-03-17 15:49:07 +00:00
Automerger Merge Worker
1ae67980c2 [automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 c5941bb7a3 is in history

Change-Id: I9b0525df547a8f79b739df90f39c2aad412de2c2
2020-03-17 15:48:50 +00:00
Automerger Merge Worker
579c2bd4af Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63
Change-Id: I5b44ff9afedcf40d82ba0c4666b2b16e72583383
2020-03-17 15:48:48 +00:00
Automerger Merge Worker
27d2d10b8b [automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 -s ours
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 5df8e985df is in history

Change-Id: If88006f48fc2f25ca989d830a37d651a75f68448
2020-03-17 15:48:31 +00:00
Automerger Merge Worker
5bc1ba2198 Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311
Change-Id: I8c016464f6ba4b3237332bb2148183cb5d755ec4
2020-03-17 15:48:20 +00:00