Lorenzo Colitti
df3ef993cb
Merge "Enabling internal msg apis"
2014-05-14 12:46:28 +00:00
Lorenzo Colitti
07133093f0
Merge "Fix build."
2014-05-14 12:46:07 +00:00
Lorenzo Colitti
4a0e0173f4
Merge "Specify netId when adding/removing routes."
2014-05-14 12:45:39 +00:00
Lorenzo Colitti
af46637e40
Merge "Set and clear the default network."
2014-05-14 12:45:18 +00:00
Lorenzo Colitti
9bc300e98f
Merge "Update netd API."
2014-05-14 12:44:56 +00:00
Lorenzo Colitti
8f677677ec
Merge "Get ConnectivityServiceTest building again after 8f80cc8."
2014-05-14 12:44:41 +00:00
Lorenzo Colitti
dffe0236c6
Merge "Use NetId instead of interface name when communicating DNS changes to netd."
2014-05-14 12:44:21 +00:00
Lorenzo Colitti
e8dbda2f76
Merge "Update the API for permission set/clear."
2014-05-14 12:43:58 +00:00
Lorenzo Colitti
02af9da5a9
Merge "Update netd interface"
2014-05-14 12:43:45 +00:00
Lorenzo Colitti
afabcf8641
Merge "Add multinetwork netd calls"
2014-05-14 12:43:27 +00:00
Lorenzo Colitti
807913fec5
Merge "Stop adding host routes for dns"
2014-05-14 12:43:19 +00:00
Jorim Jaggi
67c26cba21
Merge "Handle media key events correctly on Keyguard."
2014-05-14 12:35:46 +00:00
Jorim Jaggi
df993513fb
Handle media key events correctly on Keyguard.
...
Bug: 14490267
Change-Id: Ib8f8ee3ee7f1fbec70f1dd8b6fb04cd7c242bdce
2014-05-14 14:32:50 +02:00
Jorim Jaggi
fae5984758
Merge "Fix Keyboard over Keyguard when password is set."
2014-05-14 12:28:14 +00:00
Jorim Jaggi
5fd4d05aae
Fix Keyboard over Keyguard when password is set.
...
Bug: 14842750
Change-Id: Ie7d92ee60191f8083c8ff65aba3754c71e4a5819
2014-05-14 14:03:37 +02:00
Alexandra Gherghina
ef7f57d5ff
Merge "Ensure only enabled profile apps can be launched"
2014-05-14 11:59:45 +00:00
Alexandra Gherghina
cea2978737
Ensure only enabled profile apps can be launched
...
Change-Id: I396e99eb6b8a957d994962300eeffeec61d7c46a
Bug: 13691041
2014-05-14 12:31:21 +01:00
Robert Greenwalt
7b81602f3c
Enabling internal msg apis
...
NetworkFactory and NetworkAgent. First trying with wifi and
getting rid of WifiStateTracker.
Conflicts:
api/current.txt
services/core/java/com/android/server/ConnectivityService.java
Change-Id: I7f0ec13d7d8988b32f3c6dc71f72012f3349fe02
2014-05-14 03:56:34 -07:00
Sreeram Ramachandran
4ddebf7f5b
Fix build.
...
Change-Id: I5dab09d2d8a9cff56fa17bb4e8c14b365449399b
2014-05-14 03:56:33 -07:00
Sreeram Ramachandran
b2829fa165
Specify netId when adding/removing routes.
...
Change-Id: I07fd950aee726e9721153f75c3e4c10d8e19d8e9
2014-05-14 03:56:33 -07:00
Sreeram Ramachandran
79a1058480
Set and clear the default network.
...
Change-Id: I305951e0c4735d708804baa597cc2d9b10f501c0
2014-05-14 03:56:33 -07:00
Sreeram Ramachandran
f047f2a8f4
Update netd API.
...
Remove:
- resetOldSockets from setDefaultNetId: netd takes care of this automatically.
- {add,remove}DnsServersForNetId: equivalent to "resolver setnetdns".
Change-Id: I819a8be216d07cf9a8c05f51745b64658027ed02
2014-05-14 03:56:33 -07:00
Paul Jensen
a7b9796345
Get ConnectivityServiceTest building again after 8f80cc8.
...
Change-Id: I4520011ba2076d8fac1ca234cb9a79c774992671
2014-05-14 03:56:33 -07:00
Paul Jensen
13e817df51
Use NetId instead of interface name when communicating DNS changes to netd.
...
Change-Id: Ic82b73de6f50d39d56c5e1a32f5b1f3ebb80bb7d
2014-05-14 03:56:33 -07:00
Sreeram Ramachandran
e4bde7d475
Update the API for permission set/clear.
...
Change-Id: I1d10a5702a77cb24fa52016bb497d52270379f8a
2014-05-14 03:56:32 -07:00
Robert Greenwalt
913c895216
Update netd interface
...
Adding netId for route changes
bug:13732575
Change-Id: Id171412a0f580f71398c9b0b8742acb1f3ef5a1e
2014-05-14 03:56:32 -07:00
Robert Greenwalt
568891d928
Add multinetwork netd calls
...
bug:13732575
Change-Id: I7f030bd63971ff71d32a221e50318c781e7f2370
2014-05-14 03:56:32 -07:00
Robert Greenwalt
89fb3eb718
Stop adding host routes for dns
...
bug:13550136
Change-Id: I748e13b96dab111f8f6a4b11d9beaf2a72d0742b
2014-05-14 03:56:32 -07:00
Yohei Yukawa
7ff49b3ad6
Merge "Use java.util.Objects"
2014-05-14 10:45:54 +00:00
Yohei Yukawa
c941fedf50
Use java.util.Objects
...
This is a follow up CL for I451544fba746a76618.
This CL replaces libcore.util.Objects with java.util.Objects as
java.util.Objects is getting more and more widely used in
Android. There should be no behavioural change anyway.
Change-Id: Id9568ee98aa3845588017c3711e7d03a3481beea
2014-05-14 19:38:07 +09:00
Adrian Roos
cd10d7c595
Merge "A better auto brightness"
2014-05-14 10:32:26 +00:00
Adrian Roos
daf7d410fc
A better auto brightness
...
Bug: 14927472
Change-Id: I62d0695b7da16ffa7a27c465c3b6bc4b1515f9c0
2014-05-14 10:32:08 +00:00
Yohei Yukawa
d6f4e37554
Merge "Support IMM#updateCursorAnchorInfo in Editor"
2014-05-14 08:02:31 +00:00
Yohei Yukawa
83b68ba4ad
Support IMM#updateCursorAnchorInfo in Editor
...
With this CL, Editor starts calling IMM#updateCursorAnchorInfo
iff IMM#isWatchingCursor(View) returns true. The performance
regression should be negligible when IMM#isWatchingCursor(View)
returns false.
BUG: 14579622
Change-Id: Ib35a6f4201b26d837a6aa07d1204c9eb75404da1
2014-05-14 16:22:53 +09:00
Robert Greenwalt
2491c3a0e8
Merge "Add Network-specific host name resolution API."
2014-05-14 05:39:10 +00:00
Chulwoo Lee
c3e00c3ffc
Fix NPE while dispatching input event.
...
- occasionally, TvView can be detached while
the input event is being processed.
BUG: 14791903
Change-Id: Id1def32ace1bf9765ae30a00ea4579670d1d40aa
2014-05-14 14:35:00 +09:00
Robert Greenwalt
e049c23980
Add NetworkFactory support.
...
This is a protocol allowing transports to dynamically register with CS for
Handler to Handler communications.
bug:13885501
Change-Id: Ic7275e3724a15efc7e5f80981560c4cb3106007b
2014-05-13 21:21:49 -07:00
Robert Greenwalt
0191c33539
Merge "Add NetworkAgent"
2014-05-14 03:32:43 +00:00
Adam Powell
3288dbafe9
Merge "Tweak EdgeEffect"
2014-05-14 02:38:20 +00:00
Alan Viverette
d9c37653d9
Fix build
...
Change-Id: I595d4e1b4a044a454c77526696c7edc70ac57f88
2014-05-13 19:11:33 -07:00
Adam Powell
2897a6fded
Tweak EdgeEffect
...
Make the effect less prominent/bulbous and not hit limits quite so
easily.
Change-Id: Ib8fdc29867276e6d0db447b60db0d7be3503d4d8
2014-05-13 19:05:53 -07:00
Robert Greenwalt
1ad4468dff
Add NetworkAgent
...
Used as a bag for a details about a Network and its state.
bug:13885501
Change-Id: I19cdaf3a833a9dad1df84591b8efd5045c67f38c
(cherry picked from commit 344279bb3e0e521d4ca5f8c94a8f0bd235059aa3)
2014-05-14 01:17:50 +00:00
John Spurlock
76c43b9ee1
Fix crash in cast tile.
...
Change-Id: Idf2b35213d46b138b7ac866222950c6ddb48433f
2014-05-13 21:12:18 -04:00
Craig Mautner
7fd239cf0a
Merge "Pass ActivityOptions back from finishing activity."
2014-05-14 00:54:41 +00:00
Deepanshu Gupta
7126c3c7ae
am 406e38bd: am 80816bfc: am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit '406e38bd20b0cc0dc60c0a9d132566490c0672af':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:41:04 +00:00
Deepanshu Gupta
14edfa8f65
am c1a74400: am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit 'c1a7440094c94f4369f04f062485c9ea1162a78b':
Fix build
2014-05-14 00:40:57 +00:00
Alan Viverette
d4ab588c1f
Merge "Documentation for theme colors"
2014-05-14 00:39:46 +00:00
Youngsang Cho
a6a97905dc
Merge "Fix NPE in TvInputService and TvView"
2014-05-14 00:39:28 +00:00
Deepanshu Gupta
406e38bd20
am 80816bfc: am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
...
* commit '80816bfcaf487535a45a7e6f271341eaede653b1':
Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:36:23 +00:00
Deepanshu Gupta
c1a7440094
am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
...
* commit '7dfe1fdac6f0306e1e31417d58a1a36d4280d2cc':
Fix build
2014-05-14 00:36:20 +00:00