Lorenzo Colitti
ab20cfd916
am 6747ea1b: am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent."
...
* commit '6747ea1b1cdf796710c01317da204f50d5721755':
Minor cleanups to NetdCallbackReceiver.onEvent.
2013-11-26 08:48:30 -08:00
Lorenzo Colitti
60bff9112d
am aeefa69a: (-s ours) am 8a234809: Merge "Use BaseNetworkObserver in Tethering."
...
* commit 'aeefa69a882eb1068da3a45cec82e50971c45df2':
Use BaseNetworkObserver in Tethering.
2013-11-26 08:48:27 -08:00
Lorenzo Colitti
6747ea1b1c
am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent."
...
* commit 'eede7e89c94b3bb56c26aec137c53d592d3bc7c3':
Minor cleanups to NetdCallbackReceiver.onEvent.
2013-11-26 08:38:45 -08:00
Lorenzo Colitti
aeefa69a88
am 8a234809: Merge "Use BaseNetworkObserver in Tethering."
...
* commit '8a234809e47106e445a4ddf2c70b9cd50d4c9348':
Use BaseNetworkObserver in Tethering.
2013-11-26 08:38:40 -08:00
Lorenzo Colitti
eede7e89c9
Merge "Minor cleanups to NetdCallbackReceiver.onEvent."
2013-11-26 01:02:31 +00:00
Lorenzo Colitti
8a234809e4
Merge "Use BaseNetworkObserver in Tethering."
2013-11-26 01:02:14 +00:00
John Spurlock
27e72fc031
am 5cd1a87a: am e18b673a: am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs
...
* commit '5cd1a87a5c94e707f2cbe7d4751fdfeadd7ebbf0':
Fix @see link in DocumentsContract docs.
2013-11-25 15:39:55 -08:00
John Spurlock
5cd1a87a5c
am e18b673a: am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs
...
* commit 'e18b673a4dc8955dd0ecd53c57bb3f478614a92a':
Fix @see link in DocumentsContract docs.
2013-11-25 15:34:34 -08:00
John Spurlock
e18b673a4d
am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs
...
* commit '330dfa7d11c542aa99aa277f75113bfc916d72dd':
Fix @see link in DocumentsContract docs.
2013-11-25 23:29:29 +00:00
John Spurlock
330dfa7d11
Merge "Fix @see link in DocumentsContract docs." into klp-docs
2013-11-25 23:25:36 +00:00
John Spurlock
4e55a7e8c5
Fix @see link in DocumentsContract docs.
...
DocumentsContract#createDocument is hidden.
Change-Id: Iae9c4bcd8620c5297d1fc4e2324a8a242ab4b31a
2013-11-25 18:00:07 -05:00
John Spurlock
cce137733b
am e4f96e28: am 56979b22: am 125d133b: Fix bad @see links in Intent.java.
...
* commit 'e4f96e281f85078d5420fdc52e00da3c6392ba1a':
Fix bad @see links in Intent.java.
2013-11-25 10:45:43 -08:00
Geoff Mendal
8122b192b1
am 926d0c41: (-s ours) am 3b6fa618: (-s ours) am 7a4adedf: (-s ours) Import translations. DO NOT MERGE
...
* commit '926d0c4138e09ef70a9e547be4e360962d839733':
Import translations. DO NOT MERGE
2013-11-25 10:45:40 -08:00
John Spurlock
e4f96e281f
am 56979b22: am 125d133b: Fix bad @see links in Intent.java.
...
* commit '56979b22346e186ebd804c4d7e05e0c74741f384':
Fix bad @see links in Intent.java.
2013-11-25 10:41:24 -08:00
Geoff Mendal
926d0c4138
am 3b6fa618: (-s ours) am 7a4adedf: (-s ours) Import translations. DO NOT MERGE
...
* commit '3b6fa618ce8a1f14bb3949ce8c7be3417fb8568a':
Import translations. DO NOT MERGE
2013-11-25 10:41:21 -08:00
John Spurlock
56979b2234
am 125d133b: Fix bad @see links in Intent.java.
...
* commit '125d133bcce56403a9b4d1cdbbc61a7cb1d7f8e1':
Fix bad @see links in Intent.java.
2013-11-25 18:39:33 +00:00
Geoff Mendal
3b6fa618ce
am 7a4adedf: (-s ours) Import translations. DO NOT MERGE
...
* commit '7a4adedf0aa9560578a7cd4b5db8b18ea2f46c4d':
Import translations. DO NOT MERGE
2013-11-25 10:37:07 -08:00
Geoff Mendal
380604cf1f
Merge "Import translations. DO NOT MERGE"
2013-11-25 18:35:11 +00:00
Geoff Mendal
1ef2de5b31
Import translations. DO NOT MERGE
...
Change-Id: I3b3f9b9fa7fc41cac6e4978a23fd02b9ac67f3cb
Auto-generated-cl: translation import
2013-11-25 10:06:37 -08:00
Geoff Mendal
7a4adedf0a
Import translations. DO NOT MERGE
...
Change-Id: I7261755eab5c935124863a747fbd09732c6c5288
Auto-generated-cl: translation import
2013-11-25 09:42:45 -08:00
Dmitry Shmidt
c12ac98b28
Merge "wifi: Remove obsolete libwpa_client library"
2013-11-25 17:40:06 +00:00
John Spurlock
125d133bcc
Fix bad @see links in Intent.java.
...
Change-Id: Ifa283214798f8d2de4f8bdb17ed78609a7d43293
2013-11-25 11:58:37 -05:00
Lorenzo Colitti
a9626c1c95
Minor cleanups to NetdCallbackReceiver.onEvent.
...
- Clean up identical error messages.
- Fix the array length check for InterfaceAddressChange.
[Cherry-pick of 59be800e7fe81842aa8c77b91319f58ab165983d]
Bug: 9180552
Change-Id: Id871f481445b530c3ad749725f1548df0e3a1228
2013-11-25 17:25:45 +09:00
Lorenzo Colitti
132fe8d27d
Use BaseNetworkObserver in Tethering.
...
Tethering currently inherits from the AIDL interface
INetworkManagementEventObserver, so it has to provide no-op
implementations of all the interface's methods. Inherit from
BaseNetworkObserver and get rid of the no-ops.
[Cherry-pick of f4e90eac87bc31611ddd80c46fc924d35ce66c1c]
Bug: 9180552
Change-Id: I74859b0d77951005651aaaa418185857e40eeedb
2013-11-25 17:24:30 +09:00
Dirk Dougherty
2fbe13dc63
am 713e3853: am 0b492138: am 6000f1ed: Re-enable samples browser.
...
* commit '713e3853bf57410f389496c20db1fc3818b3d5d8':
Re-enable samples browser.
2013-11-23 12:34:06 -08:00
Dirk Dougherty
713e3853bf
am 0b492138: am 6000f1ed: Re-enable samples browser.
...
* commit '0b492138c744299e695b6aeee24eebb880de1c7d':
Re-enable samples browser.
2013-11-23 12:31:18 -08:00
Dirk Dougherty
0b492138c7
am 6000f1ed: Re-enable samples browser.
...
* commit '6000f1ed3d402e3136df173d987c901cc3cc1ff2':
Re-enable samples browser.
2013-11-23 20:28:04 +00:00
The Android Open Source Project
9318944dd1
am 57c33d0d: am dbccd44a: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD
...
* commit '57c33d0d71251d408cf771e5fa861fb1cdecf5f9':
2013-11-22 19:31:23 -08:00
The Android Open Source Project
57c33d0d71
am dbccd44a: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD
...
* commit 'dbccd44a638ae8705a5b14bff8b2dd74abc26045':
2013-11-22 17:40:32 -08:00
Dmitry Shmidt
e41451993e
wifi: Remove obsolete libwpa_client library
...
Change-Id: I222c60ec65375768dc62f9219d115b5b09a374f6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-11-22 16:28:32 -08:00
Chris Craik
b0fa90c9b4
Merge "Clean up quick rejection, especially surrounding points + lines."
2013-11-22 23:07:53 +00:00
Dirk Dougherty
6000f1ed3d
Re-enable samples browser.
...
Change-Id: I9d0c5966422ba0cf8bca576895f30679d40a19ab
2013-11-22 14:01:48 -08:00
Chris Craik
f0a590781b
Clean up quick rejection, especially surrounding points + lines.
...
bug:4351353
quickReject and quickRejectNoScissor have been renamed and refactored:
- to make the scissor side effect clear and explicit
- dangerous methods no longer public
- to make the simple quick reject check logic const
- simple quick reject is now conservative
This CL also fixes several issues with line and point quickRejection -
sub-pixel and hairline lines are much less likely to be incorrectly
rejected, especially at small canvas scale.
Additionally, alpha modulation for AA points < 1px in size is now
correct, dumplicating SW behavior (similar to lines and stroked
shapes work).
Change-Id: Ibb0710c721b9fb415d05acf54dd3d2b4d602156a
2013-11-22 11:36:12 -08:00
The Android Open Source Project
dbccd44a63
Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
...
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
2013-11-22 11:18:57 -08:00
Dirk Dougherty
59aa4be0ec
am a6703462: am a0501105: am 9eaa9443: Disable samples browsing temporarily.
...
* commit 'a6703462926408fa83f41a2cb319e4f51fa7d4ca':
Disable samples browsing temporarily.
2013-11-22 11:03:29 -08:00
Dirk Dougherty
a670346292
am a0501105: am 9eaa9443: Disable samples browsing temporarily.
...
* commit 'a0501105723ac742114ee07bd610ddf5e2713c82':
Disable samples browsing temporarily.
2013-11-22 10:59:52 -08:00
Dirk Dougherty
a050110572
am 9eaa9443: Disable samples browsing temporarily.
...
* commit '9eaa94439121f6cb03bff8ecf0acbcbc74442f2d':
Disable samples browsing temporarily.
2013-11-22 18:55:28 +00:00
Dirk Dougherty
9eaa944391
Disable samples browsing temporarily.
...
Change-Id: I65fe533f1b43903d6605d17691ec142d062b6b5e
2013-11-22 10:46:22 -08:00
Dirk Dougherty
39fa9b1119
am 3ee2c60e: am 8b5da356: am 1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs
...
* commit '3ee2c60e453e19b02b0ab52793045d2dd9a20912':
Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
2013-11-22 10:45:47 -08:00
Dirk Dougherty
3ee2c60e45
am 8b5da356: am 1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs
...
* commit '8b5da35670960586d5b41ee101026b89522ceb74':
Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
2013-11-22 10:42:11 -08:00
Dirk Dougherty
8b5da35670
am 1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs
...
* commit '1448d3cd81a685c68b0102e8303c0db4e6e5668f':
Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.
2013-11-22 18:38:20 +00:00
Dirk Dougherty
1448d3cd81
Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs
2013-11-22 18:36:03 +00:00
Nick Kralevich
21430bd763
fixup HTML
...
Change-Id: I99c31aae8e6e4e674a7c762a942a9cc82cf6e821
2013-11-22 10:22:45 -08:00
Nick Kralevich
84365cf51d
Add samsung to security contacts.
...
Change-Id: I7c4225083d4969109e37eac42f8d470daead3fb7
2013-11-22 10:16:20 -08:00
Jeff Brown
2ab3ec21c0
am 2458681b: am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed.
...
* commit '2458681b3ea4571d2f1254ef597475fe6a582907':
Stop wifi display discovery when no longer needed.
2013-11-21 23:00:23 -08:00
Robert Greenwalt
816fe75304
am 15b3efc9: am ecfae4f8: am a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue"
...
* commit '15b3efc9620662d83b66d75c663bb893ca0bc6e9':
fix ethernet and wifi can't be tuned seperately issue
2013-11-21 23:00:16 -08:00
Craig Mautner
f88b162d23
am 67ed39bb: am 90192a61: am 0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"
...
* commit '67ed39bbdb17a516508ceb31a414eeecb5623381':
Make SurfaceView layers captured by screenshotApplications()
2013-11-21 23:00:12 -08:00
Jeff Brown
2458681b3e
am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed.
...
* commit '263c431017c51fc51c85454a0f9cc7979001a3c1':
Stop wifi display discovery when no longer needed.
2013-11-21 19:47:30 -08:00
Jeff Brown
263c431017
am ce468a35: Stop wifi display discovery when no longer needed.
...
* commit 'ce468a35b388ca46578934706b38dbae94941643':
Stop wifi display discovery when no longer needed.
2013-11-21 19:43:00 -08:00
Jeff Brown
ce468a35b3
Stop wifi display discovery when no longer needed.
...
Keep track of how many clients are requesting scans and scan
continuously until all of them are gone then explicitly terminate the
scan instead of letting it time out as before.
Suspend wifi display scans while connecting or connected to a remote
display. This is handled by both the display manager and media router
since neither has complete information about what is happening.
Much of this code will no longer be needed once wifi display support
is integrated directly into the media router service.
Ensure that we don't attempt to scan or connect to wifi displays
while the wifi display feature is off.
Infer when a connection attempt fails and unselect the wifi display
route automatically so it doesn't appear to be connecting forever.
Fix issues around correctly canceling and retrying connection attempts.
Often we would cancel but not retry.
Improved connection reliability somewhat. It seems that discovery must
already be in progress in order for a connection attempt to succeed.
Ensure QuickSettings uses exactly the same logic as the MediaRouteButton
to determine when the remote display tile should be made visible.
Bug: 11717053
Change-Id: I18afc977b0e8c26204b8c96adaa79f05225f7b6e
2013-11-21 19:32:59 -08:00