5267 Commits

Author SHA1 Message Date
Jeff Sharkey
75a0e9c0f0 Merge "Handle removed UIDs in network stats and policy." 2011-06-19 01:12:01 -07:00
Jeff Sharkey
b09540f33a Handle removed UIDs in network stats and policy.
When UID_REMOVED, clean up any existing UID network policy so it
doesn't linger for future apps.  Also move any NetworkStatsHistory
to special UID_REMOVED tracking bucket.

Tests for new removal code.  Also test detailed UID stats, including
network changes to verify template matching logic.

Bug: 4584212
Change-Id: I9faadf6b6f3830eb45d86c7f1980a27cdbcdb11e
2011-06-19 01:08:12 -07:00
Jeff Sharkey
13e7d3fa07 Merge "Read "qtaguid" network stats, refactor templates." 2011-06-18 23:19:38 -07:00
Jeff Sharkey
1b5a2a96f7 Read "qtaguid" network stats, refactor templates.
Teach NMS to read qtaguid stats from kernel, but fall back to older
stats when kernel doesn't support.  Add "tags" to NetworkStats entries
to support qtaguid.  To work around double-reporting bug, subtract
tagged stats from TAG_NONE entry.

Flesh out stronger NetworkTemplate.  All NetworkStatsService requests
now require a template, and moved matching logic into template.

Record UID stats keyed on complete NetworkIdentitySet definition,
similar to how interface stats are stored.  Since previous UID stats
didn't have iface breakdown, discard during file format upgrade.

Change-Id: I0447b5e7d205d73d28e71c889c568e536e91b8e4
2011-06-18 22:23:11 -07:00
Mike Lockwood
17b90780e2 Merge "USB connected notification and temporary USB options dialog" 2011-06-17 20:54:38 -07:00
Mike Lockwood
32b807b8ec Merge "MountService: Use UsbManager to monitor USB state for mass storage" 2011-06-17 20:54:16 -07:00
Mike Lockwood
78452b4b4a Merge "USB: Support for new USB gadget drivers" 2011-06-17 20:54:00 -07:00
Jeff Sharkey
1a81a16a96 Merge "Notify policy listeners about metered ifaces." 2011-06-17 16:57:28 -07:00
Jeff Sharkey
fdfef57f49 Notify policy listeners about metered ifaces.
Currently, kernel definition of metered networks is applied at the
interface level.  This change maintain list of those metered ifaces
and notifies policy listeners, like ConnectivityService.  (This gives
us a consistent picture of when a network would be blocked.)

Bug: 4601393
Change-Id: I277d5ca96ab967a1c1c3f1da8f9587557cd6d74c
2011-06-17 16:49:21 -07:00
Mike Lockwood
5787a2d5b4 USB connected notification and temporary USB options dialog
This change adds a notification when USB is connected.
Selecting the notification brings up a dialog to allow switching between
MTP and PTP modes, and also allows mounting a CD image for installing AFT.
The UI design is not final - this is a temporary implementation of the UI.

Change-Id: Idd678537aba595fd4cb183ea755bf437f372d826
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 19:49:05 -04:00
Mike Lockwood
ecedfdc779 MountService: Use UsbManager to monitor USB state for mass storage
Change-Id: I50c15c1dc8a1ee4f41cac7de8df9529ff5da1053
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 19:49:05 -04:00
Mike Lockwood
02e4569b5f USB: Support for new USB gadget drivers
Change-Id: Id08df50acb873a94f4765a991ee6a6f5b898ddf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 19:49:05 -04:00
Chia-chi Yeh
3f3337a662 VPN: avoid leaking file descriptors.
Change-Id: If70f5af3529d79bddb9d72675cf6eb038ff3ff70
2011-06-17 16:34:32 -07:00
Elliott Hughes
11c41fbaf1 Merge "Make debuggable="true" imply CheckJNI." 2011-06-17 15:14:28 -07:00
Dianne Hackborn
ca1e210dd6 Merge "Implement remaining infrastructure for user disabling apps." 2011-06-17 14:53:10 -07:00
Dianne Hackborn
0ac3031c15 Implement remaining infrastructure for user disabling apps.
Change-Id: If8135eb0e27ec36f8f159eb7b6397add7acd0299
2011-06-17 14:49:45 -07:00
Elliott Hughes
fa36aee60d Make debuggable="true" imply CheckJNI.
This should help third-party developers debug their apps.

Tested by adding logging to dalvik and launching a debuggable app.

Change-Id: Icec66825709e399e238b4ff00f2bc596485a3a60
2011-06-17 14:39:41 -07:00
Chia-chi Yeh
72fba1caea Merge "VPN: move VpnDialogs related methods into VpnConfig." 2011-06-17 14:37:11 -07:00
Chia-chi Yeh
7b0b834c3d VPN: move VpnDialogs related methods into VpnConfig.
This might not be the best place for the glue code, but it is
known that choosing VpnBuilder will introduce a dependency
cycle of VpnBuilder, ConnectivityService, and the Vpn class.

Change-Id: I3f03617d1fe1a0b8fb3705c23265676fff51a75c
2011-06-17 14:34:11 -07:00
Jeff Sharkey
5bfa752f71 Merge "Avoid clobbering UID stats when not yet loaded." 2011-06-17 11:28:31 -07:00
Jeff Sharkey
af8339374f Avoid clobbering UID stats when not yet loaded.
Bug: 4690822
Change-Id: Ia6c9e8f89e89739cf3380c4b98b9da6f52db48fa
2011-06-17 11:18:27 -07:00
Irfan Sheriff
f2288c960c Merge "Fix IP address cleanup on network disconnect" 2011-06-17 10:09:36 -07:00
Irfan Sheriff
f5600618df Fix IP address cleanup on network disconnect
We used to bring down the interface on network disconnect
which would in turn clean up all the IP addresses.

The interface bringup/shutdown is now handled by wpa_supplicant.
Add netd interface for clearing all IP addresses

Bug: 4676254
Change-Id: I7e24c0ab2e4a412b8d61e9c33ce028966913aaf6
2011-06-17 10:03:13 -07:00
Svetoslav Ganov
63eeff7427 Merge "Accessiiblity in right state upon connection of a test agent." 2011-06-16 16:15:20 -07:00
Svetoslav Ganov
9dc98e3d17 Accessiiblity in right state upon connection of a test agent.
1. Enabling accessibility and disabling all enabled
   accessibility service when a test client connects
   the the AccessibilityManagerService.

Change-Id: I2f40cccaa0035ac1454d8c5ac84678c1542a0229
2011-06-16 16:12:36 -07:00
Jeff Sharkey
ad4c9ed7de Merge "DownloadManager flags for network policy." 2011-06-16 13:39:02 -07:00
Jeff Sharkey
1a30395358 DownloadManager flags for network policy.
Handful of DownloadManager flags to record when a download was paused
because of NetworkPolicyManager rules.

Change-Id: I99fc47f529cb6c8a42dbeca049e0cd0f1556eac4
2011-06-16 13:04:34 -07:00
Robert Greenwalt
4f1f7d3158 am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '241b65aca93e263f0869c5bec4ad1dbda0dec6db':
  Reset connections AFTER we take down the network.
2011-06-16 12:50:46 -07:00
Robert Greenwalt
241b65aca9 am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '5f3505121b761dbd3bba62d1603fbab49de139b9':
  Reset connections AFTER we take down the network.
2011-06-16 12:42:15 -07:00
Robert Greenwalt
5f3505121b Merge "Reset connections AFTER we take down the network." into honeycomb-LTE 2011-06-16 11:34:03 -07:00
Robert Greenwalt
ec896c6a86 Reset connections AFTER we take down the network.
If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.

bug: 3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8
2011-06-16 11:26:54 -07:00
Chia-chi Yeh
d6f69d0e52 Merge "VPN: migrate from generic Bundle to our own Parcelable VpnConfig." 2011-06-16 10:34:34 -07:00
Dianne Hackborn
c1972e1f65 Merge "Fix to clear calling identity when binding a widget." 2011-06-15 17:47:08 -07:00
Dianne Hackborn
4912f16087 Fix to clear calling identity when binding a widget.
Change-Id: Id66abc50ec9ee69317b9838f302c4153995664f7
2011-06-15 17:40:44 -07:00
Chia-chi Yeh
04ba25c418 VPN: migrate from generic Bundle to our own Parcelable VpnConfig.
Note that VpnConfig is for internal use only.
Also remove hidden methods from ConnectivityManager.

Change-Id: Ic298c4dc9a2c6c452bd8f4be6fa84e7ac489c0c4
2011-06-15 17:08:58 -07:00
Michael Jurka
3b1fc47d00 Port recent apps from tablet to phone
- wire up to long press on home
- remove unused recents activity
- remove duplicate recents resources in -large directories (using -sw600dp instead)
- fix issue with zoom/scale translation when recents was brought up

Change-Id: I45538ccaff49b46ac3659c4828f9e2b0cd075241
2011-06-15 16:50:04 -07:00
Chia-chi Yeh
f8905fd13d VPN: change some strings in VPN notifications.
Also remove a small piece of dead code.

Change-Id: Idd10f3d72a92228951278bf360d08ba9bede02d2
2011-06-15 11:06:52 -07:00
Jeff Sharkey
14711eb5b6 Include template in data warning/limit intents.
When launching warning/limit UI, include the template that triggered
the notification.  Also move actions and extra into contract class.

Change-Id: Id2e63fd2d2e36a137a3fd8f889c7256038ca5f2e
2011-06-15 10:29:17 -07:00
Jeff Sharkey
497e4437af Data usage warning and limit notifications.
Watch for network statistics to cross NetworkPolicy warning or limit,
and show notifications to user as needed.  Currently checks during
any statistics update, but will eventually move to event registration
through netd when kernel supports.

Fixed accounting bug in getSummaryForNetwork().  Only apply UID policy
to applications; applying to system processes could break critical
services like RIL.

Change-Id: Iac0f20e910e205f3cbc54ec96395ff268b1aa379
2011-06-14 22:43:08 -07:00
Jeff Brown
5ab3cbc9d8 Merge "Add support for disabling pointer gestures." 2011-06-14 22:08:50 -07:00
Jeff Brown
474dcb5c3d Add support for disabling pointer gestures.
Made it possible for individual windows to disable pointer gestures
while the window has focus using a private API.

Cleaned up the InputReader configuration code to enable in-place
reconfiguration of input devices without having to reopen them all.
This change makes changing the pointer speed somewhat nicer since the
pointer doesn't jump back to the origin after each change.

Change-Id: I9727419c2f4cb39e16acb4b15fd7fd84526b1239
2011-06-14 22:07:31 -07:00
Dianne Hackborn
475deae9a8 am d00bebb0: am abe5bd23: am a9551706: Testing done, compatibility mode no longer on by default.
* commit 'd00bebb005794afc739f54ff21c6ffd7c866738a':
  Testing done, compatibility mode no longer on by default.
2011-06-14 21:53:25 -07:00
Dianne Hackborn
d00bebb005 am abe5bd23: am a9551706: Testing done, compatibility mode no longer on by default.
* commit 'abe5bd23c341da035e9905d9e50c1d6bccf229dc':
  Testing done, compatibility mode no longer on by default.
2011-06-14 21:50:56 -07:00
Dianne Hackborn
abe5bd23c3 am a9551706: Testing done, compatibility mode no longer on by default.
* commit 'a9551706a279a798c91d8ef593b2acb16a30c682':
  Testing done, compatibility mode no longer on by default.
2011-06-14 21:47:51 -07:00
Dianne Hackborn
a9551706a2 Testing done, compatibility mode no longer on by default.
Change-Id: I5bcc98d2b3a1a02ca788ab61440f0aa5d4f7fb4e
2011-06-14 21:05:03 -07:00
Dianne Hackborn
15856f7b62 am 27bad6f3: am baa89d38: am f930232f: Fix a major problem in fragment lifecycle.
* commit '27bad6f33b98e8d7417a6ce4d7f09b2fa1146379':
  Fix a major problem in fragment lifecycle.
2011-06-14 21:01:45 -07:00
Dianne Hackborn
27bad6f33b am baa89d38: am f930232f: Fix a major problem in fragment lifecycle.
* commit 'baa89d3839f70bd31e5219c636ac24a4cc29928d':
  Fix a major problem in fragment lifecycle.
2011-06-14 20:57:48 -07:00
Dianne Hackborn
baa89d3839 am f930232f: Fix a major problem in fragment lifecycle.
* commit 'f930232fd1c8d301d91853c8fe5dca43979ac807':
  Fix a major problem in fragment lifecycle.
2011-06-14 20:54:40 -07:00
Dianne Hackborn
f930232fd1 Fix a major problem in fragment lifecycle.
When animating away a fragment, we were not putting it through
the last part of its lifecycle (onDestroy() etc).

Also, retained fragments that have a target were broken.  Oops.

Change-Id: I5a669b77a2f24b581cde2a0959acf62edb65e326
2011-06-14 20:47:44 -07:00
Dianne Hackborn
3fe9cc5ea6 resolved conflicts for merge of e95c07bd to master
Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6
2011-06-14 16:13:26 -07:00