OSDN Git Service
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 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
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.
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
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 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
Ethan_Hu [Tue, 5 Mar 2019 06:58:32 +0000 (14:58 +0800)]
Fixed NPE in RankingHelper.writeXml.
Make sure that mRecords is operated with the object lock.
Bug:
127290258
Test: Repeat to upgrade the App targetversion from less than O to a later version
Change-Id: I70e61c0fcd3071f32a430d45441ffe1376147a5d
Signed-off-by: Ethan_Hu <huyuxin3818@gmail.com>
Merged-In: Ic7f676499425fe54453384d7c03de5d95c03a713
Aaron Huang [Fri, 29 Mar 2019 13:03:20 +0000 (13:03 +0000)]
Merge "apf: Documentation improvements and code optimizations for keepalive filters"
Luke Huang [Fri, 29 Mar 2019 10:01:11 +0000 (18:01 +0800)]
Minor change for async DNS API
do the minor changes to address comments before
Bug:
129395490
Test: atest DnsResolverTest
Change-Id: I56e2e5bc4352ff5c979579247a333a41950079da
Luke Huang [Thu, 28 Mar 2019 05:56:31 +0000 (13:56 +0800)]
Unremove DnsResolver#query method used by external developers
This method was removed as part of addressing API council feedback in b/
129261432
Add back previous DnsResolver#query which is already being used by developers.
Bug:
129395490
Test: atest DnsResolverTest
Change-Id: Ic956db204f3940d39d42e1b11dda39e57d356fad
Sundong Ahn [Fri, 29 Mar 2019 09:48:56 +0000 (02:48 -0700)]
Merge "Add version attribute" am:
5dfc73b9af
am:
755044bdab
Change-Id: I9bf2c56d421a8695db93a1e467e8a4e9316e9165
Sundong Ahn [Fri, 29 Mar 2019 09:43:26 +0000 (02:43 -0700)]
Merge changes from topic "default_permissions" am:
4dd28c02cd
am:
51f25090a5
Change-Id: Ib2249dbdc6ff9f5a51a9c4b2d573c8d51231795c
Sundong Ahn [Fri, 29 Mar 2019 09:36:10 +0000 (02:36 -0700)]
Merge "Add version attribute"
am:
5dfc73b9af
Change-Id: I074c0d33aaba94db75e7dc303904c2d9cdf26bcd
Sundong Ahn [Fri, 29 Mar 2019 09:32:08 +0000 (02:32 -0700)]
Merge changes from topic "default_permissions"
am:
4dd28c02cd
Change-Id: I9c09fe88e0d5f36a13334a40bec17f8f8a530294
Treehugger Robot [Fri, 29 Mar 2019 09:18:31 +0000 (09:18 +0000)]
Merge "Add version attribute"
Treehugger Robot [Fri, 29 Mar 2019 09:18:13 +0000 (09:18 +0000)]
Merge changes from topic "default_permissions"
* changes:
Change the package name
Add maxOccurs
Luke Huang [Fri, 29 Mar 2019 09:10:55 +0000 (02:10 -0700)]
Merge "Use IDnsResolver instead of INetd for resolver related binder commands" am:
b9ef4dd299
am:
1711278ce2
Change-Id: I80ae047bd65b654e01061a9f218be23e1e3ef2ed
Luke Huang [Fri, 29 Mar 2019 08:57:44 +0000 (01:57 -0700)]
Merge "Use IDnsResolver instead of INetd for resolver related binder commands"
am:
b9ef4dd299
Change-Id: Icca07604bc8f922c51493e72fde8c7377105bf8b
Luke Huang [Fri, 29 Mar 2019 08:45:19 +0000 (08:45 +0000)]
Merge "Use IDnsResolver instead of INetd for resolver related binder commands"
Xiao Ma [Fri, 1 Mar 2019 03:25:36 +0000 (12:25 +0900)]
Add DHCP address lease expiry in IpMemoryStore.
Bug:
122710829
Test: atest FrameworksNetTests
Change-Id: I643fe1231edcd18923514ab66c64a6cf83e69443
Ye Jiao [Mon, 28 Jan 2019 04:54:22 +0000 (12:54 +0800)]
Fix getWifiManager exception if phone is encrypted
[Issue Details]
NetworkPolicyManagerService may invoke
dispatchRestrictBackgroundChanged after reboot if settings changed, and
invokes untetherAll in turn, which triggers ServiceNotFoundException
indirectly if the device is under encryption. The cause is that
WifiService is not running if the device is still locked.
[Solution]
In order to avoid ServiceNotFoundException in setWifiTethering, we add
check on return value of getWifiManager. Moreover, check of UsbManager
is also added to prevent potential similar issues of USB tethering.
Bug:
123504004
Test: FrameworksNetTests
adb shell am instrument -w com.android.frameworks.tests.net
Test: CTS - CtsNetTestCases
ANDROID_BUILD_droid-cts/tools/cts-tradefed run cts -m CtsNetTestCases
Test: CTS - CtsNetTestCasesLegacyApi22
ANDROID_BUILD_droid-cts/tools/cts-tradefed run cts -m
CtsNetTestCasesLegacyApi22
Test: CTS - CtsNetTestCasesLegacyPermission22
ANDROID_BUILD_droid-cts/tools/cts-tradefed run cts -m
CtsNetTestCasesLegacyPermission22
Change-Id: I2643188b51900f97ba58c8614c66cb55ebfaa2f6
Mark Chien [Fri, 29 Mar 2019 06:43:45 +0000 (23:43 -0700)]
Merge "[KA09] add keepalive offload permission to shell" am:
bc350db984
am:
b15da9fb19
Change-Id: Ieab8acf24f294d758667230b5c07a6540419186d
Mark Chien [Fri, 29 Mar 2019 06:34:48 +0000 (23:34 -0700)]
Merge "[KA09] add keepalive offload permission to shell"
am:
bc350db984
Change-Id: Ica5b5ec05731a7c840d1f7dd1534d532c524df04
Mark Chien [Fri, 29 Mar 2019 06:15:11 +0000 (06:15 +0000)]
Merge "[KA09] add keepalive offload permission to shell"
Luke Huang [Fri, 29 Mar 2019 03:45:44 +0000 (20:45 -0700)]
Merge "Fix cancellation race problem for aysnc DNS API" am:
1859ae7e7d
am:
391b3aa532
Change-Id: I633a592c7f46162268a759f84a77211443e9a04e
Luke Huang [Fri, 29 Mar 2019 03:32:40 +0000 (20:32 -0700)]
Merge "Fix cancellation race problem for aysnc DNS API"
am:
1859ae7e7d
Change-Id: I7e22c38c502fa0181e97057d9992c2a43c11b378
Luke Huang [Fri, 29 Mar 2019 03:15:32 +0000 (03:15 +0000)]
Merge "Fix cancellation race problem for aysnc DNS API"
sqian [Fri, 15 Mar 2019 02:42:38 +0000 (19:42 -0700)]
Emergency Number format
Use PhoneNumberUtils#isDialable to check each character.
Bug:
123241078
Test: Treehugger
Change-Id: Icc9083ed4d6cdae22c3ede9433433ac8eeec4918
Merged-In: Icc9083ed4d6cdae22c3ede9433433ac8eeec4918
(cherry picked from commit
0197a96e8add2658d424d5d318b383281d702add)
Varun Anand [Fri, 29 Mar 2019 01:16:37 +0000 (18:16 -0700)]
Merge changes from topic "vpn_data_accounting" am:
6c93e5378a
am:
09ef7691f5
Change-Id: If4fff1b4d14e80e024ce7b1aa85ebd3afcb1ecc2
Varun Anand [Fri, 29 Mar 2019 01:06:12 +0000 (18:06 -0700)]
Merge changes from topic "vpn_data_accounting"
am:
6c93e5378a
Change-Id: Iaa4b2dd9be2fc6e9833c6c846b6858aab507ca8b
Malcolm Chen [Tue, 19 Mar 2019 00:26:43 +0000 (17:26 -0700)]
Better description and parameter name of setPreferredDataSubscriptionId
Bug:
128455935 128456058
Test: build
Change-Id: I41ae6752756d998739fd7635bcc7765f255806d7
Merged-In: I41ae6752756d998739fd7635bcc7765f255806d7
Malcolm Chen [Mon, 18 Mar 2019 20:50:23 +0000 (13:50 -0700)]
Remove SubscriptionManager#setMetered API.
Bug:
123661746
Test: sanity
Change-Id: Ia6772dee1bd566e0be6b06455d92c923d2c01b12
Merged-In: Ia6772dee1bd566e0be6b06455d92c923d2c01b12
Varun Anand [Fri, 29 Mar 2019 00:40:53 +0000 (00:40 +0000)]
Merge changes from topic "vpn_data_accounting"
* changes:
Move BatteryStats and StatsCompanionService to use NetworkStatsService.
NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
Take all VPN underlying networks into account when migrating traffic for VPN uid.
Sooraj Sasindran [Fri, 22 Mar 2019 22:14:12 +0000 (15:14 -0700)]
Update documentation for updateAvailableNetworks
Update documentation for updateAvailableNetworks
Bug:
128902411
Test: make
Change-Id: Ib6b6d72db3320e6c95f74b9371483f57bc90fee1
markchien [Thu, 28 Mar 2019 23:54:03 +0000 (16:54 -0700)]
Merge "Close tethering when UI entitlement fails" am:
c3b3a5fa2e
am:
fed8661b68
Change-Id: I3132c0ae24ee4175b3c5283ce68add22af0fb90e
markchien [Thu, 28 Mar 2019 23:45:07 +0000 (16:45 -0700)]
Merge "Close tethering when UI entitlement fails"
am:
c3b3a5fa2e
Change-Id: I22ee932f2a9250f11e8bc9e27c03b86884440603
Treehugger Robot [Thu, 28 Mar 2019 23:34:34 +0000 (23:34 +0000)]
Merge "Close tethering when UI entitlement fails"
Hans Boehm [Thu, 28 Mar 2019 22:48:30 +0000 (15:48 -0700)]
Merge "Clarify hasSelection description" am:
6bd5cf2bcc
am:
0e63b9ce98
Change-Id: I9dd2aab2f7a1f2b249d2919dafeb3c1879469933
Hans Boehm [Thu, 28 Mar 2019 22:39:43 +0000 (15:39 -0700)]
Merge "Clarify hasSelection description"
am:
6bd5cf2bcc
Change-Id: Ia7f3d0eae07f978ad29a7f3e127f1bf71c14c8dc
Sooraj Sasindran [Thu, 28 Mar 2019 22:32:43 +0000 (15:32 -0700)]
Merge "Change Values for Opportunistic Entry & Exit Thresholds" am:
6d565c7785
am:
cff4a105ed
Change-Id: I60dcd8d4bd2a35ff5ec443204ef7b6f7d53fe04b
OSDN Git Service
