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

36050 Commits

Author SHA1 Message Date
Alan Viverette
8af04d8b85 Merge "Fix LongArray.addAll() to use correct arraycopy argument order" 2013-12-02 21:20:07 +00:00
Katie McCormick
d786a1900e resolved conflicts for merge of 37e4c405 to master 
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
 2013-12-02 12:37:58 -08:00
Alan Viverette
db24d142f5 Fix LongArray.addAll() to use correct arraycopy argument order 
BUG: 11709513
Change-Id: I831e74ccb008739ab315c68618c04f870f9a36a5
 2013-11-27 17:38:24 -08:00
Alan Viverette
26606007be Merge "Fix header and footer dividers to match docs" 2013-11-26 22:40:42 +00:00
Katie McCormick
37e4c405a6 am 484b57a5: am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs 
* commit '484b57a5655f28967e0062f578f38535dff52323':
  Doc updates: Javadoc fixes
 2013-11-26 14:00:33 -08:00
Katie McCormick
484b57a565 am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs 
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
  Doc updates: Javadoc fixes
 2013-11-26 21:58:18 +00:00
Katie McCormick
f2ef28d840 Doc updates: Javadoc fixes 
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
 2013-11-26 13:52:48 -08:00
Lorenzo Colitti
c1c2378033 am 9d4ac970: Merge "Pass DNS server info notifications to observers." 
* commit '9d4ac9703657142b190d3c256de7c3329e5a4b29':
  Pass DNS server info notifications to observers.
 2013-11-26 08:38:48 -08: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
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
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
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
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
Lorenzo Colitti
ec9830e769 Merge "Pass DNS server info notifications to observers." 2013-11-22 01:27:15 +00: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
Newton Allen
ebb47950f2 Fix javadoc typo in SparseArray. 
Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35
 2013-11-21 13:43:01 -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
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
64fe2b3a33 am 3eddb621: am a40420c9: am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit '3eddb6213dc017c78e6d641f7f4a4685db09851e':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 11:57:32 -08: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
Dirk Dougherty
491b40d752 Doc change: Change description for BRAND. 
Bug:11431921

Change-Id: Id08bb58a52699942e0cf626aeb577ac05c84c575
 2013-11-21 09:31:40 -08:00
John Spurlock
5d95899881 Merge "Remove unused imports from frameworks/base." 2013-11-20 21:47:52 +00:00
John Spurlock
6090995951 Remove unused imports from frameworks/base. 
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
 2013-11-20 11:31:47 -05:00
George Mount
34d8519de4 Merge "Add animations along a Path." 2013-11-20 15:47:00 +00:00
George Mount
c96c7b2e54 Add animations along a Path. 
Change-Id: If03bd10a3961ff874e33489e1253146b8dadca33
 2013-11-20 07:39:26 -08:00
Christopher Tate
266f48cc04 am c8ea38fe: am e3705342: am b0183f0a: Harden against transiently unavailable backup transports 
* commit 'c8ea38fe18efb447a0f87aed60f511d14d2389fa':
  Harden against transiently unavailable backup transports
 2013-11-19 11:53:02 -08:00