Commit Graph

51681 Commits

Author SHA1 Message Date
Jaikumar Ganesh
eba97ec52f Merge "Bluetooth: correcting return value from cancelDiscovery" 2011-06-02 10:42:30 -07:00
Albert Mojir
efc1d16374 Bluetooth: correcting return value from cancelDiscovery
BluetoothAdapter.cancelDiscovery was previously always
returning false.

Change-Id: Ic1fd134d4b710438d95c5b8ca009104529dd1bf5
2011-06-02 10:30:49 -07:00
James Dong
6c2cb3061d Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based" 2011-06-02 10:22:50 -07:00
Dianne Hackborn
108a61cac5 Merge "resolved conflicts for merge of 76450622 to master" 2011-06-02 10:17:05 -07:00
James Dong
443287068b Do not call getEstimatedBandwidth if the streaming is not HTTP-based
Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
2011-06-02 10:13:52 -07:00
Gilles Debunne
e9ff92d7d2 Merge "Remove suggestion span underline on device rotation" 2011-06-02 09:45:32 -07:00
Fabrice Di Meglio
52ae3f345b Merge "Add more unit tests cases for BiDi / RTL" 2011-06-02 09:34:10 -07:00
Fabrice Di Meglio
8226f2b519 Merge "Add more unit tests for RelativeLayout" 2011-06-02 09:33:24 -07:00
Fabrice Di Meglio
c715528c96 Add more unit tests cases for BiDi / RTL
- update FrameLayout tests
- add more RelativeLayout tests

Change-Id: I2ae522c5e6ec216f7ade45935f8309b543f380b9
2011-06-02 09:29:03 -07:00
Dianne Hackborn
ed60f81940 resolved conflicts for merge of 76450622 to master
Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83
2011-06-02 09:20:52 -07:00
Glenn Kasten
c49b870adf Merge "Use android.os.Process.THREAD_PRIORITY_* symbols" 2011-06-02 07:26:17 -07:00
Glenn Kasten
d3092e3157 Merge "Remove unnecessary level of priority indirection" 2011-06-02 07:24:14 -07:00
Eric Fischer
279ad356fe am 0bb63c58: (-s ours) am 90856661: am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '0bb63c58a464e7df60de103319204b7b590e5d75':
  Import revised translations.  DO NOT MERGE
2011-06-02 03:21:06 -07:00
Ben Murdoch
368f2bd054 Merge "Merge WebKit at r80534: Update user agent string." 2011-06-02 03:03:15 -07:00
satok
cc28a669f6 Merge "Add an api to get the display name for InputMethodSubtype" 2011-06-02 02:34:32 -07:00
satok
4f31353cb3 Add an api to get the display name for InputMethodSubtype
Bug: 4321667

Change-Id: I55aa844ff33dae0cf8ef00072e87727992eb77c1
2011-06-02 18:26:36 +09:00
Svetoslav Ganov
f9886f3ee9 AccessiblityManagerService not cleaning up dead binders.
1. AccessibilityManagerService was keeping handles to dead
   IAccessibilitymanagerClients - now doing so.

2. AccessibilityManagerService was lazily cleaning up dead
   IAccessibilityServiceConnections - now using a callback.

3. Cleaned up the book keeping of enabled services.

4. Fixed a bug that the input filter is still enabled
   when disabling accessibility.

Change-Id: I5e9af7ab684a3b71e8ee51125b1262a17e960eb0
2011-06-01 20:32:09 -07:00
Fabrice Di Meglio
c2e989021e Add more unit tests for RelativeLayout
- update BiDiTest test app

Change-Id: I8c0734fc8a94765d269b0040ebfa048c13e11728
2011-06-01 19:11:15 -07:00
Adam Powell
c3076425bb Fix bug 4520517 - IllegalStateException entering tab mode
Change-Id: I0ebf3aea98060e27e9687f48dff05f7310046ce5
2011-06-01 18:19:04 -07:00
Gilles Debunne
aa67eef1b6 Remove suggestion span underline on device rotation
Change-Id: I2fca995f839eff84ee8c62289f6f110ebb8dd321
2011-06-01 18:03:37 -07:00
Glenn Kasten
260c77a4f7 Use android.os.Process.THREAD_PRIORITY_* symbols
As part of latency project, searching for and replacing
hard-coded thread priorities by symbols.

Change-Id: I113c07af95f8808b889b665e884b6b41d3440f8d
2011-06-01 18:03:21 -07:00
Jeff Sharkey
287bd83f9e Snapshot PID/UID when enqueuing events.
Since ProcessRecord can change before event is processed, snapshot
PID/UID values when enqueuing.

Change-Id: I281e63310c8fc6c3761ae00e80e06654b18b3e17
2011-06-01 17:56:23 -07:00
Jeff Sharkey
d840b66556 Merge "Collect historical network stats." 2011-06-01 17:54:37 -07:00
Adam Powell
dfb25e2091 Merge "Implement bug 4500971 - Collapsable action views" 2011-06-01 17:50:13 -07:00
Adam Powell
8d02deabac Implement bug 4500971 - Collapsable action views
Action views may now be flagged as 'collapsable'. This means that the
action menu will always show them in the collapsed state by
default. When selected, the action view will "take over" the
navigation/view side of an action bar until dismissed via the home/up
button.

This feature allows for more long-term exclusive modes akin to
ActionModes but less intrusive. The action menu itself remains
unaffected. Collapsable action views are ideal for things such as
search or categories of tool palettes.

Change-Id: Ibafce5631befbfe67c5d834c2e2617d3d7f6da7a
2011-06-01 17:48:04 -07:00
Jeff Sharkey
7527990420 Collect historical network stats.
Periodically records delta network traffic into historical buckets to
support other services, such NetworkPolicyManager and Settings UI.

Introduces NetworkStatsHistory structure which contains sparse, uniform
buckets of data usage defined by timestamps.  Service periodically
polls NetworkStats and records changes into buckets.  It only persists
to disk when substantial changes have occured.  Current parameters
create 4 buckets each day, and persist for 90 days, resulting in about
8kB of data per network.

Only records stats for "well known" network interfaces that have been
claimed by Telephony or Wi-Fi subsystems.  Historical stats are also
keyed off identity (such as IMSI) to support SIM swapping.

Change-Id: Ia27d1289556a2bf9545fbc4f3b789425a01be53a
2011-06-01 17:44:52 -07:00
Fabrice Di Meglio
77c1cc0aa4 Merge "Fix bug #4509967 (layout_gravity not always respected)" 2011-06-01 17:40:11 -07:00
Daniel Lehmann
df357caf31 Merge "Enable strict mode as a public api to catch sql injections" 2011-06-01 17:30:50 -07:00
Jeff Sharkey
9599cc5f21 Tests for NetworkPolicyManager rule generation.
Verifies that policy changes trigger rule updates that respect current
foregroundActivities status.  Also verifies logic that promotes a UID
based on its most-foreground PID.  Verifies that policy changes result
in immediate rule changes.

Also verifies that BACKGROUND_DATA_SETTING_CHANGED broadcasts are sent
by policy changes.

Change-Id: I4fd0dad9e1dbccee2c5968244bb1814e6cb2c6e1
2011-06-01 17:26:30 -07:00
Jeff Sharkey
1b861278a2 Teach NetworkPolicyManager how to dumpsys itself.
Includes details on all internally known UIDs, which can be used for
debugging purposes.

Change-Id: I340d25212e3c7a76a57de0a94ffeea34b6748941
2011-06-01 17:21:17 -07:00
Jeff Sharkey
751fb11082 Merge "Policy and rules work for ConnectivityManager." 2011-06-01 17:18:15 -07:00
Yu Shan Emily Lau
8900fa6504 Merge "Convert the video editor performance test suite output from float to int." 2011-06-01 17:13:30 -07:00
Jeff Sharkey
c006f1aec1 Policy and rules work for ConnectivityManager.
Teach ConnectivityManager about UID-specific rules derived from policy,
such as rejecting network traffic on "paid" interfaces.  Calls that
return NetworkInfo now filter based on any REJECT rules in effect for
the calling UID.  (Added uid parameter if callers that still want all
interfaces.)

Changed NetworkPolicyManager to derive rules based on current policy
combined with PowerManager and ActivityManager status, which it passes
to ConnectivityService for eventual enforcement through netd.  When
rules change the usability of a NetworkInfo for a specific UID, it also
dispatches CONNECTIVITY_ACTION broadcasts to that UID.  Combined paid
and background policy together to match current working definition.

Change-Id: I797ea49439fcc487cfe2cbc16703d4b91ceb9af6
2011-06-01 17:00:42 -07:00
Christopher Tate
9e08ff3737 Merge "Filter backup/restore confirmation buttons when obscured" 2011-06-01 16:55:31 -07:00
Glenn Kasten
993fccec5b Remove unnecessary level of priority indirection
Change-Id: I942d43973c20a7ace8b0d3f78b4da97e45e996c6
2011-06-01 16:46:29 -07:00
Fabrice Di Meglio
de35ceeeb9 Fix bug #4509967 (layout_gravity not always respected)
- fix FrameLayout
- code refactoring on LinearLayout
- add more unit tests

Change-Id: I49302582c61aa31a4eb7eded92327b10408f71a4
2011-06-01 16:46:25 -07:00
Christopher Tate
e42a6058d4 Filter backup/restore confirmation buttons when obscured
I.e. don't let people fake the user out by putting some other UI over
the top of it in order to phish for a confirmation.

Addresses bug 4521629

Change-Id: I40ae057ebedeb92ed264fb52fa1c7c297c9d3ec2
2011-06-01 16:43:45 -07:00
Yu Shan Emily Lau
fa22e62589 Convert the video editor performance
test suite output from float to int.

Change-Id: I62fada18a4c34d06b8d0ed91885e5bd98f12523f
2011-06-01 16:33:35 -07:00
Brett Chabot
50e51b81b1 Merge "Move bluetooth tests to their own package." 2011-06-01 16:08:20 -07:00
Brett Chabot
b525f089cf Move bluetooth tests to their own package.
Bug 4501764

Change-Id: Id65de5d96516720e75dfbb5d522f465187e73913
2011-06-01 16:04:30 -07:00
Andy Stadler
ca680af21b Merge "Use unchecked admin lookup for getStorageEncryption()" 2011-06-01 15:59:58 -07:00
Teng-Hui Zhu
b145112eff Merge "Correctly detect when switching back from full screen" 2011-06-01 15:53:18 -07:00
Brian Carlstrom
aef1987f4e Merge "Restore ResponseCodes for use with getLastError" 2011-06-01 15:31:46 -07:00
Andy Stadler
c994d693b6 Use unchecked admin lookup for getStorageEncryption()
Due to a copy/paste typo, getStorageEncryption() was protected by
getActiveAdminForCallerLocked(), which made the API unreadable if the
caller is not an admin.  This doesn't match the rest of the DPM API which
allows the "get" calls to be made anonymously.

This fix supercedes the proposed workaround CL in the DPM ApiDemo sample.

Change-Id: If1a6237634e97ced09a7c6a8876bb6b0f60c9be9
2011-06-01 15:30:54 -07:00
Brian Carlstrom
7e4b1a488d Restore ResponseCodes for use with getLastError
Change-Id: I41b5bc9cbb6c05672c92d5864e889fd2b0186141
2011-06-01 15:29:29 -07:00
Daniel Lehmann
50b1f8d3fc Enable strict mode as a public api to catch sql injections
Bug: 4368912
Change-Id: Ia4919f58cc5264da8758d6cd61d93e031676b74a
2011-06-01 15:24:23 -07:00
Glenn Kasten
54f40eb222 Merge "Revert "Use AudioTrack::event_type not int in callback"" 2011-06-01 15:22:49 -07:00
Glenn Kasten
e46a86fcb6 Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 2225e4b704
2011-06-01 15:20:35 -07:00
Fabrice Di Meglio
c78416fdce Merge "Fix View default horizontal direction" 2011-06-01 15:16:41 -07:00
Christopher Tate
1a536e642f Merge "Restore from a previous full backup's tarfile" 2011-06-01 15:14:36 -07:00