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

45548 Commits

Author SHA1 Message Date
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
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
The Android Open Source Project
dbccd44a63 Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD 
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
 2013-11-22 11:18:57 -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
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
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
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
Svetoslav Ganov
dbab7e1794 am 4ed5f502: am 4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev 
* commit '4ed5f502a748fc351025346b04d50a5fae2a3bef':
  Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
 2013-11-21 12:19:02 -08:00
Svetoslav Ganov
b95d6f549b am c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev 
* commit 'c6db9c3b371ed8a90fa064f0487440d8a1d8bd46':
  Revert "PreferenceFragment showing the breadcrumb when not needed."
 2013-11-21 12:15:22 -08:00
Svetoslav Ganov
4ed5f502a7 am 4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev 
* commit '4d159661f453fa5d04698033f4bf6256f0d3c16a':
  Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
 2013-11-21 12:15:19 -08:00
Svetoslav Ganov
c6db9c3b37 Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev 2013-11-21 20:12:13 +00:00
Svetoslav Ganov
4d159661f4 Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev 2013-11-21 20:12:02 +00:00
Dirk Dougherty
3eddb6213d am a40420c9: am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit 'a40420c9c1c8216fd0251dc550bb22e9cc1dd177':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 11:53:27 -08:00
Dirk Dougherty
a40420c9c1 am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit '43eea0a640db07c4da05146f7e68eae567592bdb':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 19:49:46 +00:00
Svetoslav Ganov
8fc552e695 Revert "PreferenceFragment showing the breadcrumb when not needed." 
This reverts commit 7db97b0a29c613afb78c2734bf2504324a71963d.

Change-Id: Iefe9807fd75baf04e61ec59b508e438320c80fe3
 2013-11-21 19:36:22 +00:00
Svetoslav Ganov
68e7f13e22 Revert "PreferencesFragment showing the breadcrumb area in single pane mode." 
This reverts commit 2b8795a9db2d494c38d34fd113a9153880a555c0.

Change-Id: If8dcc7190cbe66af09945d8b23a3e1d8fd791b1d
 2013-11-21 19:33:53 +00:00
Geoff Mendal
35f097a7bf Import translations. DO NOT MERGE 
Change-Id: I9cb0b85bb832e20fadbeb464485d0f0dc1e8b762
Auto-generated-cl: translation import
 2013-11-21 10:42:03 -08:00
Dirk Dougherty
491b40d752 Doc change: Change description for BRAND. 
Bug:11431921

Change-Id: Id08bb58a52699942e0cf626aeb577ac05c84c575
 2013-11-21 09:31:40 -08:00
Jeff Brown
f508c2b0fb am d2a0192b: am b40ce4b8: Make action bar media router icons blue again. 
* commit 'd2a0192bf237994f0132625fc00d21896912151e':
  Make action bar media router icons blue again.
 2013-11-20 16:51:07 -08:00
Jeff Brown
d2a0192bf2 am b40ce4b8: Make action bar media router icons blue again. 
* commit 'b40ce4b8e85b44c8dc190bdfac0106402102280b':
  Make action bar media router icons blue again.
 2013-11-20 16:48:52 -08:00
Jeff Brown
b40ce4b8e8 Make action bar media router icons blue again. 
This partially reverts commit e7ae644522f692c204d0233f91e77c7841bdfe53.

Bug: 11790271
Change-Id: Ib83dbede4472ba08bcf79bf9009d690278841723
 2013-11-20 15:27:43 -08:00
Baligh Uddin
853251e74f Import translations. DO NOT MERGE 
Change-Id: I0e8d6e841629716aecaea4bc1f326c1c2cba95c4
Auto-generated-cl: translation import
 2013-11-20 09:17:20 -08:00
Christopher Tate
c8ea38fe18 am e3705342: am b0183f0a: Harden against transiently unavailable backup transports 
* commit 'e3705342671d08b5cd94a0d69ef8099a2c3211f8':
  Harden against transiently unavailable backup transports
 2013-11-19 11:48:50 -08:00
Christopher Tate
e370534267 am b0183f0a: Harden against transiently unavailable backup transports 
* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
  Harden against transiently unavailable backup transports
 2013-11-19 11:46:48 -08:00
Christopher Tate
b0183f0ae3 Harden against transiently unavailable backup transports 
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Now with 100% less build break.

Bug 11716868

Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d
 2013-11-19 11:24:46 -08:00
Sascha Prueter
a9249322d5 am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev 
* commit 'c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4':
  Trying to unbreak build...
 2013-11-18 23:31:11 -08:00
Sascha Prueter
c7f7d1bf18 am f7044fec: Merge "Trying to unbreak build..." into klp-dev 
* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
  Trying to unbreak build...
 2013-11-18 23:27:07 -08:00
Sascha Prueter
d5965cb506 Trying to unbreak build... 
Revert "Harden against transiently unavailable backup transports"

This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69.

Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a
 2013-11-19 06:51:21 +00:00
Christopher Tate
fa331b1dfb am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev 
* commit '1e964ed808798a56664853e2aeffdc47c676ac5a':
  Harden against transiently unavailable backup transports
 2013-11-18 18:48:29 -08:00
Christopher Tate
1e964ed808 am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev 
* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
  Harden against transiently unavailable backup transports
 2013-11-18 18:44:47 -08:00
Christopher Tate
8f98252afe Harden against transiently unavailable backup transports 
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Bug 11716868

Change-Id: I4860fe3d4e99618b2cd194c83162bd7cbd5a83a9
 2013-11-18 16:12:38 -08:00
Baligh Uddin
2337eb1b65 Import translations. DO NOT MERGE 
Change-Id: Ia6d256fedf7e3d888942d66397f5842d46658c0f
Auto-generated-cl: translation import
 2013-11-18 08:49:48 -08:00
Wink Saville
044bc25fb5 am 67979256: am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '67979256865f63330a1352e450e26baf24e914ec':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:42:55 -08:00
Wink Saville
6797925686 am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '31cab2f803951edb13ea07e7e34916189fec5167':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:39:16 -08:00
Wink Saville
31cab2f803 Merge "Add config_restartRadioAfterProvisioning" into klp-dev 2013-11-15 19:35:05 +00:00
Wink Saville
9124d56acc Add config_restartRadioAfterProvisioning 
Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae
 2013-11-15 08:27:53 -08:00
Jeff Brown
2ea480cac8 am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev 
* commit '5d0b18cddfcb933d7960c5a6a820045d77a0285c':
  Disallow applications from initiating cast screen.
 2013-11-15 00:39:57 -08:00
Jeff Brown
5d0b18cddf am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev 
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
  Disallow applications from initiating cast screen.
 2013-11-15 00:38:09 -08:00
Jeff Brown
3de885bef2 Merge "Disallow applications from initiating cast screen." into klp-dev 2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2 Disallow applications from initiating cast screen. 
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.

As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.

Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
 2013-11-15 00:29:43 -08:00
Jianzheng Zhou
a363a10ca2 fix ethernet and wifi can't be tuned seperately issue 
ethernet especially Gigabit enet use the same tune data with wifi
won't reach best performance.

Change-Id: Iac50ba47904c76ff7b5b8ad226e83451359ec534
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2013-11-15 13:32:23 +08:00
Mindy Pereira
bb8e75e6c4 am cce2e194: am 5823352c: Cancel double tap mode on action_up 
* commit 'cce2e1944c4ac9411fa25534eb9b51d6f044dfb4':
  Cancel double tap mode on action_up
 2013-11-14 19:48:42 -08:00
Mindy Pereira
cce2e1944c am 5823352c: Cancel double tap mode on action_up 
* commit '5823352c6c5bfa3824afacd023b01af537b5dfa0':
  Cancel double tap mode on action_up
 2013-11-14 19:44:52 -08:00
Mindy Pereira
5823352c6c Cancel double tap mode on action_up 
fixes b/11592408 Dragging immediately after double touch turns gesture into double touch drag

Change-Id: I3e7926a4f6f9ab4951f380bd004499c78b3bda69
 2013-11-15 02:48:06 +00:00