OSDN Git Service
Mathieu Chartier [Tue, 2 Apr 2019 00:11:04 +0000 (17:11 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists" am:
72e80b5b1a
am:
efeaad3225
Change-Id: I16ff57136a2f53e97b494c866ac3497e00996823
Mathieu Chartier [Mon, 1 Apr 2019 23:24:14 +0000 (16:24 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists"
am:
72e80b5b1a
Change-Id: Iaf05e6a285dbf626854a3b37101bea032af3a7a8
Jaewoong Jung [Mon, 1 Apr 2019 22:54:33 +0000 (22:54 +0000)]
Merge "Revert "Convert Android.mk to Android.bp"" into pi-dev-plus-aosp
Jaewoong Jung [Mon, 1 Apr 2019 22:43:03 +0000 (22:43 +0000)]
Revert "Convert Android.mk to Android.bp"
This reverts commit
9a7e79112d5d936ace862e565b7df724906ae1de.
Reason for revert: Broke builds
Change-Id: I45b2e49535a12272963a24f1e9f7ef25b31e5360
Merged-In: I80688006411dcf32f8f329556044d25ad12af1ac
Mathieu Chartier [Mon, 1 Apr 2019 22:29:07 +0000 (22:29 +0000)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists"
Jaewoong Jung [Mon, 1 Apr 2019 22:01:26 +0000 (22:01 +0000)]
Merge "Convert Android.mk to Android.bp" into pi-dev-plus-aosp
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 21:31:06 +0000 (14:31 -0700)]
Merge "Remove clearDefaultsForInactiveSubIds." am:
1e263e7bc0
am:
4e32ac7754
Change-Id: I8c21ba73807837f999bf3fcc7fbef1d24c7500da
Hall Liu [Mon, 1 Apr 2019 21:14:03 +0000 (14:14 -0700)]
Merge changes from topics "nw-scan-cts", "nw-scan-changes" am:
f276a56215
am:
7e3864bc99
Change-Id: I45112b415f0f1d6a991b65a2f87c04f829a13548
Hall Liu [Mon, 1 Apr 2019 21:08:39 +0000 (14:08 -0700)]
Allow requestNetworkScan to return sanitized info am:
c9d7430685
am:
87217889f1
Change-Id: I601304e6eaedef27a2adc413084e6a240a5e9b97
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 21:05:57 +0000 (14:05 -0700)]
Merge "Remove clearDefaultsForInactiveSubIds."
am:
1e263e7bc0
Change-Id: I8fb91dd4928cf8a607a876cc304c261bfb762a59
Hall Liu [Mon, 1 Apr 2019 20:54:15 +0000 (13:54 -0700)]
Merge changes from topics "nw-scan-cts", "nw-scan-changes"
am:
f276a56215
Change-Id: I1399e0bd8a6ff26e8df2bfc7d4515e4dbb1d64e4
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 20:51:54 +0000 (20:51 +0000)]
Merge "Remove clearDefaultsForInactiveSubIds."
Hall Liu [Mon, 1 Apr 2019 20:47:42 +0000 (13:47 -0700)]
Allow requestNetworkScan to return sanitized info
am:
c9d7430685
Change-Id: I91b315cd48095345f34755cc13d059158982a960
Hall Liu [Mon, 1 Apr 2019 20:31:10 +0000 (20:31 +0000)]
Merge changes from topics "nw-scan-cts", "nw-scan-changes"
* changes:
Add shell permissions for CTS testing
Allow requestNetworkScan to return sanitized info
Jaewoong Jung [Wed, 27 Mar 2019 23:54:43 +0000 (16:54 -0700)]
Convert Android.mk to Android.bp
Bug:
122332340
Test: full build & flash on a Pixel + manual inspection + TreeHugger
Change-Id: I80688006411dcf32f8f329556044d25ad12af1ac
Merged-In: I80688006411dcf32f8f329556044d25ad12af1ac
(cherry picked from commit
edfa8e90a1231df98be89994bc9d43458d96b79a)
Mathieu Chartier [Fri, 29 Mar 2019 20:49:35 +0000 (13:49 -0700)]
Pass debug.allocTracker.stackDepth to runtime if it exists
Since this is no longer called in ART, pass it down in bind application.
Bug:
37291459
Test: test-art-host
Change-Id: I23623e9b8e9ca6261d90cc1ae1c5d8c24cc4eba5
Neil Fuller [Mon, 1 Apr 2019 16:59:59 +0000 (09:59 -0700)]
Merge "Track public android.system API changes in libcore" am:
1423684d1a
am:
0036c64764
Change-Id: I93b2d6742193414b3f6a81cd35e923a4f6b7f2fb
Neil Fuller [Mon, 1 Apr 2019 16:50:56 +0000 (09:50 -0700)]
Merge "Track public android.system API changes in libcore"
am:
1423684d1a
Change-Id: I98319e08a913b8c679579fb52bc4ded61fc5f5b0
Neil Fuller [Mon, 1 Apr 2019 16:41:11 +0000 (16:41 +0000)]
Merge "Track public android.system API changes in libcore"
Lorenzo Colitti [Mon, 1 Apr 2019 15:47:10 +0000 (08:47 -0700)]
Merge "Unhide ICMP echo constants." am:
82d1361e6d
am:
a09b83fc67
Change-Id: I02db2b7fee8c5334f7e64ffd256cba9d320e0797
Lorenzo Colitti [Mon, 1 Apr 2019 15:34:23 +0000 (08:34 -0700)]
Merge "Unhide ICMP echo constants."
am:
82d1361e6d
Change-Id: I1dad509eb0b56666cde0399dfcbaea050ce30630
Lorenzo Colitti [Mon, 1 Apr 2019 15:08:44 +0000 (15:08 +0000)]
Merge "Unhide ICMP echo constants."
Remi NGUYEN VAN [Mon, 1 Apr 2019 15:02:13 +0000 (08:02 -0700)]
Merge "Add comment for NetworkStack permissions" am:
154a0d0b38
am:
b4493ea049
Change-Id: I4e1299713b3425a5a86f927e58238aa6da2e7c65
Remi NGUYEN VAN [Mon, 1 Apr 2019 14:53:06 +0000 (07:53 -0700)]
Merge "Add comment for NetworkStack permissions"
am:
154a0d0b38
Change-Id: Ib338cd0de2b9a0aa16e096a299d4d4e5a6b25dd9
Tyler Gunn [Mon, 1 Apr 2019 14:45:41 +0000 (07:45 -0700)]
Merge "Mark PROCESS_OUTGOING_CALLS permission as deprecated." am:
70e943ba80
am:
41ab607d3d
Change-Id: I0111b33db6fb43b387b977007180f362ba36e2db
Treehugger Robot [Mon, 1 Apr 2019 14:45:18 +0000 (14:45 +0000)]
Merge "Add comment for NetworkStack permissions"
Tyler Gunn [Mon, 1 Apr 2019 14:32:39 +0000 (07:32 -0700)]
Merge "Mark PROCESS_OUTGOING_CALLS permission as deprecated."
am:
70e943ba80
Change-Id: I20fed9904a6b8d85c0e7a33ae8db8b3f4ae7987e
Tyler Gunn [Mon, 1 Apr 2019 14:13:50 +0000 (14:13 +0000)]
Merge "Mark PROCESS_OUTGOING_CALLS permission as deprecated."
Xiao Ma [Mon, 1 Apr 2019 13:27:18 +0000 (06:27 -0700)]
Merge "Add DHCP address lease expiry in IpMemoryStore." am:
17ea70c6d3
am:
23f6cd281a
Change-Id: I690d6c1602292731f27b3f2d0a1a36cf95849d2e
Xiao Ma [Mon, 1 Apr 2019 13:16:08 +0000 (06:16 -0700)]
Merge "Add DHCP address lease expiry in IpMemoryStore."
am:
17ea70c6d3
Change-Id: Idb73423aaf875bb77d19f9661e243f152f734fa3
Xiao Ma [Mon, 1 Apr 2019 12:59:20 +0000 (12:59 +0000)]
Merge "Add DHCP address lease expiry in IpMemoryStore."
Paul Hu [Mon, 1 Apr 2019 07:43:33 +0000 (00:43 -0700)]
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues." am:
f9d61f1c6d
am:
96f34c3151
Change-Id: I171e667dd279e008708fbc84972f63cbd5b55625
Paul Hu [Mon, 1 Apr 2019 07:34:26 +0000 (00:34 -0700)]
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues."
am:
f9d61f1c6d
Change-Id: I8d848c559e1c1e021a72bf525876aad9bddb3374
Paul Hu [Mon, 1 Apr 2019 07:20:53 +0000 (07:20 +0000)]
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues."
Chiachang Wang [Mon, 1 Apr 2019 05:16:35 +0000 (22:16 -0700)]
Merge "Provide link to android experimental flags API" am:
9876efdabe
am:
a94479c120
Change-Id: I3867a98978c3a80f9188590e235a67683e76f3a3
Chiachang Wang [Mon, 1 Apr 2019 05:07:17 +0000 (22:07 -0700)]
Merge "Provide link to android experimental flags API"
am:
9876efdabe
Change-Id: I1c02f0725728c6cfe2d040071bcdb0bead71b510
Chiachang Wang [Mon, 1 Apr 2019 04:49:33 +0000 (04:49 +0000)]
Merge "Provide link to android experimental flags API"
Remi NGUYEN VAN [Mon, 1 Apr 2019 04:48:25 +0000 (21:48 -0700)]
Merge "Move permissions from base to standard manifest" am:
95c5375a85
am:
f076210032
Change-Id: I022a4797ccd81d24dacd6b314305a43f299c86f3
Remi NGUYEN VAN [Mon, 1 Apr 2019 04:38:02 +0000 (21:38 -0700)]
Merge "Move permissions from base to standard manifest"
am:
95c5375a85
Change-Id: Ic15b12fd9656bb60aca616a8610df49e568a80e7
Remi NGUYEN VAN [Mon, 1 Apr 2019 04:25:12 +0000 (21:25 -0700)]
Merge "Fix race when starting NetworkMonitor" am:
78454f3c46
am:
f75ba075e4
Change-Id: I049ea18e6c5c42a1b31d93541aa3846b14b7ab08
Remi NGUYEN VAN [Mon, 1 Apr 2019 01:56:05 +0000 (10:56 +0900)]
Add comment for NetworkStack permissions
Clarify that permissions must not be in the base package to avoid
crashes on devices using a network stack running in the system server
process.
Test: m
Change-Id: Ib13df84a43e960d01217c208d1c6775d1f81edc4
Remi NGUYEN VAN [Mon, 1 Apr 2019 04:20:41 +0000 (04:20 +0000)]
Merge "Move permissions from base to standard manifest"
Remi NGUYEN VAN [Mon, 1 Apr 2019 04:13:48 +0000 (21:13 -0700)]
Merge "Fix race when starting NetworkMonitor"
am:
78454f3c46
Change-Id: I3fe792704b9dfaafe09c83da57081d6668216a97
Remi NGUYEN VAN [Mon, 1 Apr 2019 03:54:03 +0000 (03:54 +0000)]
Merge "Fix race when starting NetworkMonitor"
Ugo Yu [Mon, 1 Apr 2019 03:35:30 +0000 (20:35 -0700)]
Merge "Refine Bluetooth silence mode API" am:
c650674397
am:
0196a831b1
Change-Id: I998be4f22bb76e8d3329a5c3d32b929421262e71
Ugo Yu [Mon, 1 Apr 2019 03:26:18 +0000 (20:26 -0700)]
Merge "Refine Bluetooth silence mode API"
am:
c650674397
Change-Id: Icd91568d8bc2897914cececec7743fe2800192eb
Treehugger Robot [Mon, 1 Apr 2019 03:12:31 +0000 (03:12 +0000)]
Merge "Refine Bluetooth silence mode API"
Remi NGUYEN VAN [Wed, 27 Mar 2019 06:42:53 +0000 (15:42 +0900)]
Fix race when starting NetworkMonitor
NetworkMonitor obtained LinkProperties and NetworkCapabilities via
synchronous calls to ConnectivityManager after receiving an asynchronous
notification, which is prone to races: the network could be gone before
the LinkProperties/NetworkCapabilities can be fetched.
Fix the race by passing LinkProperties/NetworkCapabilities directly to
NetworkMonitor in the asynchronous notifications.
Test: atest FrameworksNetTests NetworkStackTests
Test: booted, WiFi works
Bug:
129375892
Change-Id: I200ac7ca6ff79590b11c9be705f650c92fd3cb63
paulhu [Wed, 27 Mar 2019 14:26:37 +0000 (22:26 +0800)]
Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues.
Fix:
129362082
Fix:
129361362
Fix:
129360330
Fix:
129362379
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I05fbc6f98207d5cf002e3cbc5829040af7d6be52
Chiachang Wang [Mon, 1 Apr 2019 01:56:05 +0000 (09:56 +0800)]
Provide link to android experimental flags API
Add function to link to android experiemental flags API
Bug:
120013793
Test: Build and atest NetworkStackTests
Change-Id: I14b9a6f06f841a9d63e8c1954907447a9e7eb8a5
Remi NGUYEN VAN [Fri, 29 Mar 2019 05:56:34 +0000 (14:56 +0900)]
Move permissions from base to standard manifest
Permissions defined in AndroidManifest_Base.xml would be inherited in
AndroidManifest_InProcess.xml and cause issues on svelte builds, since
privileged permissions are not whitelisted for
com.android.networkstack.inprocess.
The network stack running in the system_server process does not need
these permissions anyway since it has system_server permissions.
(clean cherry-pick from Ica63ce586e701b1f2415a97f63ba27cc25e4830a)
Test: flashed, booted crosshatch_svelte-eng, WiFi works
Test: flashed, booted blueline-eng, WiFi works
Fixes:
129485310
Merged-In: Ica63ce586e701b1f2415a97f63ba27cc25e4830a
Change-Id: Ib4b478fb39f43a2fd4221c7d1f1ea51de04e0fba
Tyler Gunn [Fri, 29 Mar 2019 23:38:29 +0000 (16:38 -0700)]
Mark PROCESS_OUTGOING_CALLS permission as deprecated.
We deprecated the NEW_OUTGOING_CALL broadcast which uses this, so we
should also deprecate the permission to make it more clear to the
developers.
Test: Build / make api
Bug:
129531123
Bug:
129572090
Change-Id: Iac4979ffe29c33eb2ed8ffe4a7799e7caa794951
Sooraj Sasindran [Sat, 30 Mar 2019 01:14:27 +0000 (18:14 -0700)]
Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds"" am:
92e99a6ca9
am:
c6c093e778
Change-Id: I8e5ab63be21b97077ecd263f12581b120e3f85e2
Sooraj Sasindran [Sat, 30 Mar 2019 01:06:00 +0000 (18:06 -0700)]
Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds""
am:
92e99a6ca9
Change-Id: I7ce860cdca34cf4ff421384fe3071b9f13dc427b
Treehugger Robot [Sat, 30 Mar 2019 00:53:23 +0000 (00:53 +0000)]
Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds""
Sooraj Sasindran [Fri, 29 Mar 2019 23:14:23 +0000 (23:14 +0000)]
Revert "Change Values for Opportunistic Entry & Exit Thresholds"
This reverts commit
f0c8f19325a83374b52f49d6b66fcf05466c1c54.
Reason for revert: From further test, we see sharp decline in data throughput
Change-Id: I0fb031a8adf15d3a0149651bcc51ee1d7318a42e
Brad Ebinger [Fri, 29 Mar 2019 23:58:32 +0000 (16:58 -0700)]
Merge "Do not show SMS SIM pick UI for Cell Broadcast Config change" am:
4ae4e50def
am:
f15dabde00
Change-Id: I13573f02a8b14fe695222cced5e8fbfa493ed733
Brad Ebinger [Fri, 29 Mar 2019 23:23:24 +0000 (16:23 -0700)]
Merge "Do not show SMS SIM pick UI for Cell Broadcast Config change"
am:
4ae4e50def
Change-Id: Iefa6fdcfaa5e3efbfebcf403d284acf569d45ab2
Xiangyu/Malcolm Chen [Fri, 29 Mar 2019 22:57:11 +0000 (15:57 -0700)]
Merge changes from topics "
128455935", "
123661746" am:
dc4cb81c83
am:
1c906d426d
Change-Id: I745f66fc63d03e2ccf03b47daae56f219252d87b
Treehugger Robot [Fri, 29 Mar 2019 22:52:00 +0000 (22:52 +0000)]
Merge "Do not show SMS SIM pick UI for Cell Broadcast Config change"
Malcolm Chen [Fri, 29 Mar 2019 22:45:36 +0000 (15:45 -0700)]
Remove SubscriptionManager#setMetered API. am:
9b932fa1a4
am:
8231d3b231
Change-Id: Ic00503fca6ef09ac2cda1cf0388d199d2190c1f3
Xiangyu/Malcolm Chen [Fri, 29 Mar 2019 22:28:34 +0000 (15:28 -0700)]
Merge changes from topics "
128455935", "
123661746"
am:
dc4cb81c83
Change-Id: I4b169adb007ecff072770f55490bac8b5c30b4c5
Malcolm Chen [Fri, 29 Mar 2019 22:21:07 +0000 (15:21 -0700)]
Remove SubscriptionManager#setMetered API.
am:
9b932fa1a4
Change-Id: I55b74e102d77785e7f925d02049037b24a5d352a
John Reck [Fri, 29 Mar 2019 21:48:24 +0000 (14:48 -0700)]
Merge "Add missing checkThread" am:
fdb8dfdadf
am:
67793b0eec
Change-Id: Ia8f3182a1d765937a5901cf6f9063ba8c84eb258
Xiangyu/Malcolm Chen [Fri, 29 Mar 2019 21:48:10 +0000 (21:48 +0000)]
Merge changes from topics "
128455935", "
123661746"
* changes:
Better description and parameter name of setPreferredDataSubscriptionId
Remove SubscriptionManager#setMetered API.
Malcolm Chen [Fri, 15 Mar 2019 03:56:00 +0000 (20:56 -0700)]
Remove clearDefaultsForInactiveSubIds.
clearDefaultsForInactiveSubIds is no longer needed as Telephony
has internal logic to clear or update default settings automatically.
Bug:
128645056
Test: manual
Change-Id: Ib7bc0ae6dba6f10e3a052df1644cc77dd30121a9
Merged-In: Ib7bc0ae6dba6f10e3a052df1644cc77dd30121a9
John Reck [Fri, 29 Mar 2019 21:37:01 +0000 (14:37 -0700)]
Merge "Add missing checkThread"
am:
fdb8dfdadf
Change-Id: Iabcd28a4c3fa659c92b392573158dd5025ed8c37
Treehugger Robot [Fri, 29 Mar 2019 21:18:10 +0000 (21:18 +0000)]
Merge "Add missing checkThread"
Shuo Qian [Fri, 29 Mar 2019 20:38:40 +0000 (13:38 -0700)]
Merge "Check permissions and carrier privilege in notifyActiveDataSubIdChanged" am:
801cd8ff8a
am:
27da4d70d4
Change-Id: Id48a47b0f0a9e314790013f471e7c57d4a71692a
Shuo Qian [Fri, 29 Mar 2019 20:29:26 +0000 (13:29 -0700)]
Merge "Check permissions and carrier privilege in notifyActiveDataSubIdChanged"
am:
801cd8ff8a
Change-Id: I15ce52efcea9b00cfe8ea5190aa58457386528b1
Ye Jiao [Fri, 29 Mar 2019 20:23:48 +0000 (13:23 -0700)]
Merge "Fix getWifiManager exception if phone is encrypted" am:
1f45f29d18
am:
60d2beff2f
Change-Id: I1190931aad9e7c9356187b472e641d2b331edd76
Brad Ebinger [Thu, 28 Mar 2019 22:46:50 +0000 (15:46 -0700)]
Do not show SMS SIM pick UI for Cell Broadcast Config change
If the user did not pick their default SIM subscription for
SMS, we were showing many dialogs to the user whenever
SmsManager#getSubscriptionId was called for cell broadcast
related APIs.
Instead, if we instantiate the SmsManager using
SmsManager.getDefault() and the user has not set a default,
use the default Phone and do not show SIM picker activity
(consistent with legacy implementation).
Bug:
129315610
Test: set up DSDS, disable eSIM operator in settings
Change-Id: I3cc4839632eede75c8943836432b07978d0efda0
Neil Fuller [Fri, 29 Mar 2019 13:33:47 +0000 (13:33 +0000)]
Track public android.system API changes in libcore
Track public android.system API changes in libcore associated with
Os.setSockOptTimeval() / Os.getSockOptTimeVal().
Test: See associated libcore change
Bug:
129251251
Bug:
117867568
Bug:
129433363
Change-Id: Ic7c179aebbf29115dea4e09fbc68f515d13bcc3f
Ye Jiao [Fri, 29 Mar 2019 20:15:14 +0000 (13:15 -0700)]
Merge "Fix getWifiManager exception if phone is encrypted"
am:
1f45f29d18
Change-Id: I47d47742083f38367fec31850db9d0e7fc9b3c13
Shuo Qian [Fri, 29 Mar 2019 20:13:09 +0000 (20:13 +0000)]
Merge "Check permissions and carrier privilege in notifyActiveDataSubIdChanged"
Treehugger Robot [Fri, 29 Mar 2019 19:55:57 +0000 (19:55 +0000)]
Merge "Fix getWifiManager exception if phone is encrypted"
Brad Ebinger [Fri, 29 Mar 2019 18:53:54 +0000 (11:53 -0700)]
Merge "Change ProvisioningManager API as per review" am:
54fffdc876
am:
8dd52036bc
Change-Id: Ic4b23f973e880563a25be6daf7f482504a1326c6
Luke Huang [Fri, 29 Mar 2019 18:48:51 +0000 (11:48 -0700)]
Merge "Minor change for async DNS API" am:
80be1b1127
am:
73b82e417b
Change-Id: If69e95dbb3cba98af84079506d898350f812a7de
Brad Ebinger [Fri, 29 Mar 2019 18:42:42 +0000 (11:42 -0700)]
Merge "Change ProvisioningManager API as per review"
am:
54fffdc876
Change-Id: Ic108caf282809306a6f70e009055f6bc91b352c0
Shuo Qian [Fri, 29 Mar 2019 18:39:42 +0000 (11:39 -0700)]
Merge "Emergency Number format" am:
e5709bf75f
am:
9c9d146ab4
Change-Id: I5f06b1955814144fd2e86092bbb9b8b85cbf54c9
Luke Huang [Fri, 29 Mar 2019 18:38:24 +0000 (11:38 -0700)]
Merge "Minor change for async DNS API"
am:
80be1b1127
Change-Id: I54a7695484b6523a92eaf246a4bb836fabc8957f
sqian [Fri, 29 Mar 2019 18:35:29 +0000 (11:35 -0700)]
Check permissions and carrier privilege in notifyActiveDataSubIdChanged
Bug:
127978132
Test: Treehugger
Merged-In: I1d9c5d1b242953a2af3e56718ef82761941d8d9c
(cherry picked from commit
9e9ed18772087cf96571847dc3fbfb235d620f43)
Change-Id: Ia25472063d6f42c36f429e725d364ecf4f16fec1
Shuo Qian [Fri, 29 Mar 2019 18:30:46 +0000 (11:30 -0700)]
Merge "Emergency Number format"
am:
e5709bf75f
Change-Id: I335cd4ebe8974915f0af1162bdca42029b3afb98
Brad Ebinger [Fri, 29 Mar 2019 18:23:35 +0000 (18:23 +0000)]
Merge "Change ProvisioningManager API as per review"
Treehugger Robot [Fri, 29 Mar 2019 18:22:12 +0000 (18:22 +0000)]
Merge "Minor change for async DNS API"
Shuo Qian [Fri, 29 Mar 2019 18:11:26 +0000 (18:11 +0000)]
Merge "Emergency Number format"
Sooraj Sasindran [Fri, 29 Mar 2019 17:43:35 +0000 (10:43 -0700)]
Merge "Update documentation for updateAvailableNetworks" am:
ae1e2eef9e
am:
b2bd3984b3
Change-Id: I7762e956b665b81b19bccf236576d11bc46e5356
Sooraj Sasindran [Fri, 29 Mar 2019 17:34:48 +0000 (10:34 -0700)]
Merge "Update documentation for updateAvailableNetworks"
am:
ae1e2eef9e
Change-Id: I2355bcc55f36a292302a630c2e04b902fdcf5c91
John Reck [Fri, 29 Mar 2019 17:26:01 +0000 (10:26 -0700)]
Add missing checkThread
Fixes:
129362490
Test: none
Change-Id: I9429b48291908db7021ad10a18ef3180c7e83bf9
Sooraj Sasindran [Fri, 29 Mar 2019 17:21:54 +0000 (17:21 +0000)]
Merge "Update documentation for updateAvailableNetworks"
Lorenzo Colitti [Fri, 29 Mar 2019 13:14:28 +0000 (22:14 +0900)]
Unhide ICMP echo constants.
Bug:
129251251
Test: atest android.net.ipv6.cts.PingTest com.android.cts.net.hostside.VpnTest com.android.cts.deviceandprofileowner.AlwaysOnVpnTest
Change-Id: I5dc8fce0ac47aa622c8d6763b8fa443a7a0570c8
Hall Liu [Thu, 28 Feb 2019 23:29:19 +0000 (15:29 -0800)]
Add shell permissions for CTS testing
Add NETWORK_SCAN to shell permissions to enable CTS testing of the
network scan changes
Bug:
126779616
Test: CTS
Change-Id: I1f75c9005620b3b0e06f066677cba6190f1d266c
Merged-In: I1f75c9005620b3b0e06f066677cba6190f1d266c
Lorenzo Colitti [Fri, 29 Mar 2019 15:23:31 +0000 (08:23 -0700)]
Merge "Unremove DnsResolver#query method used by external developers" am:
3dd6df002b
am:
3206b80bae
Change-Id: I8c555bc94ec774ebaed4836db7fefece88556d16
Lorenzo Colitti [Fri, 29 Mar 2019 15:09:18 +0000 (08:09 -0700)]
Merge "Unremove DnsResolver#query method used by external developers"
am:
3dd6df002b
Change-Id: I0c8b5b5fe68b99cacc4da10ae27b69fcab8685b7
Lorenzo Colitti [Fri, 29 Mar 2019 14:46:11 +0000 (14:46 +0000)]
Merge "Unremove DnsResolver#query method used by external developers"
Ethan_Hu [Fri, 29 Mar 2019 14:27:29 +0000 (07:27 -0700)]
Merge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with the object lock." am:
51e5edcb9b
am:
0eda9fd9dd
Change-Id: Ia51be3f19a1e35ff9cbb27601a527014b2f0b1f8
Ethan_Hu [Fri, 29 Mar 2019 14:18:23 +0000 (07:18 -0700)]
Merge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with the object lock."
am:
51e5edcb9b
Change-Id: I4f57eb27caffbf6462dcad23660f05efce21e74e
Treehugger Robot [Fri, 29 Mar 2019 14:04:27 +0000 (14:04 +0000)]
Merge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with the object lock."
Aaron Huang [Fri, 29 Mar 2019 13:25:48 +0000 (06:25 -0700)]
Merge "apf: Documentation improvements and code optimizations for keepalive filters" am:
f5166d5527
am:
3eb37cda43
Change-Id: I98afa7c17c62c0550bf7f22b311815f6449ad139
Aaron Huang [Fri, 29 Mar 2019 13:16:36 +0000 (06:16 -0700)]
Merge "apf: Documentation improvements and code optimizations for keepalive filters"
am:
f5166d5527
Change-Id: I9dea9a5a4013b5935178a49a6106a172c16c3612
OSDN Git Service
