OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "Cleanup SystemReady in the network stack"
Chalard Jean [Tue, 2 Apr 2019 00:12:06 +0000 (17:12 -0700)]
Merge "Cleanup SystemReady in the network stack"
am: e0ef7ce4f7

Change-Id: I1a55078b74d5f94afde94da0dc5f6e1d2af10de3

5 years agoMerge "Add a new carrier config to show the WFC location privacy policy UI"
Hall Liu [Mon, 1 Apr 2019 23:34:30 +0000 (16:34 -0700)]
Merge "Add a new carrier config to show the WFC location privacy policy UI"
am: 4c508d1b03

Change-Id: I1b3c96de78b909dab372e3e3745c877b8becd2d6

5 years agoMerge "BluetoothHealth: hide auto-created default constructors"
Jack He [Mon, 1 Apr 2019 23:29:30 +0000 (16:29 -0700)]
Merge "BluetoothHealth: hide auto-created default constructors"
am: 463454432b

Change-Id: I51d7f625dd2bcb81fec4bcf25822d1533cbc5cee

5 years agoMerge "Cleanup SystemReady in the network stack"
Chalard Jean [Mon, 1 Apr 2019 23:28:47 +0000 (23:28 +0000)]
Merge "Cleanup SystemReady in the network stack"

5 years agoMerge "Pass debug.allocTracker.stackDepth to runtime if it exists"
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

5 years agoMerge "Add a new carrier config to show the WFC location privacy policy UI"
Hall Liu [Mon, 1 Apr 2019 22:55:51 +0000 (22:55 +0000)]
Merge "Add a new carrier config to show the WFC location privacy policy UI"

5 years agoMerge "BluetoothHealth: hide auto-created default constructors"
Treehugger Robot [Mon, 1 Apr 2019 22:37:43 +0000 (22:37 +0000)]
Merge "BluetoothHealth: hide auto-created default constructors"

5 years agoMerge "Pass debug.allocTracker.stackDepth to runtime if it exists"
Mathieu Chartier [Mon, 1 Apr 2019 22:29:07 +0000 (22:29 +0000)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists"

5 years agoMerge "Remove clearDefaultsForInactiveSubIds."
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 21:05:57 +0000 (14:05 -0700)]
Merge "Remove clearDefaultsForInactiveSubIds."
am: 1e263e7bc0

Change-Id: I8fb91dd4928cf8a607a876cc304c261bfb762a59

5 years agoMerge changes from topics "nw-scan-cts", "nw-scan-changes"
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

5 years agoMerge "Remove clearDefaultsForInactiveSubIds."
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 20:51:54 +0000 (20:51 +0000)]
Merge "Remove clearDefaultsForInactiveSubIds."

5 years agoAllow requestNetworkScan to return sanitized info
Hall Liu [Mon, 1 Apr 2019 20:47:42 +0000 (13:47 -0700)]
Allow requestNetworkScan to return sanitized info
am: c9d7430685

Change-Id: I91b315cd48095345f34755cc13d059158982a960

5 years agoMerge changes from topics "nw-scan-cts", "nw-scan-changes"
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

5 years agoBluetoothHealth: hide auto-created default constructors
Jack He [Fri, 29 Mar 2019 00:42:26 +0000 (17:42 -0700)]
BluetoothHealth: hide auto-created default constructors

Fixes: 123926561
Test: make
Change-Id: I388472c82eaca245285b5ecf2959c415508d7e69

5 years agoPass debug.allocTracker.stackDepth to runtime if it exists
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

5 years agoMerge "Track public android.system API changes in libcore"
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

5 years agoMerge "Track public android.system API changes in libcore"
Neil Fuller [Mon, 1 Apr 2019 16:41:11 +0000 (16:41 +0000)]
Merge "Track public android.system API changes in libcore"

5 years agoMerge "Unhide ICMP echo constants."
Lorenzo Colitti [Mon, 1 Apr 2019 15:34:23 +0000 (08:34 -0700)]
Merge "Unhide ICMP echo constants."
am: 82d1361e6d

Change-Id: I1dad509eb0b56666cde0399dfcbaea050ce30630

5 years agoMerge "Unhide ICMP echo constants."
Lorenzo Colitti [Mon, 1 Apr 2019 15:08:44 +0000 (15:08 +0000)]
Merge "Unhide ICMP echo constants."

5 years agoMerge "Add comment for NetworkStack permissions"
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

5 years agoMerge "Add comment for NetworkStack permissions"
Treehugger Robot [Mon, 1 Apr 2019 14:45:18 +0000 (14:45 +0000)]
Merge "Add comment for NetworkStack permissions"

5 years agoMerge "Mark PROCESS_OUTGOING_CALLS permission as deprecated."
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

5 years agoMerge "Mark PROCESS_OUTGOING_CALLS permission as deprecated."
Tyler Gunn [Mon, 1 Apr 2019 14:13:50 +0000 (14:13 +0000)]
Merge "Mark PROCESS_OUTGOING_CALLS permission as deprecated."

5 years agoMerge "Add DHCP address lease expiry in IpMemoryStore."
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

5 years agoMerge "Add DHCP address lease expiry in IpMemoryStore."
Xiao Ma [Mon, 1 Apr 2019 12:59:20 +0000 (12:59 +0000)]
Merge "Add DHCP address lease expiry in IpMemoryStore."

5 years agoMerge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues."
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

5 years agoMerge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues."
Paul Hu [Mon, 1 Apr 2019 07:20:53 +0000 (07:20 +0000)]
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues."

5 years agoMerge "Provide link to android experimental flags API"
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

5 years agoMerge "Provide link to android experimental flags API"
Chiachang Wang [Mon, 1 Apr 2019 04:49:33 +0000 (04:49 +0000)]
Merge "Provide link to android experimental flags API"

5 years agoMerge "Move permissions from base to standard manifest"
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

5 years agoCleanup SystemReady in the network stack
Chalard Jean [Mon, 1 Apr 2019 04:04:07 +0000 (13:04 +0900)]
Cleanup SystemReady in the network stack

The system server (in SystemServer.java) defines the boot
sequence, during which an event called SystemReady happens.
This corresponds to a time when critical system services
that are depended upon by other components in the system
server are ready to handle requests from their dependencies.
Some system services are listening to this event to defer
initializations that depend on the critical services.

Because the network stack is only started after SystemReady,
there is no way any NetworkMonitor may be started before
SystemReady. Remove the associated mechanism.

Fix: 129376083
Test: FrameworksNetTests
Change-Id: I071eeb10d0b7c4f71af6653d322c7b442b2cc7ee

5 years agoAdd comment for NetworkStack permissions
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

5 years agoMerge "Move permissions from base to standard manifest"
Remi NGUYEN VAN [Mon, 1 Apr 2019 04:20:41 +0000 (04:20 +0000)]
Merge "Move permissions from base to standard manifest"

5 years agoMerge "Fix race when starting NetworkMonitor"
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

5 years agoMerge "Fix race when starting NetworkMonitor"
Remi NGUYEN VAN [Mon, 1 Apr 2019 03:54:03 +0000 (03:54 +0000)]
Merge "Fix race when starting NetworkMonitor"

5 years agoMerge "Refine Bluetooth silence mode API"
Ugo Yu [Mon, 1 Apr 2019 03:26:18 +0000 (20:26 -0700)]
Merge "Refine Bluetooth silence mode API"
am: c650674397

Change-Id: Icd91568d8bc2897914cececec7743fe2800192eb

5 years agoMerge "Refine Bluetooth silence mode API"
Treehugger Robot [Mon, 1 Apr 2019 03:12:31 +0000 (03:12 +0000)]
Merge "Refine Bluetooth silence mode API"

5 years agoFix race when starting NetworkMonitor
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

5 years agoFix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues.
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

5 years agoProvide link to android experimental flags API
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

5 years agoMove permissions from base to standard manifest
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

5 years agoMark PROCESS_OUTGOING_CALLS permission as deprecated.
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

5 years agoMerge "Revert "Change Values for Opportunistic Entry & Exit Thresholds""
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

5 years agoMerge "Revert "Change Values for Opportunistic Entry & Exit Thresholds""
Treehugger Robot [Sat, 30 Mar 2019 00:53:23 +0000 (00:53 +0000)]
Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds""

5 years agoRevert "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

5 years agoMerge "Do not show SMS SIM pick UI for Cell Broadcast Config change"
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

5 years agoMerge "Do not show SMS SIM pick UI for Cell Broadcast Config change"
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"

5 years agoMerge changes from topics "128455935", "123661746"
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

5 years agoRemove SubscriptionManager#setMetered API.
Malcolm Chen [Fri, 29 Mar 2019 22:21:07 +0000 (15:21 -0700)]
Remove SubscriptionManager#setMetered API.
am: 9b932fa1a4

Change-Id: I55b74e102d77785e7f925d02049037b24a5d352a

5 years agoMerge changes from topics "128455935", "123661746"
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.

5 years agoRemove clearDefaultsForInactiveSubIds.
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

5 years agoMerge "Add missing checkThread"
John Reck [Fri, 29 Mar 2019 21:37:01 +0000 (14:37 -0700)]
Merge "Add missing checkThread"
am: fdb8dfdadf

Change-Id: Iabcd28a4c3fa659c92b392573158dd5025ed8c37

5 years agoMerge "Add missing checkThread"
Treehugger Robot [Fri, 29 Mar 2019 21:18:10 +0000 (21:18 +0000)]
Merge "Add missing checkThread"

5 years agoMerge "Check permissions and carrier privilege in notifyActiveDataSubIdChanged"
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

5 years agoDo not show SMS SIM pick UI for Cell Broadcast Config change
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

5 years agoTrack public android.system API changes in libcore
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

5 years agoMerge "Fix getWifiManager exception if phone is encrypted"
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

5 years agoMerge "Check permissions and carrier privilege in notifyActiveDataSubIdChanged"
Shuo Qian [Fri, 29 Mar 2019 20:13:09 +0000 (20:13 +0000)]
Merge "Check permissions and carrier privilege in notifyActiveDataSubIdChanged"

5 years agoMerge "Fix getWifiManager exception if phone is encrypted"
Treehugger Robot [Fri, 29 Mar 2019 19:55:57 +0000 (19:55 +0000)]
Merge "Fix getWifiManager exception if phone is encrypted"

5 years agoMerge "Change ProvisioningManager API as per review"
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

5 years agoMerge "Minor change for async DNS API"
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

5 years agoCheck permissions and carrier privilege in notifyActiveDataSubIdChanged
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

5 years agoMerge "Emergency Number format"
Shuo Qian [Fri, 29 Mar 2019 18:30:46 +0000 (11:30 -0700)]
Merge "Emergency Number format"
am: e5709bf75f

Change-Id: I335cd4ebe8974915f0af1162bdca42029b3afb98

5 years agoMerge "Change ProvisioningManager API as per review"
Brad Ebinger [Fri, 29 Mar 2019 18:23:35 +0000 (18:23 +0000)]
Merge "Change ProvisioningManager API as per review"

5 years agoMerge "Minor change for async DNS API"
Treehugger Robot [Fri, 29 Mar 2019 18:22:12 +0000 (18:22 +0000)]
Merge "Minor change for async DNS API"

5 years agoMerge "Emergency Number format"
Shuo Qian [Fri, 29 Mar 2019 18:11:26 +0000 (18:11 +0000)]
Merge "Emergency Number format"

5 years agoMerge "Update documentation for updateAvailableNetworks"
Sooraj Sasindran [Fri, 29 Mar 2019 17:34:48 +0000 (10:34 -0700)]
Merge "Update documentation for updateAvailableNetworks"
am: ae1e2eef9e

Change-Id: I2355bcc55f36a292302a630c2e04b902fdcf5c91

5 years agoAdd missing checkThread
John Reck [Fri, 29 Mar 2019 17:26:01 +0000 (10:26 -0700)]
Add missing checkThread

Fixes: 129362490
Test: none
Change-Id: I9429b48291908db7021ad10a18ef3180c7e83bf9

5 years agoMerge "Update documentation for updateAvailableNetworks"
Sooraj Sasindran [Fri, 29 Mar 2019 17:21:54 +0000 (17:21 +0000)]
Merge "Update documentation for updateAvailableNetworks"

5 years agoUnhide ICMP echo constants.
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

5 years agoAdd shell permissions for CTS testing
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

5 years agoMerge "Unremove DnsResolver#query method used by external developers"
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

5 years agoMerge "Unremove DnsResolver#query method used by external developers"
Lorenzo Colitti [Fri, 29 Mar 2019 14:46:11 +0000 (14:46 +0000)]
Merge "Unremove DnsResolver#query method used by external developers"

5 years agoMerge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with...
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

5 years agoMerge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with...
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."

5 years agoMerge "apf: Documentation improvements and code optimizations for keepalive filters"
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

5 years agoFixed NPE in RankingHelper.writeXml.
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

5 years agoMerge "apf: Documentation improvements and code optimizations for keepalive filters"
Aaron Huang [Fri, 29 Mar 2019 13:03:20 +0000 (13:03 +0000)]
Merge "apf: Documentation improvements and code optimizations for keepalive filters"

5 years agoMinor change for async DNS API
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

5 years agoUnremove DnsResolver#query method used by external developers
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

5 years agoMerge "Add version attribute"
Sundong Ahn [Fri, 29 Mar 2019 09:36:10 +0000 (02:36 -0700)]
Merge "Add version attribute"
am: 5dfc73b9af

Change-Id: I074c0d33aaba94db75e7dc303904c2d9cdf26bcd

5 years agoMerge changes from topic "default_permissions"
Sundong Ahn [Fri, 29 Mar 2019 09:32:08 +0000 (02:32 -0700)]
Merge changes from topic "default_permissions"
am: 4dd28c02cd

Change-Id: I9c09fe88e0d5f36a13334a40bec17f8f8a530294

5 years agoMerge "Add version attribute"
Treehugger Robot [Fri, 29 Mar 2019 09:18:31 +0000 (09:18 +0000)]
Merge "Add version attribute"

5 years agoMerge changes from topic "default_permissions"
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

5 years agoMerge "Use IDnsResolver instead of INetd for resolver related binder commands"
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

5 years agoMerge "Use IDnsResolver instead of INetd for resolver related binder commands"
Luke Huang [Fri, 29 Mar 2019 08:45:19 +0000 (08:45 +0000)]
Merge "Use IDnsResolver instead of INetd for resolver related binder commands"

5 years agoAdd DHCP address lease expiry in IpMemoryStore.
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

5 years agoFix getWifiManager exception if phone is encrypted
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

5 years agoMerge "[KA09] add keepalive offload permission to shell"
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

5 years agoMerge "[KA09] add keepalive offload permission to shell"
Mark Chien [Fri, 29 Mar 2019 06:15:11 +0000 (06:15 +0000)]
Merge "[KA09] add keepalive offload permission to shell"

5 years agoMerge "Fix cancellation race problem for aysnc DNS API"
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

5 years agoMerge "Fix cancellation race problem for aysnc DNS API"
Luke Huang [Fri, 29 Mar 2019 03:15:32 +0000 (03:15 +0000)]
Merge "Fix cancellation race problem for aysnc DNS API"

5 years agoEmergency Number format
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)

5 years agoMerge changes from topic "vpn_data_accounting"
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

5 years agoBetter description and parameter name of setPreferredDataSubscriptionId
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

5 years agoRemove SubscriptionManager#setMetered API.
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

5 years agoMerge changes from topic "vpn_data_accounting"
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.

5 years agoUpdate documentation for updateAvailableNetworks
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

5 years agoMerge "Close tethering when UI entitlement fails"
markchien [Thu, 28 Mar 2019 23:45:07 +0000 (16:45 -0700)]
Merge "Close tethering when UI entitlement fails"
am: c3b3a5fa2e

Change-Id: I22ee932f2a9250f11e8bc9e27c03b86884440603

5 years agoMerge "Close tethering when UI entitlement fails"
Treehugger Robot [Thu, 28 Mar 2019 23:34:34 +0000 (23:34 +0000)]
Merge "Close tethering when UI entitlement fails"