frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesn...	Prem Kumar	2014-12-14	1	-0/+36
\|\
\| *	am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesn...	Prem Kumar	2014-12-14	1	-0/+36
\| \|\
\| \| *	make sure wificonfiguration scan cache doesnt grow unbounded	vandwalle	2014-12-11	1	-0/+36
* \| \|	am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network A...	Jeff Davidson	2014-12-09	2	-1/+16
\|\ \ \ \| \|/ /
\| * \|	am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:185252...	Jeff Davidson	2014-12-08	2	-1/+16
\| \|\ \ \| \| \|/
\| \| *	add disable Ephemeral Network API	vandwalle	2014-12-05	2	-1/+16
* \| \|	am f12fc2e1: am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource ...	vandwalle	2014-11-26	2	-0/+18
\|\ \ \ \| \|/ /
\| * \|	am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to l...	vandwalle	2014-11-26	2	-0/+18
\| \|\ \ \| \| \|/
\| \| *	make startScan with worksource specific to location scans	vandwalle	2014-11-25	2	-0/+18
* \| \|	am 77fe4c96: am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" ...	Vinit Deshpande	2014-11-19	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev	Vinit Deshpande	2014-11-19	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	Fix WPS docs for LABEL method	Vinit Deshpande	2014-11-18	1	-1/+1
\| * \|	Merge "dont blacklist wifi config that have had validated internet status in ...	vandwalle	2014-11-12	1	-8/+31
\| \|\ \ \| \| \|/
* \| \|	Merge commit 'ec3e9805dd7c527f961d1f2a14e5752b461186ca' into fix-merge-conflict	Wink Saville	2014-11-12	1	-8/+31
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	dont blacklist wifi config that have had validated internet status in the past	vandwalle	2014-11-10	1	-8/+31
* \| \|	am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#...	Jeff Davidson	2014-11-06	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." i...	Jeff Davidson	2014-11-05	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	Fix incorrect doc for WifiInfo#getSSID().	Jeff Davidson	2014-11-05	1	-1/+1
* \| \|	am 1199a4c4: am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'...	Jeff Davidson	2014-10-15	1	-1/+5
\|\ \ \ \| \|/ /
\| * \|	am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral b...	Jeff Davidson	2014-10-15	1	-1/+5
\| \|\ \ \| \| \|/
\| \| *	Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp...	Jeff Davidson	2014-10-15	1	-1/+5
\| \| \|\
\| \| \| *	Don't drop WifiConfiguration's ephemeral bit on copy/parcel.	Jeff Davidson	2014-10-06	1	-1/+5
* \| \| \|	resolved conflicts for merge of 28495b02 into master	Primiano Tucci	2014-10-08	3	-13/+79
\|\ \ \ \ \| \|/ / /
\| * \| \|	am b75369e2: am 7bbf867b: am 0c0c680d: am a741efd5: Merge "adding debug infor...	vandwalle	2014-10-08	3	-13/+79
\| \|\ \ \ \| \| \|/ /
\| \| * \|	adding debug information to bug report for Bug:16751877	vandwalle	2014-10-07	3	-13/+79
\| \| \|/
* \| \|	Fix the "Fix broken merge of "handle bssid blacklist in case of dhcp failures""	Primiano Tucci	2014-10-08	1	-0/+2
* \| \|	am 542cc240: am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add m...	vandwalle	2014-10-04	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond ti...	vandwalle	2014-10-04	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	add millisecond timestamp to locallog	vandwalle	2014-10-03	1	-1/+1
* \| \|	am 65d720b3: am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Rever...	Lorenzo Colitti	2014-10-02	1	-12/+9
\|\ \ \ \| \|/ /
\| * \|	am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configK...	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 9e22f280: am 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid black...	vandwalle	2014-09-23	2	-5/+61
\| \|\ \ \| \| \|/
\| \| *	handle bssid blacklist in case of dhcp failures	vandwalle	2014-09-23	2	-5/+61
* \| \|	User wifi separation feature.	Sky Faber	2014-09-26	1	-0/+9
* \| \|	Separate wifi AP added by applications.	Sky Faber	2014-09-26	1	-1/+76
* \| \|	Fix broken merge of "handle bssid blacklist in case of dhcp failures"	Mike Lockwood	2014-09-24	2	-5/+59
* \| \|	am ccafcfbc: am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix d...	Vinit Deshpande	2014-09-23	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation ...	Vinit Deshpande	2014-09-23	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	Fix documentation for Wifi ScanResult.timestamp	Vinit Deshpande	2014-09-19	1	-1/+1
* \| \|	am 27f19d75: am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network ...	Prem Kumar	2014-09-15	1	-1/+3
\|\ \ \ \| \|/ /
\| * \|	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 ffbae6e2: am dfb82a24: am 35967d04: Merge "make wifi cellular params confi...	vandwalle	2014-09-14	1	-3/+6
\|\ \ \ \ \| \|/ / /
\| * \| \|	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 4ae83802: am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev	vandwalle	2014-09-13	1	-25/+85
\|\ \ \ \| \|/ /
\| * \|	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