109079 Commits

Author SHA1 Message Date
Romain Guy
a7691a47fe Merge "Trace list view items management" 2013-07-11 18:19:24 +00:00
Jeff Sharkey
1f99a483e4 Recover from corrupt network stats.
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.

Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
2013-07-11 11:18:53 -07:00
Robert Greenwalt
6433ef2900 Block Wifi P2p discovery while doing dhcp.
bug:9531609
bug:9302399
Change-Id: Ie4b7c3a75245a0e7cc09fa89ddb1187d349779a1
2013-07-11 11:10:08 -07:00
The Android Open Source Project
6b0693a318 am 8f4e09d2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '8f4e09d2a8213d64edacc081879aaadd56b961bc':
2013-07-11 10:17:23 -07:00
Elliott Hughes
8964b3bb3d am f445a685: am 0b18c149: am 0f50cb31: Merge "Fix build."
* commit 'f445a6856777cdcbec14342c2a3510b26ea7b675':
  Fix build.
2013-07-11 10:17:12 -07:00
The Android Open Source Project
180535015d am f51538f4: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'f51538f444ca9448d194cf184af4fd8f0554d723':
  Revert "Stop marking gamepads as keyboards"
  Revert "Temporarily disable 'Scan Always' mode"
2013-07-11 10:17:04 -07:00
Elliott Hughes
a7ac8be1f5 am dff4ec87: am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master
* commit 'dff4ec87e7b942b7b4410f639fc74c2cffb386d6':
  Track libcore API change.
2013-07-11 10:16:46 -07:00
Jean-Baptiste Queru
11396cfd6f am 4d380d71: am fb231fea: am 425729f9: Merge "Empty commit"
* commit '4d380d71e06781314b052ea71ef20ed6511e560f':
  Empty commit
2013-07-11 10:16:36 -07:00
Elliott Hughes
c5de9c3509 Merge "Track libcore API update." 2013-07-11 17:10:19 +00:00
Scott Main
792dd4c0e4 am df541931: am c4570b32: am 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev
* commit 'df541931f989d0421c38bea6bca7065bd7d4a292':
  update url for backup service key bug: 8834302
2013-07-11 10:08:20 -07:00
Dirk Dougherty
3f96f70f9a am 5fc1e8a3: am ec47cc77: am 0f97f351: am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev
* commit '5fc1e8a33d816036a56abcee8eaefaeef2ea24e4':
  docs: add link to developer survey on main landing pages
2013-07-11 10:08:17 -07:00
Elliott Hughes
9444fcae54 Track libcore API update.
Change-Id: I7ad4ee87008c2ba0f8f16d1c86d81b8114359e04
2013-07-11 10:06:35 -07:00
Marco Nelissen
f2ca6e2717 Add stopservice command to am
Change-Id: I639ad418750c0e1825b330b3bd56e5628926e7f1
2013-07-11 09:32:30 -07:00
Satoshi Kataoka
713412fd54 am 7e0fad1d: am 8b95d259: am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev
* commit '7e0fad1d442428b9a2ba5d88ce7f8a59869acb0e':
  Revert "Stop marking gamepads as keyboards"
2013-07-11 08:08:18 -07:00
Joe Malin
471fb03d46 am fc13329b: am 216e340b: am ea4193ef: am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training
* commit 'fc13329b8430a62c02f7109e1b7cf0abcaa896ee':
  Doc Bug: b9739899 Bugs in Sync Adapters training
2013-07-11 08:08:14 -07:00
The Android Open Source Project
c6f681d131 am b2bc3331: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'b2bc33315824ee880b319a2eb69018dc44d1026e':
2013-07-11 08:08:06 -07:00
John Spurlock
f56bef147d Resolve car dock home activities properly.
Look up the actual user id (package manager does not understand
UserHandle.USER_CURRENT) and return metadata during resolution
for subsequent checking.

Bug: 9738229
Change-Id: Ib060bacc84473b27a1fb2e717651dc84f018d6f9
2013-07-11 11:00:26 -04:00
Ben Murdoch
e3f9071e0d Plumb View.getAccessibilityNodeProvider though WebViewProvider.
This is needed to make use of the new Accessibility implementation
in the Chromium WebView. nos for WebView Classic.

Change-Id: I96bd2426d2de3b26dc9b72d0fdbacefa9bbe20f7
2013-07-11 14:41:46 +01:00
Lorenzo Colitti
41fb98c868 Make legacy VPN work over stacked interfaces.
On stacked interfaces like 464xlat, Legacy VPN can't find the
default gateway because it uses getRoutes, which only returns
routes for the base link and not for the stacked links. It also
assumes that the interface that the default route points to is
the interface for the base link (e.g., rmnet0) instead of the
interface the route actually points to (e.g., clat4).

Fix this by calling getAllRoutes to find the default IPv4 route,
and get the interface name from the route we find instead of
assuming it's the base interface.

Bug: 9597516
Change-Id: Ia6ce0b6258a421cd22f60dedca7e94176b32176b
2013-07-11 18:15:48 +09:00
Wink Saville
8cf3560469 VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
2013-07-10 23:00:07 -07:00
Dianne Hackborn
9865ef1ba5 Merge "Add -c option to meminfo to dump a compact form." 2013-07-11 02:03:33 +00:00
Dianne Hackborn
20cdcee47d Add -c option to meminfo to dump a compact form.
Also fix a bug in FastPrintWriter where println(long) was
not printing the newline.

Change-Id: Idcb4eaab0c1ec4b992032b5e36478ef11a6533d9
2013-07-10 18:47:04 -07:00
Baligh Uddin
cbc9afdcd5 Import translations. DO NOT MERGE
Change-Id: I3560b16b347b71c61ad1f723d444dbd056ee0d8f
Auto-generated-cl: translation import
2013-07-10 18:41:54 -07:00
Dirk Dougherty
8f1a759727 Doc change: Update gcore reference docs.
Change-Id: I9064969741598663ba7a732054ee378d3a14da7e
2013-07-10 18:38:36 -07:00
Baligh Uddin
634c1cc6f8 Import translations. DO NOT MERGE
Change-Id: Ie5e451abf345a2dea6e4f970b24166f1ba7e205d
Auto-generated-cl: translation import
2013-07-10 18:24:25 -07:00
Baligh Uddin
08f8a810d9 Import translations. DO NOT MERGE
Change-Id: I3f2d4b1f5d1ca4bb1f3c0e04757a627ad52ae365
Auto-generated-cl: translation import
2013-07-10 18:08:48 -07:00
Romain Guy
5fade8c69a Trace list view items management
Change-Id: If43ce115679c2bcacad26d6f59e3bfb655abff6e
2013-07-10 16:40:30 -07:00
Amith Yamasani
4befbecfcc Pass along the user id to AttributeCache requests
Bug: 9759331
Change-Id: Ib96ba6a89c58edc207021aa43a2b67b4f6c50117
2013-07-10 16:18:01 -07:00
Craig Mautner
fb20eb48aa Merge "Add convertToTranslucent to API." 2013-07-10 21:52:28 +00:00
Glenn Kasten
9b53db378a AudioTrack write() on a full buffer while paused returns 0
Change-Id: I85d44452cd8a5f87c7fc9b6a0858569cb5293eb4
2013-07-10 14:13:39 -07:00
Glenn Kasten
f7e0a370e7 Return correct status for android.media.AudioTrack.write(short[]...)
Bug: 9776374
Change-Id: If43c63a4ceeb8fef98708f0d42496d2fb90a21fd
2013-07-10 14:03:03 -07:00
Chet Haase
47e36c3cfe Merge "Fix minor transition bugs" 2013-07-10 20:00:15 +00:00
Kenny Root
3b4d69508a Merge "KeySetManager: convert comments to Javadoc" 2013-07-10 19:35:49 +00:00
Chet Haase
dc57d9dda5 Fix minor transition bugs
TransitionGroup.setDuration() was not propagating the new duration to
future child transitions correctly.

Also, Fade should restore a fully-opaque value when a transition ends, to prevent
the problem of mid-stream canceled transitions causing vie3ws to get stuck with partially
faded-in alpha values.

Issue #9755995 Transitions: TransitionGroup.setDuration() not handled correctly
Issue #9756655 Transitions: handle fading cancelation better

Change-Id: Id44569c6f4152a26ee382d04c30a2f035a1ebcf3
2013-07-10 12:14:54 -07:00
Adam Powell
0d21c220dd Merge "Fix ListMenuItemView regression from patch 8933efd49" 2013-07-10 19:07:15 +00:00
Chris Craik
a582d06486 Merge "Remove NearestImageView from CanvasCompare" 2013-07-10 19:06:41 +00:00
Adam Powell
c39451267b Fix ListMenuItemView regression from patch 8933efd49
Passing 'true' as the third parameter of LayoutInflater#inflate does
cause it to add the inflated view to the parent in a single step, but
it also changes the return value to be the root of the resulting
hierarchy after the add rather than the root of the inflated layout.

Return to adding the view to its parent as a separate step.

Bug 9754101

Change-Id: I7ca4c921993594931f5007af69d45e9ff06065df
2013-07-10 11:51:33 -07:00
Dianne Hackborn
8ce24f2a68 Merge "Add new location monitoring op, make some of app ops public." 2013-07-10 18:45:34 +00:00
Chet Haase
3b5f59dbb7 Merge "Remove unnecessary drawable code in CompoundButton" 2013-07-10 18:32:16 +00:00
Andy McFadden
e68720ee15 Merge "Minor fixes to android.graphics.Matrix" 2013-07-10 16:44:40 +00:00
The Android Open Source Project
8f4e09d2a8 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I933252f3cee48c449df3ea2493e16d8652723ffc
2013-07-10 08:34:50 -07:00
Chet Haase
7df754e712 Remove unnecessary drawable code in CompoundButton
Some of the code in setButtonDrawable() was unnecessary, resetting
the button drawable state and then refreshing it. This caused many redundant
calls, which can add up, especially during inflation.

Change-Id: I873cf5eef697b5435a1b827cd68e5d836ee25124
2013-07-10 07:46:24 -07:00
The Android Automerger
d1d1a6d068 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-10 05:55:25 -07:00
Chris Craik
a2d519e03b Remove NearestImageView from CanvasCompare
Change-Id: I69b0539df704d80a34cc8f22096657210f5d78ad
2013-07-09 19:22:37 -07:00
Romain Guy
68389dee4e Merge "Unregister gralloc buffer immediately Bug #9406765" 2013-07-10 02:00:22 +00:00
Romain Guy
b2ed04a689 Unregister gralloc buffer immediately
Bug #9406765

Waiting for a GC to finalize the GraphicBuffer could cause ordering
issues

Change-Id: I7035a9eef52a6c3b44ab28f40a7b1fbdc83d2e20
2013-07-09 18:56:57 -07:00
Dianne Hackborn
1304f4ae32 Add new location monitoring op, make some of app ops public.
The new location monitoring op is to tell us when an application
is monitoring for any location changes.  It may be useful information
in addition to the more explicitly information about when location
data actually goes to the app.

Also make parts of AppOpsManager public for use by gcore.  It is
not available to third party apps.

Change-Id: Ib639f704258ffdd7f3acd7567350ed2539da628a
2013-07-09 18:17:27 -07:00
Elliott Hughes
f445a68567 am 0b18c149: am 0f50cb31: Merge "Fix build."
* commit '0b18c14931c4ca618c67b5ac5c8351246879e90a':
  Fix build.
2013-07-09 17:53:32 -07:00
Elliott Hughes
0b18c14931 am 0f50cb31: Merge "Fix build."
* commit '0f50cb31980c8354a4516094863c4ad0cdd0d03b':
  Fix build.
2013-07-09 17:51:34 -07:00
Elliott Hughes
0f50cb3198 Merge "Fix build." 2013-07-10 00:48:53 +00:00