frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am a741efd5: Merge "adding debug information to bug report for Bug:16751877" ...	vandwalle	2014-10-08	3	-13/+79
\|\
\| *	adding debug information to bug report for Bug:16751877	vandwalle	2014-10-07	3	-13/+79
* \|	am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev	vandwalle	2014-10-03	1	-1/+1
\|\ \ \| \|/
\| *	add millisecond timestamp to locallog	vandwalle	2014-10-03	1	-1/+1
* \|	am 7fe95529: Merge "Revert the configKey generation algorithm to what it was ...	Lorenzo Colitti	2014-10-02	1	-12/+9
\|\ \ \| \|/
\| *	Revert the configKey generation algorithm to what it was in K.	Lorenzo Colitti	2014-09-30	1	-12/+9
* \|	am 2906c72f: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failu...	vandwalle	2014-09-23	2	-5/+61
\|\ \ \| \|/
\| *	handle bssid blacklist in case of dhcp failures	vandwalle	2014-09-23	2	-5/+61
* \|	am b74eaee8: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timest...	Vinit Deshpande	2014-09-23	1	-1/+1
\|\ \ \| \|/
\| *	Fix documentation for Wifi ScanResult.timestamp	Vinit Deshpande	2014-09-19	1	-1/+1
* \|	am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without speci...	Prem Kumar	2014-09-15	1	-1/+3
\|\ \ \| \|/
\| *	Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lm...	Prem Kumar	2014-09-15	1	-1/+3
\| \|\
\| \| *	Allow creating EAP_TLS network without specifying Phase2.None	Vinit Deshpande	2014-09-13	1	-1/+3
* \| \|	am dfb82a24: am 35967d04: Merge "make wifi cellular params configurable" into...	vandwalle	2014-09-14	1	-3/+6
\|\ \ \ \| \|/ /
\| * \|	make wifi cellular params configurable	vandwalle	2014-09-13	1	-3/+6
\| \|/
* \|	am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev	vandwalle	2014-09-13	1	-25/+85
\|\ \ \| \|/
\| *	various fixes:	vandwalle	2014-09-12	1	-25/+85
* \|	am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID i...	vandwalle	2014-09-10	1	-8/+16
\|\ \ \| \|/
\| *	make autojoin configurable, clean up BSSID info that may be stake in WifiConf...	vandwalle	2014-09-10	1	-8/+16
* \|	am b73e94b4: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev	Vinit Deshpande	2014-09-10	1	-0/+2
\|\ \ \| \|/
\| *	Merge "Secure access to WifiScanner" into lmp-dev	Vinit Deshpande	2014-09-10	1	-0/+2
\| \|\
\| \| *	Secure access to WifiScanner	Vinit Deshpande	2014-09-08	1	-0/+2
* \| \|	am 33e1b95c: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-dev	Vinit Deshpande	2014-09-09	2	-1/+13
\|\ \ \ \| \|/ /
\| * \|	Merge "Implement getAvailableChannels" into lmp-dev	Vinit Deshpande	2014-09-09	2	-1/+13
\| \|\ \
\| \| * \|	Implement getAvailableChannels	Vinit Deshpande	2014-09-05	2	-1/+13
\| \| \|/
* \| \|	am 344ddea4: am a35a795f: Merge "add more info to WifiConfiguration.toString:...	vandwalle	2014-09-08	1	-7/+109
\|\ \ \ \| \|/ /
\| * \|	add more info to WifiConfiguration.toString:	vandwalle	2014-09-07	1	-7/+109
\| \|/
* \|	am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used b...	David Christie	2014-09-04	1	-0/+3
\|\ \ \| \|/
\| *	Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently thes...	David Christie	2014-09-04	1	-0/+3
\| \|\
\| \| *	Add @SystemApi annotations to methods used by GmsCore.	David Christie	2014-09-04	1	-0/+3
* \| \|	am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter...	Vinit Deshpande	2014-09-03	4	-309/+211
\|\ \ \ \| \|/ /
\| * \|	Address API Council feedback for WifiAdapter/WPS APIs	Vinit Deshpande	2014-08-29	4	-309/+211
* \| \|	am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this functi...	vandwalle	2014-08-27	1	-0/+1
\|\ \ \ \| \|/ /
\| * \|	fix ScanResult read from parcel, this function was broken and causes wifi set...	vandwalle	2014-08-27	1	-0/+1
* \| \|	am 39b53f3c: am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev	vandwalle	2014-08-26	13	-3710/+0
\|\ \ \ \| \|/ /
\| * \|	Merge "remove passpoint - DO NOT MERGE" into lmp-dev	vandwalle	2014-08-26	13	-3710/+0
\| \|\ \
\| \| * \|	remove passpoint - DO NOT MERGE	vandwalle	2014-08-26	13	-3710/+0
* \| \| \|	am dbf54ec2: am b2139607: Merge "add radio stats to link layer" into lmp-dev	vandwalle	2014-08-26	7	-3/+235
\|\ \ \ \ \| \|/ / /
\| * \| \|	add radio stats to link layer	vandwalle	2014-08-26	7	-3/+235
\| \|/ /
* \| \|	am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiMana...	Wenchao Tong	2014-08-21	1	-5/+0
\|\ \ \ \| \|/ /
\| * \|	Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev	Wenchao Tong	2014-08-21	1	-5/+0
\| \|\ \
\| \| * \|	Revert "Annotate @SystemApi on some WifiManager methods."	Wenchao Tong	2014-08-20	1	-5/+0
* \| \| \|	am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-dev	vandwalle	2014-08-21	1	-6/+23
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "per bssid blacklist" into lmp-dev	vandwalle	2014-08-21	1	-6/+23
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	per bssid blacklist	vandwalle	2014-08-20	1	-6/+23
* \| \| \|	am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and Wifi...	Jeff Davidson	2014-08-21	2	-3/+10
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev	Jeff Davidson	2014-08-20	2	-3/+10
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Improve documentation of ScanResult and WifiInfo.	Jeff Davidson	2014-08-12	2	-3/+10
* \| \| \|	am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE...	vandwalle	2014-08-20	1	-10/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev	vandwalle	2014-08-20	1	-10/+0
\| \|\ \ \