frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Add multinetwork netd calls	Robert Greenwalt	2014-05-14	2	-0/+179
* \| \| \| \| \|	Merge "Stop adding host routes for dns"	Lorenzo Colitti	2014-05-14	1	-25/+0
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Stop adding host routes for dns	Robert Greenwalt	2014-05-14	1	-25/+0
* \| \| \| \| \|	Merge "Handle media key events correctly on Keyguard."	Jorim Jaggi	2014-05-14	5	-1/+21
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Handle media key events correctly on Keyguard.	Jorim Jaggi	2014-05-14	5	-1/+21
* \| \| \| \| \| \|	Merge "Fix Keyboard over Keyguard when password is set."	Jorim Jaggi	2014-05-14	2	-1/+9
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Fix Keyboard over Keyguard when password is set.	Jorim Jaggi	2014-05-14	2	-1/+9
* \| \| \| \| \| \|	Merge "Ensure only enabled profile apps can be launched"	Alexandra Gherghina	2014-05-14	1	-3/+30
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Ensure only enabled profile apps can be launched	Alexandra Gherghina	2014-05-14	1	-3/+30
* \| \| \| \| \| \|	Merge "Use java.util.Objects"	Yohei Yukawa	2014-05-14	1	-4/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Use java.util.Objects	Yohei Yukawa	2014-05-14	1	-4/+3
* \| \| \| \| \| \| \|	Merge "A better auto brightness"	Adrian Roos	2014-05-14	4	-33/+59
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	A better auto brightness	Adrian Roos	2014-05-14	4	-33/+59
* \| \| \| \| \| \| \|	Merge "Support IMM#updateCursorAnchorInfo in Editor"	Yohei Yukawa	2014-05-14	1	-2/+122
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Support IMM#updateCursorAnchorInfo in Editor	Yohei Yukawa	2014-05-14	1	-2/+122
* \| \| \| \| \| \| \| \|	Merge "Add Network-specific host name resolution API."	Robert Greenwalt	2014-05-14	1	-0/+28
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add Network-specific host name resolution API.	Paul Jensen	2014-05-13	1	-0/+28
* \| \| \| \| \| \| \| \| \|	Fix NPE while dispatching input event.	Chulwoo Lee	2014-05-14	1	-1/+5
* \| \| \| \| \| \| \| \| \|	Add NetworkFactory support.	Robert Greenwalt	2014-05-13	5	-0/+111
* \| \| \| \| \| \| \| \| \|	Merge "Add NetworkAgent"	Robert Greenwalt	2014-05-14	1	-0/+40
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Add NetworkAgent	Robert Greenwalt	2014-05-14	1	-0/+40
* \| \| \| \| \| \| \| \| \| \|	Merge "Tweak EdgeEffect"	Adam Powell	2014-05-14	2	-43/+26
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Tweak EdgeEffect	Adam Powell	2014-05-13	2	-43/+26
* \| \| \| \| \| \| \| \| \| \| \|	Fix build	Alan Viverette	2014-05-13	4	-71/+34
\| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Fix crash in cast tile.	John Spurlock	2014-05-13	3	-41/+51
* \| \| \| \| \| \| \| \| \| \|	Merge "Pass ActivityOptions back from finishing activity."	Craig Mautner	2014-05-14	12	-75/+132
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Pass ActivityOptions back from finishing activity.	Craig Mautner	2014-05-13	12	-75/+132
* \| \| \| \| \| \| \| \| \| \| \|	am 406e38bd: am 80816bfc: am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7:...	Deepanshu Gupta	2014-05-14	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	am 80816bfc: am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d:...	Deepanshu Gupta	2014-05-14	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62:...	Deepanshu Gupta	2014-05-14	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \	am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a:...	Deepanshu Gupta	2014-05-14	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \ \ \ \ \	am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c:...	Deepanshu Gupta	2014-05-14	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| * \ \ \ \ \ \ \ \ \ \	am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039:...	Deepanshu Gupta	2014-05-14	0	-0/+0
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| \| * \ \ \ \ \ \ \ \ \ \	am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved con...	Deepanshu Gupta	2014-05-14	0	-0/+0
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| \| \| * \ \ \ \ \ \ \ \ \ \	am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for me...	Deepanshu Gupta	2014-05-14	0	-0/+0
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| \| \| \| * \ \ \ \ \ \ \ \ \ \	am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42...	Deepanshu Gupta	2014-05-14	0	-0/+0
\| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| \| \| \| \| * \ \ \ \ \ \ \ \ \ \	am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1....	Deepanshu Gupta	2014-05-13	0	-0/+0
\| \| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| \| \| \| \| \| * \ \ \ \ \ \ \ \ \ \	am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev	Deepanshu Gupta	2014-05-13	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| \| \| \| \| \| \| * \ \ \ \ \ \ \ \ \ \	resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev	Deepanshu Gupta	2014-05-13	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| \| \| \| \| \| \| \| * \ \ \ \ \ \ \ \ \ \	am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	1	-13/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| \| \| \| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \|	Fix build due to incorrect merges [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	1	-13/+7
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am c1a74400: am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / / / / / / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / / / / / / / / / / / / /
\| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \|/ / / / / / / / / / / / / / / / / /
\| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \|/ / / / / / / / / / / / / / / / /
\| \| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \|/ / / / / / / / / / / / / / / /
\| \| \| \| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \|/ / / / / / / / / / / / / / /