Commit Graph

43250 Commits

Author SHA1 Message Date
nharold
f983d89083 Merge changes from topic 'ipsec-transport-impl'
am: 464dc5c07e

Change-Id: I6caf23f5fef995f1ad735ea64b99660a5180799f
2017-04-02 00:19:44 +00:00
nharold
464dc5c07e Merge changes from topic 'ipsec-transport-impl'
* changes:
  Add Initial IPsec APIs to IpSecService
  IpSecManager and IpSecTransform API Cleanup
2017-04-02 00:10:35 +00:00
Nathan Harold
93962f34ce Add Initial IPsec APIs to IpSecService
-Plumb IpSecManager APIs to NetD
-Add Resource Management to IpSecService

Bug: 33695893
Test: CTS verifies nearly all of these paths
Change-Id: Ic43965c6158f28cac53810adbf5cf50d2c54f920
2017-03-31 18:11:27 -07:00
Joel Scherpelz
a084e3283f Merge "Partially revert "Add blocking and retrying wrappers for INetd uses.""
am: 8b560611bf

Change-Id: I65e9137ae4c4f48e5484059244833edeab41f001
2017-03-31 00:42:57 +00:00
Joel Scherpelz
8b560611bf Merge "Partially revert "Add blocking and retrying wrappers for INetd uses."" 2017-03-31 00:28:13 +00:00
Robin Lee
e61a30f635 Merge "Move some VPN logic out of ConnectivityService"
am: ec86462033

Change-Id: I212c2d6de1676ab65e6bbf34148d66e183d60c62
2017-03-30 16:08:50 +00:00
Robin Lee
ec86462033 Merge "Move some VPN logic out of ConnectivityService" 2017-03-30 16:00:41 +00:00
Joel Scherpelz
d8ea68ddc9 Partially revert "Add blocking and retrying wrappers for INetd uses."
Direct access to Netd from the bluetooth process is disallowed by
SELinux policy. This change reverts to the old behavior where IpManager 
interacts with NetdService indirectly via NetworkManagementService.

Bug: 36492299

This partially reverts commit af39244a34.

Change-Id: Icf20b1e24abf7dd3123760f8637928bde7afe06b
2017-03-30 01:18:44 +00:00
Nathan Harold
4fdc7d5ddd Merge commit 'ce073d70bedc' into stage-aosp-master
Change-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b
2017-03-29 16:04:31 -07:00
Treehugger Robot
ce073d70be Merge "Add a Skeleton IpSecService" 2017-03-29 22:50:50 +00:00
Koji Fukui
19e2bcd2a7 Merge "Ignore toast request of pinning if request interval is too short"
am: 1fcacf7736

Change-Id: I2814c128db0f9eb42d1f35236ed57e35ad6c417c
2017-03-29 18:49:47 +00:00
Treehugger Robot
1fcacf7736 Merge "Ignore toast request of pinning if request interval is too short" 2017-03-29 18:41:54 +00:00
Nathan Harold
1afbef40c6 Add a Skeleton IpSecService
-Add IpSecService with the necessary glue to connect to netd
-Add code to retrieve IpSecService from System Server

Bug: 34811227
Test: Service boots (and dumpsys works), more via b/34811227
Merged-In: I4cdcb643421141202f77a0e2f87a37012de0cd92
Change-Id: I4cdcb643421141202f77a0e2f87a37012de0cd92
2017-03-29 11:31:27 -07:00
Koji Fukui
d8c160351c Ignore toast request of pinning if request interval is too short
Symptom:
System crash happens if an application repeatedly requests to finish
itself in pinning state.

Root cause:
Toast for pinning state is shown when the application requests to
finish itself. Every toasts use file descripters and they consumes all
available file descripters. System crash happens because of file
descriptor shortage.

Solution:
Ignore toast request for pinning state if request interval is too short.

Bug: 34211454

Change-Id: I4c3b45825270ab96fcfb24723195e9189709c2ec
2017-03-29 13:05:31 +09:00
Calin Juravle
8a4afd3dad Merge changes from topic 'dex'
am: f665781c74

Change-Id: I31c202a56d8f92634cc1d5d84106e27cb8c23bfd
2017-03-29 01:27:37 +00:00
Calin Juravle
c480bdafdb Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
Test: adb shell cmd package bg-dexopt-job works for sercondary dex files

Bug: 32871170
Bug: 26719109

(cherry picked from commit a70b1b1203)

Merged-In: Iaee8071449c83e774b2fe331aaccfc5433856f4f
Change-Id: I2334e4d73a5acdd1106e913c59ddf642782f1eee
2017-03-28 16:00:25 -07:00
Andreas Gampe
9f6dc54c29 Merge "ActivityManager: Allow DiskRead for wrap.sh determination"
am: cbcb388d82

Change-Id: I5c293bcfb026f75c15fb2fa92b2ac7f796579747
2017-03-28 20:38:59 +00:00
Calin Juravle
37fb57084b Set pm.BackgroundDexOptService as the source of true
The real dexopt maintainance job is
com.android.server.pm.BackgroundDexOptService, and not
com.android.server.BackgroundDexOptJobService

Partial revert of commit 096d304ae3.

Test: manual inspection
Bug: 36140426

(partial cherry picked from commit
91d40f1baa)

Merged-In: I983ac91117f107282095fa7eefdbce08e0dcfce3
Change-Id: I983ac91117f107282095fa7eefdbce08e0dcfce3

# Conflicts:
#	core/res/AndroidManifest.xml
#
services/core/java/com/android/server/pm/PackageManagerService.java
#	services/java/com/android/server/SystemServer.java
2017-03-28 13:37:15 -07:00
Calin Juravle
b3e74b2f90 Add missing return in DexManager
Harmless issue but which can spam the logs.

Test: mostly manual since the check is buried deep inside and cannot be
verified accurately. I added another test to DexManager to stress that
code path and then checked the logs.

Bug: 36117123

(cherry picked from commit 2dfc1b3e12)

Merged-In: I1a878a200f3f726dfaa85f1bed1398acc8dce979
Change-Id: Ib2c034add2e8229b90eb4aaa0067d42d26798670
2017-03-28 13:37:15 -07:00
Calin Juravle
24ff75fb08 Update package use info when the app data is updated
- clear usesByOtherApps flag when the package is updated
- delete secondary dex usage data when the app data is destroyed

Test: runtest -x .../PackageDexUsageTests.java
      runtest -x .../DexManagerTests.java
Bug: 32871170
Bug: 35381405

(cherry picked from commit 99dd37b3c5)

Merged-In: I3a249b9e8680e745fa678c7ce61b4ae764078fb9
Change-Id: Ia8416e7232cda3e42a8dccd51cb152a237e0f317
2017-03-28 13:37:15 -07:00
Treehugger Robot
cbcb388d82 Merge "ActivityManager: Allow DiskRead for wrap.sh determination" 2017-03-28 20:28:30 +00:00
Jerry Zhang
cb6beee2af Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function"
am: a0360e38ab

Change-Id: I862f38f52cef8b2b90125953593774263b862306
2017-03-28 18:57:16 +00:00
Jerry Zhang
a0360e38ab Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" 2017-03-28 18:41:59 +00:00
Andreas Gampe
62be34e32e ActivityManager: Allow DiskRead for wrap.sh determination
Avoid killing debuggable apps which at the same time have a strict-mode
policy installed.

Bug: 33668201
Test: m
Change-Id: Ic3c56b01fe42a473e28c1d6280526afdc85793df
2017-03-28 11:36:01 -07:00
Lorenzo Colitti
0a34afb48d Merge changes If94102c7,I8d51e8e0
am: 22b829c049

Change-Id: I8aa529a05fc40241ec9664775ca0ebd8960098a8
2017-03-28 12:33:28 +00:00
Lorenzo Colitti
22b829c049 Merge changes If94102c7,I8d51e8e0
* changes:
  Make ConnectivityServiceTest pass on wifi-only devices.
  Restore the net.dnsX system properties.
2017-03-28 12:22:43 +00:00
Lorenzo Colitti
42cdf57703 Make ConnectivityServiceTest pass on wifi-only devices.
Test: ConnectivityServiceTest passes on ryu on internal master
Test: ConnectivityServiceTest passes on bullhead
Change-Id: If94102c7df0257ea9e69e72b07a685ae3c2c4022
2017-03-28 12:53:06 +09:00
Erik Kline
c5bca697ba Merge "Add null check to IpManager.dump()"
am: 58406d1df2

Change-Id: I68f644a305d58e1396522d73c0983e1eb201cb1c
2017-03-28 02:30:18 +00:00
Lorenzo Colitti
c02ac733d2 Restore the net.dnsX system properties.
In order to avoid app breakage, we are putting back the system
properties and using selinux to disallow access from apps
targeting the O SDK or above.

This CL is cherry-picked from internal commit
e3b85dfbc1, but with a different
commit description.

Bug: 33308258
Bug: 33807046
Bug: 34028616
Bug: 34115651
Test: system properties are readable as root and shell
Change-Id: I8d51e8e0a620d581c4251fb2f3c1d0a813b929be
2017-03-28 06:55:01 +09:00
Erik Kline
0ea70fc38b Add null check to IpManager.dump()
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 36650508
Change-Id: I2270bec20b966de487048f0ea0c97360e242cd9d
2017-03-28 05:30:41 +09:00
Robin Lee
b8c2a2b850 Move some VPN logic out of ConnectivityService
This cleanup helps declutter ConnectivityService, and encapsulates the
always-on setting inside of Vpn instead of spreading it across two
classes.

In particular having the save code in one file and the load code in
another file was weird and I apologise for that.

Added a SystemServices wrapper for Settings.Secure and PendingIntent
calls to decouple some of the global state nastiness and make it
testable without forcing ConnectivityService to drive the load/save.

Test: runtest -x tests/net/java/com/android/server/ConnectivityServiceTest.java
Test: runtest -x tests/net/java/com/android/server/connectivity/VpnTest.java
Bug: 33159037
Change-Id: Ie2adb1c377adfcef0a5900dc866e6118f451b265
2017-03-27 13:40:51 +01:00
Joel Scherpelz
84c2fb2070 Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces""
am: 63d26caa38

Change-Id: I367506eee558dbd7abeeabf09716f7024c2e43d8
2017-03-27 05:24:09 +00:00
Joel Scherpelz
63d26caa38 Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"" 2017-03-27 05:17:22 +00:00
Joel Scherpelz
6a35f3c3e2 Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
On second thought, let's set accept_ra_rt_info_m**_plen in 
Netd (InterfaceController::initializeAll())

This reverts commit 25870a2c9e.

Change-Id: I22b000623bb852e375385d4aae789d007e84ba3d
2017-03-27 00:54:41 +00:00
puma_hsu
4b3e46c787 Just broadcast intent to bring up MTP/PTP as soon as switching function
Bug:36113457
Change-Id: I3a7ab6fdcd157740b8e55ded67b3d5dddf15b0e0
Signed-off-by: puma_hsu <puma_hsu@htc.com>
2017-03-24 16:53:30 -07:00
Przemyslaw Szczepaniak
2f5a9febf4 Merge "Default 'persist.sys.timezone' property to GMT if not set on init."
am: 302b7a7075

Change-Id: I3eba21ec64878deda2d3465fcac96384241f27aa
2017-03-23 14:23:53 +00:00
Treehugger Robot
302b7a7075 Merge "Default 'persist.sys.timezone' property to GMT if not set on init." 2017-03-23 14:14:19 +00:00
Marie Janssen
3d4c1fd1fb Merge "Bluetooth: log unexpected crashes and restarts"
am: 25b6f08ece

Change-Id: I1a0bfa2c8aba75dd60437680c5726f8c4e6c88ab
2017-03-23 00:42:53 +00:00
Ajay Panicker
400279def2 Bluetooth: Use content observer for airplane mode
We are making this switch as the airplane mode switch intent is going away.

Fix: 35256299
Test: Toggle Airplane Mode
Change-Id: I3b1e5bbdf689b0db98cfbb0ab377198d34f0ba05
2017-03-22 11:36:16 -07:00
Przemyslaw Szczepaniak
20e020536e Default 'persist.sys.timezone' property to GMT if not set on init.
Test: make, flashall -w and tested persist.sys.timezone value
Bug: 36488101
Change-Id: I6d0dab1e247dd7c303153bbe0e997581e36a973d
2017-03-22 18:02:30 +00:00
Treehugger Robot
25b6f08ece Merge "Bluetooth: log unexpected crashes and restarts" 2017-03-22 16:09:04 +00:00
Daichi Hirono
42d6843aa4 Merge "Stop holding mProxyLock while downloading PAC script data."
am: 7b26041ccc

Change-Id: Ie747a28fe588c15789d965d6274cb717ea9a5fb0
2017-03-22 07:55:57 +00:00
Daichi Hirono
ce522835ea Stop holding mProxyLock while downloading PAC script data.
Holding PacManager#mProxyLock for long time eventually causes ANR when
launching new applications.

1. ActivityThread#handleBindApplication blocks until

   ActivityThread#handleBindApplication
   -> ConnectivityService#getProxyForNetwork()
   -> ConnectivityService#getDefaultProxy()

  obtains the lock of ConnectivityService#mProxyLock

2. ConnectivityService#mProxyLock can be held by
   ConnectivityService#setGlobalProxy() running on another thread until

   ConnectivityService#setGlobalProxy()
   -> ConnectivityService#sendProxyBroadcast()
   -> PacManager#setCurrentProxyScriptUrl()

  obtains the lock of PacManager#mProxyLock

3. Before the CL, PacManager#mProxyLock could be held by
   mPacDownloader#run() on mNetThread until downloading a PAC script
   completed.

The CL fixes the step 3 so that mPacDownloader#run does not keep the
lock of PacManager#mProxyLock. It eventually fixes long blocking at
ActivityThread#handleBindApplication and ANR when launching an
application.

Bug: 36317236
Test: Build succeeded
Merged-In: I864e41e1142178681f8f1b4fb7750d37e3ab2076
Change-Id: I864e41e1142178681f8f1b4fb7750d37e3ab2076
2017-03-22 05:58:20 +00:00
Marie Janssen
e54b42237f Bluetooth: log unexpected crashes and restarts
Add some reasons to the log when:
 - the Bluetooth stack crashes underneath us
 - user switches
 - we automatically restart

List every instance of the stack crashing underneath us in the dumpsys.
Clean up some unused constants.

Test: notice a Bluetooth crash, adb bugreport
Change-Id: I79195f0a574de1bf48a976d31c64084d3ce2e14a
2017-03-21 18:39:35 +00:00
Erik Kline
9e46faff07 Merge "add and incorporate TetheringConfiguration.dump()"
am: 9eb959320f

Change-Id: I29c80b36ddd14e1e03c88c63d35ee9982dcef887
2017-03-21 10:14:19 +00:00
Treehugger Robot
9eb959320f Merge "add and incorporate TetheringConfiguration.dump()" 2017-03-21 10:05:43 +00:00
Jeremy Klein
23d6ba12f1 Merge "In isTetheringSupported, call isAdmin user from system."
am: 4a8953094f

Change-Id: Ibefe655ed377c55322d871e02d87c0d001327da8
2017-03-20 23:58:09 +00:00
Jeremy Klein
246a1feeb7 In isTetheringSupported, call isAdmin user from system.
This avoids requiring the MANAGE_USERS permission in this function.

Bug: 32671528
Test: Manual. Also seeking unit test guidance from reviewer.
Change-Id: I841e721013b0e4b6db34d629a1e97b3cd54cd73b
2017-03-20 15:02:30 -07:00
Ryuki Nakamura
900620cffc Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()"
am: a6ce3f3021

Change-Id: I3f43b25622e5052e6336983da84b92e12f3e06dc
2017-03-20 17:05:16 +00:00
Treehugger Robot
a6ce3f3021 Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" 2017-03-20 16:54:35 +00:00