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

117703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
4806fdfbd0 am f226bc60: Merge "Use LinkAddress in address notifications." 
* commit 'f226bc606af9ce5aceff6b05fc4b0200c94cb248':
  Use LinkAddress in address notifications.
 2013-11-26 17:56:45 -08:00
Lorenzo Colitti
f226bc606a Merge "Use LinkAddress in address notifications." 2013-11-27 00:52: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
9d0a88bd4e Merge "Doc updates: Javadoc fixes" into klp-docs 2013-11-26 21:56:09 +00:00
Katie McCormick
f2ef28d840 Doc updates: Javadoc fixes 
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
 2013-11-26 13:52:48 -08:00
Jason Sams
1ccc6633bf am 9e6d8f04: Merge "Adding operations to reflected Renderscript class" 
* commit '9e6d8f04940fd710ae858ff7ee4df43eb03ea85e':
  Adding operations to reflected Renderscript class
 2013-11-26 12:32:22 -08:00
Jason Sams
9e6d8f0494 Merge "Adding operations to reflected Renderscript class" 2013-11-26 20:23:44 +00:00
Katie McCormick
ad0cab26a7 am fdb738a5: am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs 
* commit 'fdb738a52fe0f0f3bef8b867c6646668d86835dd':
  Doc update: minor changes to immersive lesson
 2013-11-26 11:13:05 -08:00
Katie McCormick
fdb738a52f am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs 
* commit '752d8029176d3670b9e817d8465d854d4a1b933e':
  Doc update: minor changes to immersive lesson
 2013-11-26 19:09:52 +00:00
Katie McCormick
752d802917 Merge "Doc update: minor changes to immersive lesson" into klp-docs 2013-11-26 19:06:07 +00:00
Dan Sandler
8e77393ae9 am 99ef026f: Merge "Keep PhoneStatusBar default constructor around." 
* commit '99ef026f48948f281467fcf4ce7ebbe15630ad45':
  Keep PhoneStatusBar default constructor around.
 2013-11-26 08:38:59 -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
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
Dan Sandler
99ef026f48 Merge "Keep PhoneStatusBar default constructor around." 2013-11-26 15:27:34 +00:00
John Spurlock
9105b7de47 Keep PhoneStatusBar default constructor around. 
By keeping the entire class safe.

Cherry picked because the device will otherwise be unusable
if compiled with proguard 4.10.

(cherry picked from commit af568530203dc2ee59f5fda4895d28b29dd92226)

Change-Id: I0b880f382101f737511bc6db96c604f43ed8d266
 2013-11-26 13:39:02 +00:00
Lorenzo Colitti
5ad421a3d0 Use LinkAddress in address notifications. 
Currently address{Updated,Removed} pass in the address as a
string such as "fe80::1/64". Use LinkAddresses instead, since
that's what it is.

This makes the code more robust in the unlikely case that netd
passes in an invalid string. In the future we can move flags and
scope into the LinkAddress itself and simplify the code further.

Bug: 9180552
Change-Id: I66599f9529cf421caa7676fdd0141bb110b8589e
 2013-11-26 21:55:15 +09:00
Lorenzo Colitti
9d4ac97036 Merge "Pass DNS server info notifications to observers." 2013-11-26 01:03:06 +00: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
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
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
7a4adedf0a Import translations. DO NOT MERGE 
Change-Id: I7261755eab5c935124863a747fbd09732c6c5288
Auto-generated-cl: translation import
 2013-11-25 09:42:45 -08: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
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
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
57c33d0d71 am dbccd44a: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD 
* commit 'dbccd44a638ae8705a5b14bff8b2dd74abc26045':
 2013-11-22 17:40:32 -08:00
Dirk Dougherty
6000f1ed3d Re-enable samples browser. 
Change-Id: I9d0c5966422ba0cf8bca576895f30679d40a19ab
 2013-11-22 14:01:48 -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
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
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
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