drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,657 Commits 1 Branch 0 Tags
Commit Graph

131657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
54b6fd0cbe Merge "Add networks and requests to CS.dump" 2014-05-14 13:44:26 +00:00
Robert Greenwalt
c9c90c771c Add networks and requests to CS.dump 
Adds debugging.

Change-Id: I352dfe970c990fd210f3d1598519e321bbdd6ed5
(cherry picked from commit 9bdf6bd99db56c652ba9a62d91f258d11d19ca9f)
 2014-05-14 13:12:23 +00:00
Robert Greenwalt
9258c64bef Add Multinetwork API 
Change-Id: I3a9cef0d416db96d05098dd989ee3fef3b1e9274
(cherry picked from commit cc5e6afa1ba0bef099bcb21a64a36bc2bf7951db)
 2014-05-14 13:06:56 +00:00
Lorenzo Colitti
98e8c26b90 Merge "Handle legacy synchronous inspectors" 2014-05-14 12:48:46 +00:00
Lorenzo Colitti
612bf2f8d6 Merge "Get clatd/Nat464Xlat working with new NetworkAgents." 2014-05-14 12:48:28 +00:00
Lorenzo Colitti
111ac91393 Merge "Fix compile errors after merge." 2014-05-14 12:48:08 +00:00
Lorenzo Colitti
1163c5363c Merge "Disable calls to MobileDataStateTracker.isProvisioning() as there is no more MobileDataStateTracker so these just crash." 2014-05-14 12:47:46 +00:00
Lorenzo Colitti
6fd7b55122 Merge "Add NetworkMonitor. At present the network evaluation / captive portal detection is disabled pending addition of API to bind socket to network." 2014-05-14 12:47:24 +00:00
Lorenzo Colitti
131dcda9a2 Merge "Separate network and interface addition/removal netd APIs. This should facilitate stacked interfaces (i.e. clatd)." 2014-05-14 12:47:02 +00:00
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
12e6735f77 Handle legacy synchronous inspectors 
getNetworkInfo, getActiveNetworkInfo, etc

Conflicts:
	services/core/java/com/android/server/ConnectivityService.java

Change-Id: I4611d6481b1a76fe4a4ce22232a2a329de2a6e0c
 2014-05-14 03:56:35 -07:00
Paul Jensen
3b75982e39 Get clatd/Nat464Xlat working with new NetworkAgents. 
Change-Id: I65dfb59ce519a42bdb872940d229039b5403fd92
 2014-05-14 03:56:35 -07:00
Lorenzo Colitti
7ef9257601 Fix compile errors after merge. 
These are due to changes to ConnectivityService that were made
after master-multinetwork-dev branched off. They mostly didn't
cause merge conflicts because they were in different parts of
the file from the multinetwork changes, but they cause compile
errors now. These particular changes should be fine - they are
all in dead code anyway, and their functionality had already
been re-implemented in the new code.

Change-Id: I0ac9e39c3c975c8e8dc04ad11b6b85366693865c
 2014-05-14 03:56:34 -07:00
Paul Jensen
b6bb6c61dd Disable calls to MobileDataStateTracker.isProvisioning() as there is no more 
MobileDataStateTracker so these just crash.

Change-Id: Ib45a85db505c0a99fb65d9a6d0c39b860f9d019d
 2014-05-14 03:56:34 -07:00
Paul Jensen
ca8f16ad14 Add NetworkMonitor. 
At present the network evaluation / captive portal detection
is disabled pending addition of API to bind socket to network.

Change-Id: I5d1f5dc86d4dd9481d52dd45d6da0732054c8315
 2014-05-14 03:56:34 -07:00
Paul Jensen
992f252579 Separate network and interface addition/removal netd APIs. 
This should facilitate stacked interfaces (i.e. clatd).

Change-Id: Ib3e7a4d3847ef6ec4449451f6da42e75959baa4f
 2014-05-14 03:56:34 -07: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