53332 Commits

Author SHA1 Message Date
Jeff Sharkey
5dc0c26cff Teach NetworkIdentity about roaming.
And correctly upgrade NetworkIdentitySet written to disk, assuming
that old values aren't roaming.

Bug: 4724762
Change-Id: Ic25897ebbaf43be2390174d8e5fd08386bc8a345
2011-06-19 22:21:05 -07:00
Jeff Sharkey
7553ecbe5b Merge "Persist "tagged" network stats along with UIDs." 2011-06-19 22:07:41 -07:00
Jeff Sharkey
d03fd3f004 Persist "tagged" network stats along with UIDs.
Now stores tags other than TAG_NONE (0x0), which are useful for app
debugging.  Combine UID and tag together into single long key, and
expose tag data through AIDL when requested.  Change NMS to track
TAG_NONE as total UID traffic, matching the kernel definition.

Added TAG_MAX_HISTORY to control how long tag-granularity statistics
are stored; overall UID usage is still kept for UID_MAX_HISTORY.  Fix
bug to trim NetworkStatsHistory outside normal polling loops to catch
non-active networks and UIDs.

Test to verify UID and tag packing, and to verify that UID traffic on
two networks are combined to match MOBILE_ALL template.

Change-Id: If0e039416d9e7f63b1a39e04cddfb1133b5a78ee
2011-06-19 21:58:39 -07:00
Mike Lockwood
3c2a2f6789 Tethering: Use UsbManager to enable/disable RNDIS
Remove obsolete RNDIS support from NetworkManagementService

This change fixes USB tethering, which broke after the new USB gadget driver
changes went in.

Change-Id: Idd987fb2c39c40e81ebc92e6d8dae9fe77ed4ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-19 20:50:46 -04:00
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
Jean-Baptiste Queru
e3b05d0916 Merge "Tweaks for forward-compatibility" 2011-06-18 09:45:53 -07:00
Jean-Baptiste Queru
84d0ccf16c Tweaks for forward-compatibility
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
2011-06-18 09:42:04 -07:00
Adam Powell
b0cd4e2e7c Merge "Holo dialog formatting" 2011-06-17 21:41:08 -07:00
Adam Powell
6323642880 Holo dialog formatting
Change-Id: I6819871df9456130ec75516f8713af92c0e51750
2011-06-17 21:40:29 -07:00
Mike Lockwood
f4c043c2a8 Merge "MTP: Fix some problems with GetObjectHandles and GetNumObjects commands" 2011-06-17 20:54:53 -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
Adam Powell
b3721b9f7d Merge "Allow the action bar title to take on the role of "up" in the absence of a standard "home" icon." 2011-06-17 20:32:49 -07:00
Adam Powell
54c7d7e61c Allow the action bar title to take on the role of "up" in the absence
of a standard "home" icon.

Change-Id: Ie1a9adca674500a29da36956455667bbb55a616f
2011-06-17 20:31:10 -07:00
Jim Miller
6c7f7d8481 Merge "Fix 4584957: remove owner info from phone layouts" 2011-06-17 20:10:20 -07:00
Jim Miller
93f9e1ca1c Merge "Temporary workaround for conflict in GridLayout/LockScreen." 2011-06-17 19:55:55 -07:00
Jim Miller
5b1acf9c3e Temporary workaround for conflict in GridLayout/LockScreen.
Change-Id: I0178c7f44c0fc71e78995a2565844cdb775698dd
2011-06-17 19:53:45 -07:00
Jim Miller
94c9f39ece Merge "Handle dropped motion events in Pattern Unlock due to high system activity" 2011-06-17 19:39:49 -07:00
Romain Guy
98769300af Merge "Add error checking to LayerRenderer::copyLayer" 2011-06-17 17:47:59 -07:00
Romain Guy
d6b2a00dd4 Add error checking to LayerRenderer::copyLayer
This method is invoked by TextureView.getBitmap() and failures must be
caught to avoid leaving the GL context in a potentially bad state.

Change-Id: I620de395ba1bc20154de58c81963223dc55cac78
2011-06-17 17:45:59 -07:00
Jim Miller
d63fdae48a Fix 4584957: remove owner info from phone layouts
The owner info view was causing PIN unlock to be unuseable because it pushed
the keyboard contents down and partially off the screen.

Owner info will be moved to the status1 area in a future CL.

Change-Id: Id96a4cc1c216d06b9d1fcc18bee9b5519befe0f4
2011-06-17 17:17:02 -07:00
Brett Chabot
01f0fd84d0 Include testdata in layoutlib-tests.
Change-Id: I79fff895a13d171079b59db54d4b9d2bec555b3c
2011-06-17 17:03:20 -07:00
Jeff Sharkey
1a81a16a96 Merge "Notify policy listeners about metered ifaces." 2011-06-17 16:57:28 -07:00
Jim Miller
9c8e735817 Merge "Update pattern unlock and assets to match new UX design spec." 2011-06-17 16:50:34 -07:00
Mike Lockwood
4a15d8c800 Merge "Add string resource for CD installer image path" 2011-06-17 16:50:10 -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
6acc90fc21 MTP: Fix some problems with GetObjectHandles and GetNumObjects commands
These calls did not correctly handle some variants of the arguments,
which showed up when running in PTP mode.

Change-Id: Iedbaefebfa39111c8bcaee7c6cc3820a65d6c98f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 19:49:05 -04: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
Mike Lockwood
5d27b7a29b Add string resource for CD installer image path
Change-Id: I50eb2d0213f0547e88e9a20ab926726e781b0c0b
2011-06-17 19:49:04 -04:00
Jim Miller
0d244193be Update pattern unlock and assets to match new UX design spec.
Fix bug with LockPatternView measurement.
Clean up forgotPassword/emergencyCall button code.
Lots of layout tweaks. Now uses new GridLayout for many of them.
New assets.

Updated after review.

Change-Id: I52d4ce65c6b6c644ac60eb55bb8eaff8bfeb1071
2011-06-17 16:48:57 -07:00
Chia-chi Yeh
941ed30638 Merge "VPN: avoid leaking file descriptors." 2011-06-17 16:43:44 -07:00
Jamie Gennis
84293fb962 SurfaceTexture: attach to Dalvik when needed.
This change fixes a bug in the SurfaceTexture JNI where a thread that
the Dalvik VM was not aware of calls the onFrameAvailable callback.
When this happens the callback needs to first attach the thread to the
VM before attempting to post the onFrameAvailable event for Java code to
handle.

Change-Id: I6a5470c32611ea6f38e9167779450f50635cabd3
2011-06-17 16:42:46 -07:00
Chia-chi Yeh
3f3337a662 VPN: avoid leaking file descriptors.
Change-Id: If70f5af3529d79bddb9d72675cf6eb038ff3ff70
2011-06-17 16:34:32 -07:00
Jim Miller
aced12fd22 Handle dropped motion events in Pattern Unlock due to high system activity
This enables the pattern unlock screen to look at historical motion
events to make unlocking easier during high system load.

Change-Id: I74a9c2d0833e8bb6745b89e8d397116baebb24a1
2011-06-17 16:09:46 -07:00
Adam Powell
ec08cacd78 Merge "Fix bug 4689431 - PopupMenus too narrow on phones" 2011-06-17 16:03:40 -07:00
Adam Powell
38639b1d75 Fix bug 4689431 - PopupMenus too narrow on phones
Change-Id: I624b46d17c1d964fd6cb04abf96333c7a8474d75
2011-06-17 16:02:32 -07:00
Chet Haase
1790a10eea Merge "Invisible views can't start animations" 2011-06-17 16:00:57 -07:00
James Dong
d11f591b45 Merge "Use system property to control whether we will enable B frame support in MPEG4Writer" 2011-06-17 15:50:19 -07:00
Romain Guy
ee452bcc06 Merge "Fix rendering issue with paths when the stroke width is 0" 2011-06-17 15:49:22 -07:00
Romain Guy
98029c825b Fix rendering issue with paths when the stroke width is 0
Change-Id: I5d8ac23dc69e9e17df4ef6b5195186b5207e2524
2011-06-17 15:47:07 -07:00
Philip Milne
405efeeeab Merge "Pass width/height specs in the standard way when measuring children." 2011-06-17 15:43:13 -07:00
Ben Dodson
3da3a4582c Parser for uri records
Change-Id: I4b71ba7938aa83a1c6344e3da72a9495bc1e9a16
2011-06-17 15:37:32 -07:00
Philip Milne
a789cafb06 Pass width/height specs in the standard way when measuring children.
Change-Id: I127b206cb677f8a09990b6852c98023d6c97112d
2011-06-17 15:35:46 -07:00
Chia-chi Yeh
ced4bb1df7 Merge "VpnDialogs: migrate to VpnConfig." 2011-06-17 15:31:54 -07:00