Commit graph

4,287 commits

Message SHA1
Restrict lockdown and firewall to AID_SYSTEM.
Bug: 7076289
Change-Id: Iafa3054335e8b1c3c8c3b8db2a4191d4ed4c8c41

Jeff Sharkey   commited 2012-09-06 17:59:14 -07:00
69fc5f8bd1
am 623cc6b7: am bac6c129: Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev
* commit '623cc6b79d4b4dbfea686529e4d6c2e10fe131eb':
  Fix another issue #7097984 java.lang.SecurityException: Permission Denial:

Dianne Hackborn   authored and   Android Git Automerger   commited 2012-09-04 18:54:50 -07:00
2cd86d8e53
Fix another issue #7097984 java.lang.SecurityException: Permission Denial:
broadcast asks to run as user -1 but is calling from user 0; this requires

Dupped bug of a different problem.

Change-Id: I15f4ab08b81f5f5746ba1cd183dee4f0b1281df5

Dianne Hackborn   commited 2012-09-04 18:48:37 -07:00
e588ca1c19
am c25494a4: am 756bc781: am 0e90f738: am cd2a20f2: am 5a2772e2: Merge "Fix code problem in writePidDns"
* commit 'c25494a4a125c4cade58c85eacce9c58a7b250c8':
  Fix code problem in writePidDns

Wink Saville   authored and   Android Git Automerger   commited 2012-08-30 18:20:28 -07:00
8f86658764
am 0e90f738: am cd2a20f2: am 5a2772e2: Merge "Fix code problem in writePidDns"
* commit '0e90f738aa82d9b30e6b4f43cd321e3f9cad2fc1':
  Fix code problem in writePidDns

Wink Saville   authored and   Android Git Automerger   commited 2012-08-30 18:16:30 -07:00
756bc781dd
am 5a2772e2: Merge "Fix code problem in writePidDns"
* commit '5a2772e23b':
  Fix code problem in writePidDns

Wink Saville   authored and   Android Git Automerger   commited 2012-08-30 18:11:30 -07:00
cd2a20f248
Merge "Fix code problem in writePidDns"
Wink Saville   authored and   android code review   commited 2012-08-30 17:36:06 -07:00
5a2772e23b
am f59dfc81: am 73365695: Merge "Improve multi-user broadcasts." into jb-mr1-dev
* commit 'f59dfc81f4d1e91aa436ed70d7f8372bce3d91e0':
  Improve multi-user broadcasts.

Dianne Hackborn   authored and   Android Git Automerger   commited 2012-08-30 15:01:28 -07:00
db245a4594
Improve multi-user broadcasts.
You can now use ALL and CURRENT when sending broadcasts, to specify
where the broadcast goes.

Sticky broadcasts are now correctly separated per user, and registered
receivers are filtered based on the requested target user.

New Context APIs for more kinds of sending broadcasts as users.

Updating a bunch of system code that sends broadcasts to explicitly
specify which user the broadcast goes to.

Made a single version of the code for interpreting the requested
target user ID that all entries to activity manager (start activity,
send broadcast, start service) use.

Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c

Dianne Hackborn   commited 2012-08-30 14:33:22 -07:00
2298689dc1
Merge commit '949dcad8' into manualmerge
Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: I02fee6839c2a8879fb6e885d8fc8483f17d655c2

Irfan Sheriff   commited 2012-08-27 23:03:50 -07:00
4720a8a5ab
Captive portal handling
We now notify the user of a captive portal before switching to the network as default.
This allows background applications to continue to work until the user confirms he
wants to sign in to the captive portal.

Also, moved out captive portal handling out of wifi as a seperate component.

Change-Id: I7c7507481967e33a1afad0b4961688bd192f0d31

Irfan Sheriff   commited 2012-08-27 22:27:06 -07:00
0ad0d13d5a
am f261d88f: am 116ee10b: Merge "Always-on VPN." into jb-mr1-dev
* commit 'f261d88f818df20dfd033746bd3072bd42b705c9':
  Always-on VPN.

Jeff Sharkey   authored and   Android Git Automerger   commited 2012-08-27 15:17:41 -07:00
7084a2aa66
Always-on VPN.
Adds support for always-on VPN profiles, also called "lockdown." When
enabled, LockdownVpnTracker manages the netd firewall to prevent
unencrypted traffic from leaving the device. It creates narrow rules
to only allow traffic to the selected VPN server. When an egress
network becomes available, LockdownVpnTracker will try bringing up
the VPN connection, and will reconnect if disconnected.

ConnectivityService augments any NetworkInfo based on the lockdown
VPN status to help apps wait until the VPN is connected.

This feature requires that VPN profiles use an IP address for both
VPN server and DNS. It also blocks non-default APN access when
enabled. Waits for USER_PRESENT after boot to check KeyStore status.

Bug: 5756357
Change-Id: If615f206b1634000d78a8350a17e88bfcac8e0d0

Jeff Sharkey   commited 2012-08-27 12:35:05 -07:00
ebcc7978c1
am 33f94286: am 34f86312: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
* commit '33f942865c27a0af155ec2be2f1154fe7ece6072':
  Migrate legacy VPN arguments to system_server.

Jeff Sharkey   authored and   Android Git Automerger   commited 2012-08-24 11:37:58 -07:00
d56a2242b8
Migrate legacy VPN arguments to system_server.
Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.

Bug: 5756357
Change-Id: I42c1a644f6add477fe4222342640d7db15982cb8

Jeff Sharkey   commited 2012-08-24 11:29:58 -07:00
64d8b3be3a
am 45a630e8: am d5fc86f0: Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev
* commit '45a630e87ecfa89682d1b8230dd5c6473284e4c1':
  Begin moving VPN to NetworkStateTracker pattern.

Jeff Sharkey   authored and   Android Git Automerger   commited 2012-08-23 16:52:05 -07:00
4eded53f2a
Begin moving VPN to NetworkStateTracker pattern.
Created base tracker that handles common bookkeeping, and move VPN
to become a tracker.  VPN status is now reflected in NetworkInfo, and
is mapped to LegacyVpnInfo.

Legacy VPN now "babysits" any init services it starts, watching for
when they stop unexpectedly.

Bug: 5756357
Change-Id: Iba7ec79da69469f6bd9a970cc39cf6b885b4c9c4

Jeff Sharkey   commited 2012-08-23 16:41:06 -07:00
366e0b75b7
am bb1d9847: am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev
* commit 'bb1d98473c737bff05e3ae11d8ec53195e04725a':
  Update TCP buffer size when switching network type

Robert Greenwalt   authored and   Android Git Automerger   commited 2012-08-20 12:57:28 -07:00
225812f88d
Update TCP buffer size when switching network type
Import of non-merging change 41612 from AOSP

When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Ic44a557677ffe629e83ce1f522a9f058bee6e7b2

Robert Greenwalt   commited 2012-08-20 12:28:51 -07:00
adb8bf98d9
am 634f34af: am 70ccd5bf: am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '634f34af410ee181ef104260b2f31a87562eb4e0':
  Fix for updating TCP buffer size when switching network type

Robert Greenwalt   authored and   Android Git Automerger   commited 2012-08-17 13:49:52 -07:00
d17b08ed70
am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '89ab67578e':
  Fix for updating TCP buffer size when switching network type

Robert Greenwalt   authored and   Android Git Automerger   commited 2012-08-17 13:44:54 -07:00
70ccd5bf80
am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '6626398a72ae592e3a9184c9b0868df0fc1f1724':
  Fix for updating TCP buffer size when switching network type

Robert Greenwalt   authored and   Android Git Automerger   commited 2012-08-17 13:28:25 -07:00
89ab67578e
Fix for updating TCP buffer size when switching network type
When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Iaa527c84f56cae108f4c7276bbed10552faaff6c

Magnus Strandberg   authored and   Zoran Jovanovic   commited 2012-08-17 11:38:44 +02:00
daa042513c
am 35d875ad: am 77b25796: Merge "Setup idletimer for network interface." into jb-mr1-dev
* commit '35d875ade38abd8dba6b7756ca612167ce8bcad0':
  Setup idletimer for network interface.

Ashish Sharma   authored and   Android Git Automerger   commited 2012-08-10 16:09:34 -07:00
e4ff15e728
Setup idletimer for network interface.
Cherry-picked from commit 8ce570b0f3 in
master. DO NOT MERGE

Change-Id: I6101c7ae041b4cc1237ce7a9983753dbdfa301d3

Haoyu Bai   commited 2012-08-10 15:58:34 -07:00
e246244e82
resolved conflicts for merge of ab4e251a to master
Change-Id: I59ad9fe6e777c6677331f83d5e1de28b66f28af7

Jeff Sharkey   commited 2012-08-08 16:39:00 -07:00
696aeb4e78
Merge "Isolate NetworkStateTracker creation, test." into jb-mr1-dev
Jeff Sharkey   authored and   Android (Google) Code Review   commited 2012-08-08 16:25:41 -07:00
9844730f62
Isolate NetworkStateTracker creation, test.
Change ConnectivityService to use a factory when creating
NetworkStateTrackers, which gives us a good place to inject mocks
for testing.  Add initial tests to verify that network routes are
added and removed as networks changed.

Change-Id: I11cbc61a84c2ed4afa2670036295b1494eab26e1

Jeff Sharkey   commited 2012-08-08 16:23:41 -07:00
6b9021d76c
Merge "Setup idletimer for network interface."
Ashish Sharma   authored and   Android (Google) Code Review   commited 2012-08-06 16:22:04 -07:00
5f4cd1dfef
Setup idletimer for network interface.
Change-Id: I1251b60f4c3c31c75c2acd531495ca75bbb35ff5

Haoyu Bai   commited 2012-08-06 14:27:55 -07:00
8ce570b0f3
Merge "Include network type that caused broadcast." into jb-mr1-dev
Jeff Sharkey   authored and   Android (Google) Code Review   commited 2012-08-06 13:40:44 -07:00
976942a8ee
Include network type that caused broadcast.
Network type can be obtained through EXTRA_NETWORK_INFO, but offer
it as first-class extra since the returned NetworkInfo is deprecated.

Bug: 6936247
Change-Id: Ief59577afd2bd930f0f4c5650b413feef86bfbc3

Jeff Sharkey   commited 2012-08-06 11:45:01 -07:00
47905d1f1d
Make generic BaseNetworkObserver.
This makes it easier to add new INetworkManagementEventObserver events
in future.

Change-Id: I432263d745558de4b878f313c1951230ed9db2b1

Jeff Sharkey   commited 2012-08-05 14:32:41 -07:00
60e6c1ac06
Split NST handler events away from CS internals.
Instead of sharing event space, use a different handler backed by
the same looper.

Change-Id: I11f1e4701c341665770ca640f3cba0c295bb7561

Jeff Sharkey   commited 2012-07-26 14:09:09 -07:00
a1ef1bec2a
Network data activity change intent for network interfaces.
The activity notification is received from netd, an intent
DATA_ACTIVITY_CHANGE is then raised for other part of the system to
consume.

Change-Id: Idfcc4763c51c5b314c57f546c12557082f06bebf

Haoyu Bai   commited 2012-07-17 17:13:03 -07:00
b5da575fc7
am 406feb59: (-s ours) Create telephony-common and mms-common - DO NOT MERGE
* commit '406feb595d':
  Create telephony-common and mms-common - DO NOT MERGE

Wink Saville   authored and   Android Git Automerger   commited 2012-07-17 12:36:56 -07:00
e0bdc06669
Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad

Wink Saville   authored and   Jean-Baptiste Queru   commited 2012-07-17 12:23:09 -07:00
406feb595d
Create telephony-common and mms-common
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad

Wink Saville   commited 2012-07-11 16:02:08 -07:00
64e3f78abb
Fix code problem in writePidDns
When app call startUsingNetworkFeature() to keep alive, there is a
code problem in writePidDns() to update the net.dnsX.<pid> property.

Change-Id: I83b02da4808f106c9ca00e350ad38e4bd5cba689

Catherine Liu   commited 2012-06-29 16:09:35 -05:00
e6228bdbd7
Reconcile with jb-release
Change-Id: I4200341adee9a73e326fb9f0c6eefa3d8e01a2b9

The Android Open Source Project   commited 2012-06-19 07:15:35 -07:00
da0ba6beec
merge in jb-release history after reset to jb-dev
The Android Automerger   commited 2012-06-19 07:03:42 -07:00
fd9cdfb85d
am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev
* commit '56bb344ccfd3d261cea9987c98a17d0820279b17':
  Added or fixed doctrings for required permissions.

Nicolas Falliere   authored and   Android Git Automerger   commited 2012-06-18 17:42:57 -07:00
5889983f0b
Added or fixed doctrings for required permissions.
Bug: 6591338
Change-Id: Ia2092f9994854701b5fa1425c371817367ae07ec

Nicolas Falliere   commited 2012-06-18 17:22:34 -07:00
7842df58d0
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I2b5e77195eae1a9676c2530a9023290936e55255

The Android Open Source Project   commited 2012-05-29 09:39:33 -07:00
29cdec9fd3
merge in jb-release history after reset to jb-dev
The Android Automerger   commited 2012-05-29 08:58:07 -07:00
7da38575b5
am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev
* commit '1ed1de7ab2ae03f82500dbf6272bf036d89bd0c9':
  Modify logging to debug this issue

Robert Greenwalt   authored and   Android Git Automerger   commited 2012-05-24 12:30:20 -07:00
6568a45c99
Modify logging to debug this issue
Logging exec time on startUsingNetworkFeature as we've had some reports suggesting it's
causing ANRs.
Remove some logging from NDC so it's local log is more useful.

bug:6492166
Change-Id: I258ff6c59bff2c65935242d50496d84720c5d493

Robert Greenwalt   commited 2012-05-24 10:47:10 -07:00
1e6991edcf
Reconcile with jb-release
Change-Id: I68d329b7abda2aedfd3fd98419f3b3167ccfbc2a

The Android Open Source Project   commited 2012-05-22 13:05:14 -07:00
ce77d5e629
merge in jb-release history after reset to jb-dev
The Android Automerger   commited 2012-05-20 07:39:45 -07:00
fb6ba30c68
merge in jb-release history after reset to jb-dev
The Android Automerger   commited 2012-05-19 11:42:49 -07:00
8eedde7053