drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,499 Commits 1 Branch 0 Tags
Commit Graph

120499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
125d133bcc Fix bad @see links in Intent.java. 
Change-Id: Ifa283214798f8d2de4f8bdb17ed78609a7d43293
 2013-11-25 11:58:37 -05:00
Lorenzo Colitti
5ae4a531cc Pass DNS server info notifications to observers. 
These are sent if the device receives IPv6 Router Advertisements
with DNS server configuration options. Currently, nothing listens
to them; in a future change we will use them as IPv6 DNS servers.

[Cherry-pick of 416740ad4d9132005a71dc0883334e852235a18a]

Bug: 9180552
Change-Id: I05000c0cd3867a68ab390102e8470b6912a9d3aa
 2013-11-25 17:27:17 +09: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
Glenn Kasten
a4b06fd111 Fix typo nbChannels -> channelMask 
Formal parameter name in native_setup was wrong.

Change-Id: Ie76c6e0aca83c6a01f2581d988e32da730b7e427
 2013-11-22 13:49:09 -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
Robert Greenwalt
15b3efc962 am ecfae4f8: am a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue" 
* commit 'ecfae4f899873f224e1aeed076dc8a41f8884487':
  fix ethernet and wifi can't be tuned seperately issue
 2013-11-21 18:44:12 -08:00
Craig Mautner
67ed39bbdb am 90192a61: am 0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()" 
* commit '90192a6165f37207fa8ceb15c07aa9582327c294':
  Make SurfaceView layers captured by screenshotApplications()
 2013-11-21 18:43:43 -08:00
Dirk Dougherty
5c678cedb5 Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration. 
Change-Id: If59372a92f0572d54af0f2ed7f9f9e401fbce067
 2013-11-21 18:39:57 -08:00
Robert Greenwalt
ecfae4f899 am a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue" 
* commit 'a4c8fabfbb0bf5bf9da5267c13230c5169b5943d':
  fix ethernet and wifi can't be tuned seperately issue
 2013-11-21 18:02:00 -08:00
Robert Greenwalt
a4c8fabfbb Merge "fix ethernet and wifi can't be tuned seperately issue" 2013-11-22 01:57:05 +00:00
Lorenzo Colitti
ec9830e769 Merge "Pass DNS server info notifications to observers." 2013-11-22 01:27:15 +00:00
Nick Kralevich
64dea2c380 Merge "Add OEM specific addresses" 2013-11-21 23:45:29 +00:00
Newton Allen
7e7ea28d40 am 1f57ad47: am 27bd4440: am 28029658: Fix javadoc typo in SparseArray. 
* commit '1f57ad47b5a0000b47c24f29332b1128d7c6f74f':
  Fix javadoc typo in SparseArray.
 2013-11-21 15:36:45 -08:00
Newton Allen
1f57ad47b5 am 27bd4440: am 28029658: Fix javadoc typo in SparseArray. 
* commit '27bd44401e48b5b676a1ce5e4940aff3200fb536':
  Fix javadoc typo in SparseArray.
 2013-11-21 15:32:42 -08:00
Newton Allen
27bd44401e am 28029658: Fix javadoc typo in SparseArray. 
* commit '2802965888566244d8642ba32775b7b2a3cec655':
  Fix javadoc typo in SparseArray.
 2013-11-21 23:28:28 +00:00
Newton Allen
2802965888 Fix javadoc typo in SparseArray. 
Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35
(cherry picked from commit ebb47950f21d3c41955a591000dfb1f195e746fe)
 2013-11-21 23:12:32 +00:00
Dianne Hackborn
139156f40a am 3d004830: am 2c082ae3: am 90e9b1d3: Fix issue #11790471: Crash removed home buttons and notification bar/shade 
* commit '3d0048304590a61cf32902440a3fcc27d0281f89':
  Fix issue #11790471: Crash removed home buttons and notification bar/shade
 2013-11-21 14:16:52 -08:00
Dianne Hackborn
3d00483045 am 2c082ae3: am 90e9b1d3: Fix issue #11790471: Crash removed home buttons and notification bar/shade 
* commit '2c082ae3d209aa590c1839d75436f7aa77b37125':
  Fix issue #11790471: Crash removed home buttons and notification bar/shade
 2013-11-21 14:14:12 -08:00
Dianne Hackborn
2c082ae3d2 am 90e9b1d3: Fix issue #11790471: Crash removed home buttons and notification bar/shade 
* commit '90e9b1d3dc15e97bb7ecb88289c3707fe03fb1a6':
  Fix issue #11790471: Crash removed home buttons and notification bar/shade
 2013-11-21 14:08:00 -08:00
Newton Allen
ebb47950f2 Fix javadoc typo in SparseArray. 
Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35
 2013-11-21 13:43:01 -08:00
Dianne Hackborn
90e9b1d3dc Fix issue #11790471: Crash removed home buttons and notification bar/shade 
Whoops persistent processes are, well, persistent.  Don't remove
services from them.  We'll be keeping that process record around.

Change-Id: I29e9fb6f704efdf0caad5e0307a7adbb416eed3b
 2013-11-21 12:56:03 -08:00
Svetoslav Ganov
f7d720e6b0 am 4f23b610: am b95d6f54: am c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev 
* commit '4f23b6104e11be81f3e2ca1a1031de6ca112f50a':
  Revert "PreferenceFragment showing the breadcrumb when not needed."
 2013-11-21 12:22:59 -08:00
Svetoslav Ganov
45dbd75290 am dbab7e17: am 4ed5f502: am 4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev 
* commit 'dbab7e1794f91e3dc4b0617df6fb59183c7349e5':
  Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
 2013-11-21 12:22:55 -08:00
Svetoslav Ganov
4f23b6104e am b95d6f54: am c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev 
* commit 'b95d6f549b0f8260873fd9c2662fa3bf7ee2b1e8':
  Revert "PreferenceFragment showing the breadcrumb when not needed."
 2013-11-21 12:19:05 -08:00