frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
...
* \|	am 10914a23: am 662c326e: Merge "Allow yet another combination of key managem...	Vinit Deshapnde	2013-09-24	1	-1/+2
\|\ \ \| \|/
\| *	Merge "Allow yet another combination of key management options" into klp-dev	Vinit Deshapnde	2013-09-23	1	-1/+2
\| \|\
\| \| *	Allow yet another combination of key management options	Vinit Deshapnde	2013-09-20	1	-1/+2
* \| \|	am 1e690b69: am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev	Robert Greenwalt	2013-09-22	1	-0/+36
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix BatchScan request coalesing" into klp-dev	Robert Greenwalt	2013-09-22	1	-0/+36
\| \|\ \
\| \| * \|	Fix BatchScan request coalesing	Robert Greenwalt	2013-09-20	1	-0/+36
* \| \| \|	am 0e500803: am f31a7897: Merge "Clear names from externally supplied WorkSou...	David Christie	2013-09-20	1	-6/+9
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Clear names from externally supplied WorkSources to WifiManager (b/107...	David Christie	2013-09-20	1	-6/+9
\| \|\ \ \
\| \| * \| \|	Clear names from externally supplied WorkSources to WifiManager (b/10733757)	David Christie	2013-09-20	1	-6/+9
* \| \| \| \|	am 27271f67: am a5fb1204: Merge "Fix incorrect exception being thrown from Wi...	Vinit Deshapnde	2013-09-20	1	-2/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev	Vinit Deshapnde	2013-09-20	1	-2/+2
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| \| * \| \|	Fix incorrect exception being thrown from WifiConfiguration	Vinit Deshapnde	2013-09-20	1	-2/+2
\| \| \| \|/ \| \| \|/\|
* \| \| \|	am 032de6c6: am c237c204: Merge "Supsend/resume batched scans around dhcp." i...	Robert Greenwalt	2013-09-20	1	-3/+30
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Supsend/resume batched scans around dhcp." into klp-dev	Robert Greenwalt	2013-09-20	1	-3/+30
\| \|\ \ \
\| \| * \| \|	Supsend/resume batched scans around dhcp.	Robert Greenwalt	2013-09-20	1	-3/+30
* \| \| \| \|	am eccc0905: am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into ...	Robert Greenwalt	2013-09-20	2	-2/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Cleanup the shutdown of BatchedScans." into klp-dev	Robert Greenwalt	2013-09-20	2	-2/+2
\| \|\ \ \ \
\| \| * \| \| \|	Cleanup the shutdown of BatchedScans.	Robert Greenwalt	2013-09-20	2	-2/+2
\| \| \|/ / /
* \| \| \| \|	am 2e9a4265: am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine"...	Yuhao Zheng	2013-09-20	1	-6/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Remove STOPSHIP in WifiWatchdogStateMachine	Yuhao Zheng	2013-09-19	1	-6/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	am 007c6c7d: am c06b1db2: Merge "Consider current EAP TLS configurations as \...	Vinit Deshapnde	2013-09-16	1	-1/+9
\|\ \ \ \ \| \|/ / /
\| * \| \|	Consider current EAP TLS configurations as 'valid'	Vinit Deshapnde	2013-09-16	1	-1/+9
\| \| \|/ \| \|/\|
* \| \|	am 3d52eb7f: am 14e55996: Merge "Fix Batched Scan Results to give Timestamp i...	Robert Greenwalt	2013-09-12	1	-1/+3
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev	Robert Greenwalt	2013-09-13	1	-1/+3
\| \|\ \
\| \| * \|	Fix Batched Scan Results to give Timestamp in uS	Robert Greenwalt	2013-09-12	1	-1/+3
\| \| \|/
* \| \|	am 7d400ead: am 9d5c33c5: Merge "Fix build break with missing VDBG." into klp...	Stephen Hines	2013-09-12	1	-0/+1
\|\ \ \ \| \|/ /
\| * \|	Fix build break with missing VDBG.	Stephen Hines	2013-09-12	1	-0/+1
* \| \|	am 4d1cef6b: am 96ece970: Merge "Disable additional logging in WifiConfigStor...	Vinit Deshapnde	2013-09-12	2	-29/+33
\|\ \ \ \| \|/ /
\| * \|	Disable additional logging in WifiConfigStore/WifiNative	Vinit Deshapnde	2013-09-12	2	-29/+33
* \| \|	am b2c06ba5: am b481dae2: Merge "Fix invalid Wifi Network system crash" into ...	Vinit Deshapnde	2013-09-12	2	-0/+21
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix invalid Wifi Network system crash" into klp-dev	Vinit Deshapnde	2013-09-12	2	-0/+21
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Fix invalid Wifi Network system crash	Vinit Deshapnde	2013-09-09	2	-0/+21
* \| \|	am 16666176: am 8f435bac: Merge "Fix Wifi Batch Scanning" into klp-dev	Robert Greenwalt	2013-09-12	3	-32/+57
\|\ \ \ \| \|/ /
\| * \|	Fix Wifi Batch Scanning	Robert Greenwalt	2013-09-11	3	-32/+57
* \| \|	resolved conflicts for merge of 03422d26 to master	Dianne Hackborn	2013-09-11	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	Fix issue #10688644: Java crash in com.android.phone:	Dianne Hackborn	2013-09-11	1	-2/+2
* \| \|	Fix a few synchronization issues in WifiMonitor.	Narayan Kamath	2013-09-11	1	-418/+415
* \| \|	am f7bea433: am ba85b970: Merge "Set country code on P2p interfaces as well" ...	Vinit Deshapnde	2013-09-10	3	-4/+19
\|\ \ \ \| \|/ /
\| * \|	Merge "Set country code on P2p interfaces as well" into klp-dev	Vinit Deshapnde	2013-09-10	3	-4/+19
\| \|\ \
\| \| * \|	Set country code on P2p interfaces as well	Vinit Deshapnde	2013-09-09	3	-4/+19
\| \| \|/
* \| \|	am 4f54abfc: am 00cd7132: Merge "wifi: Fix cleaning scan result cache" into k...	Dmitry Shmidt	2013-09-06	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	wifi: Fix cleaning scan result cache	Dmitry Shmidt	2013-09-06	1	-1/+1
* \| \|	am 6a3b7db2: am 771c11b7: Merge "Fix duplicate SSID entries in the WifiSettin...	Vinit Deshapnde	2013-09-06	1	-3/+9
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev	Vinit Deshapnde	2013-09-06	1	-3/+9
\| \|\ \
\| \| * \|	Fix duplicate SSID entries in the WifiSettings UI	Vinit Deshapnde	2013-09-05	1	-3/+9
\| \| \|/
* \| \|	am 6bddc317: am eadf1959: Merge "Track IP addresses in WifiStateMachine." int...	Lorenzo Colitti	2013-09-06	1	-34/+151
\|\ \ \ \| \|/ /
\| * \|	Merge "Track IP addresses in WifiStateMachine." into klp-dev	Lorenzo Colitti	2013-09-06	1	-34/+151
\| \|\ \
\| \| * \|	Track IP addresses in WifiStateMachine.	Lorenzo Colitti	2013-09-06	1	-34/+151
\| \| \|/
* \| \|	Remove synchronization in WifiMonitorSingleton.	Narayan Kamath	2013-09-06	1	-26/+14
\|/ /
* \|	Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev	Vinit Deshapnde	2013-09-05	1	-13/+13
\|\ \ \| \|/ \|/\|