frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 261e7a37 to master	Alex Klyubin	2015-04-01	1	-7/+5
\|\
\| *	Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.	Alex Klyubin	2015-04-01	1	-0/+5
* \|	Merge "Move reset network settings into framework."	Stuart Scott	2015-03-31	2	-0/+60
\|\ \
\| * \|	Move reset network settings into framework.	Stuart Scott	2015-03-30	2	-0/+60
* \| \|	Progress towards dynamic storage support.	Jeff Sharkey	2015-03-30	1	-0/+2
\|/ /
* \|	Keep debug information in NetworkStats files	Wenchao Tong	2015-03-27	1	-1/+40
* \|	Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'...	Prerepa Viswanadham	2015-03-25	2	-3/+3
\|\ \
\| * \	Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into m...	Prerepa Viswanadham	2015-03-24	2	-3/+3
\| \|\ \
\| \| * \	Merge "Make NetworkCapabilities.NOT_VPN javadoc visible." into m-wireless-dev	Paul Jensen	2015-03-20	1	-2/+2
\| \| \|\ \
\| \| \| * \|	Make NetworkCapabilities.NOT_VPN javadoc visible.	Paul Jensen	2015-03-18	1	-2/+2
\| \| * \| \|	Remove dead code, mostly DataStateTracker.	Paul Jensen	2015-03-18	7	-1909/+0
\| \| * \| \|	Add a protectFromVpn method that takes a FileDescriptor	Lorenzo Colitti	2015-03-17	1	-0/+9
\| \| * \| \|	Merge changes from topic 'dhcpclient' into m-wireless-dev	Lorenzo Colitti	2015-03-16	12	-1549/+45
\| \| \|\ \ \
\| \| \| * \| \|	DHCP: Move the packet code to frameworks/base/services.	Lorenzo Colitti	2015-03-16	9	-1548/+0
\| \| \| * \| \|	DHCP: Add a native method for making a DHCP socket.	Lorenzo Colitti	2015-03-16	1	-0/+7
\| \| \| * \| \|	DHCP: Add a superclass for DhcpStateMachine.	Lorenzo Colitti	2015-03-16	2	-1/+38
\| \| * \| \| \|	Merge "Add two utility methods for IPv4 netmasks." into m-wireless-dev	Lorenzo Colitti	2015-03-16	1	-0/+35
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Add two utility methods for IPv4 netmasks.	Lorenzo Colitti	2015-03-16	1	-0/+35
\| \| \| \|/ /
\| \| * \| \|	Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK.	Paul Jensen	2015-03-13	1	-1/+1
\| \| \|/ /
* \| \| \|	Data Usage public API	Zoltan Szatmary-Ban	2015-03-25	2	-0/+14
\|/ / /
* \| \|	Add a protectFromVpn method that takes a FileDescriptor	Lorenzo Colitti	2015-03-20	1	-0/+9
* \| \|	DHCP: Move the packet code to frameworks/base/services.	Lorenzo Colitti	2015-03-20	9	-1548/+0
* \| \|	DHCP: Add a native method for making a DHCP socket.	Lorenzo Colitti	2015-03-20	1	-0/+7
* \| \|	DHCP: Add a superclass for DhcpStateMachine.	Lorenzo Colitti	2015-03-20	2	-1/+38
* \| \|	Add two utility methods for IPv4 netmasks.	Lorenzo Colitti	2015-03-20	1	-0/+35
* \| \|	First stab at device idle mode.	Dianne Hackborn	2015-03-19	1	-1/+2
* \| \|	am "Refactor NetworkUtils interaction with DHCP."	Vinit Deshpande	2015-03-15	1	-3/+41
\|\ \ \ \| \|/ /
\| * \|	Refactor NetworkUtils interaction with DHCP.	Erik Kline	2015-03-02	1	-3/+41
\| * \|	Telephony: Implementation for IWLAN.	Yashdev Singh	2015-02-26	1	-0/+1
* \| \|	resolved conflicts for merge of b6b9fe21 to master	Andreas Gampe	2015-03-13	7	-1904/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Remove dead code, mostly DataStateTracker.	Paul Jensen	2015-03-11	7	-1908/+0
* \| \|	NetworkStatsService to adjust VPN stats before recording.	Wenchao Tong	2015-03-12	1	-0/+3
* \| \|	Merge "NetworkStats to support VPN accounting."	Wenchao Tong	2015-03-12	1	-0/+160
\|\ \ \
\| * \| \|	NetworkStats to support VPN accounting.	Wenchao Tong	2015-03-09	1	-0/+160
* \| \| \|	Remove unused imports in frameworks/base.	John Spurlock	2015-02-28	9	-19/+0
\|/ / /
* \| \|	Merge "Move apache specific portions of android.net.http to external/apache-h...	Narayan Kamath	2015-02-13	20	-5630/+5
\|\ \ \
\| * \| \|	Move apache specific portions of android.net.http to external/apache-http.	Narayan Kamath	2015-02-12	20	-5630/+5
* \| \| \|	am f69f3737: am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for...	Jeremy Joslin	2015-02-12	1	-0/+4
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWOR...	Jeremy Joslin	2015-02-12	1	-0/+4
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Update Javadoc for EXTRA_NETWORK.	Jeremy Joslin	2015-02-11	1	-0/+4
* \| \| \|	Merge "Do not throw NullPointerException from PacService"	Andrei Kapishnikov	2015-02-11	1	-3/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Do not throw NullPointerException from PacService	Andrei Kapishnikov	2015-01-16	1	-3/+2
* \| \| \|	Remove apache specific socket factory API.	Narayan Kamath	2015-02-04	1	-0/+2
* \| \| \|	Remove path, query, and fragment from http Uri.	Craig Mautner	2015-02-03	1	-1/+8
* \| \| \|	Merge "Also include the domain when parceling StaticIpConfiguration." automer...	Lorenzo Colitti	2015-01-30	1	-0/+2
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge "Also include the domain when parceling StaticIpConfiguration." automer...	Lorenzo Colitti	2015-01-30	1	-0/+2
\| \|\ \ \
\| \| * \| \|	Also include the domain when parceling StaticIpConfiguration.	Lorenzo Colitti	2015-01-29	1	-0/+2
\| \| * \| \|	Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()	Paul Jensen	2015-01-29	2	-2/+3
\| \| * \| \|	Support connecting to networks with misconfigured subnet masks.	Lorenzo Colitti	2015-01-28	1	-4/+11
* \| \| \| \|	am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfi...	Lorenzo Colitti	2015-01-23	1	-4/+11
\|\ \ \ \ \ \| \|/ / / /