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

6569 Commits

Author SHA1 Message Date
Chia-chi Yeh
e9107901ae VPN: give legacy VPN a fake package name. 
And add more comments.

Change-Id: I0cbc495fcb2c8dd105e16a841619b3b9bd227eae
 2011-07-02 01:48:50 -07:00
Jeff Brown
b4c5fbff77 Merge "Drop obsolete touch screen hacks." 2011-07-01 19:25:46 -07:00
Jeff Brown
a4d1bc5172 Drop obsolete touch screen hacks. 
Change-Id: I47354c37ee2cc2b36340eb709bb5043b3ba78ed9
 2011-07-01 19:23:40 -07:00
Jeff Brown
230a1ffcb0 Merge "Workaround apps that make assumptions about pointer ids." 2011-07-01 19:17:21 -07:00
Dianne Hackborn
f58e09e5ac Merge "Don't crash when the load average service is started." 2011-07-01 19:09:03 -07:00
Jeff Brown
6894a2947e Workaround apps that make assumptions about pointer ids. 
Modified the touch input mapper to assign pointer ids sequentially
starting from 0 instead of using the tracking id or slot index
supplied by the driver.  Applications should not depend on this
ordering but some do.  (sigh)

Bug: 4980884
Change-Id: I0dfeb3ac27c57a7102a13c960c760e2a02eb7669
 2011-07-01 19:08:15 -07:00
Dianne Hackborn
2ed9946441 Don't crash when the load average service is started. 
Change-Id: Ie40f549d50942793c940f8728ce9c392c25f4c60
 2011-07-01 19:02:52 -07:00
Dianne Hackborn
63acea6ad4 Merge "When removing a task, also kill its processes." 2011-07-01 17:13:40 -07:00
Dianne Hackborn
8894cc5ed4 When removing a task, also kill its processes. 
Change-Id: I5945fef21ad6f028e71e36d3cb55d35e0b6401a6
 2011-07-01 17:12:04 -07:00
Mathias Agopian
0c63ef5091 don't kill surfaceflinger when system process dies 
Change-Id: I2d3ed87b590f9ccea3fa4af41d92911de070b315
 2011-07-01 17:09:24 -07:00
Mathias Agopian
eec0f7ebac return an error code with gralloc buffer allocation failures 
Change-Id: I471e5d37ea7a42fc8a0f93446ee3b4229da37807
 2011-07-01 14:53:49 -07:00
Brian Carlstrom
f91040e2df Merge "Revert "Add keychain user with special keystore access permissions"" 2011-07-01 13:43:37 -07:00
Mike Lockwood
de296f6448 UsbDeviceManager: Reset sys.usb.config if it is "none" at boot 
This will allow us to recover if we crash while changing USB configurations

Change-Id: I22ba9a1ff0a8bcbfd4a0f18af0c95a3b66b99060
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-01 14:55:23 -04:00
Mike Lockwood
fdc0c2984d UsbService: Use Slog instead of Log, and disable some logging 
Change-Id: I094ab99919055848a9fa76363eae6d0df51de9fd
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-01 14:55:23 -04:00
Mike Lockwood
d8404d2fdd USB: Update strings for USB connected notifications 
We now have different strings depending on the current USB mode.

Change-Id: Icc6392d5700a6fee008b75287d8eb0f06db1d880
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-01 14:55:23 -04:00
Robert Greenwalt
38bb0123b8 Merge "Added methods to support dns cache per interface" 2011-07-01 09:26:50 -07:00
Jeff Brown
cec7ab8e85 Merge "Query input device for initial slot index." 2011-07-01 03:11:20 -07:00
Jeff Brown
2717eff2ac Query input device for initial slot index. 
This fixes a problem where touches can get stuck because the
driver and the framework have different ideas of what the
initial slot index is.  The framework assumed it was slot 0
but it could in principle be any slot, such as slot 1.  When
that happened, the framework would start tracking the first
touch as slot 0, but it might never receive an "up" for that slot.

Change-Id: Idaffc4534b275d66b9d4360987b28dc2d0f63218
 2011-07-01 02:59:26 -07:00
Chia-chi Yeh
41d1685a22 VPN: integrate legacy VPN. 
Change-Id: I00e77664354c05e0edfcd5fb2e3da2ca434ed521
 2011-07-01 02:12:06 -07:00
Chia-chi Yeh
8909b10175 VPN: Use List<String> instead for dnsServers and searchDomains. 
Change-Id: I5d72c182ad47f59121a04b68ec6c2d164e2d00a8
 2011-07-01 01:14:19 -07:00
Chia-chi Yeh
1f7746b39b VPN: rename service(s) to daemon(s) to reduce confusion. 
Change-Id: I9739e63c8e41e8b63d024dc4f17283c76bb4ff97
 2011-07-01 00:29:06 -07:00
Chia-chi Yeh
383e052472 VPN: fix the build. 
Change-Id: Ibeaa067cf95636e09746d16f402c78c99d7cb681
 2011-07-01 00:13:25 -07:00
Chia-chi Yeh
2e46061cd2 Merge "VPN: refactor a little bit for the upcoming integration of legacy VPN." 2011-06-30 23:27:53 -07:00
Chia-chi Yeh
a4b87b5e98 VPN: refactor a little bit for the upcoming integration of legacy VPN. 
Change-Id: I0fe0dffe59d8d9c9a0fdd05e07b07aa6c8da0a80
 2011-06-30 23:21:55 -07:00
Jeff Sharkey
072d39e079 Merge "Migrate bandwidth control to NMS, omit history." 2011-06-30 23:09:51 -07:00
Chia-chi Yeh
ac813bda73 Merge "VPN: correct the netmask for IPv4." 2011-06-30 23:02:29 -07:00
Chia-chi Yeh
9c0835fd72 VPN: correct the netmask for IPv4. 
Change-Id: Id6e955af129d55120676d0d9cfe75388671aa367
 2011-06-30 22:59:18 -07:00
Brian Carlstrom
f4b92ec567 Revert "Add keychain user with special keystore access permissions" 
This reverts commit 8c2a1a90a81f04573bfa578eab32f5fd4a30eafb.

Conflicts:

	cmds/keystore/keystore.c

Bug:4970237
Change-Id: I626023d695becfada47e5f319b18e0889b766563
 2011-06-30 22:59:13 -07:00
Mathias Agopian
9c902c1aa3 Merge "fix screen on/off animation, which was flipped" 2011-06-30 16:25:25 -07:00
Mathias Agopian
753db22423 fix screen on/off animation, which was flipped 
Bug: 4673549
Change-Id: Ia9766754687b89c1ee24b2dbe918c11290ebe038
 2011-06-30 16:23:39 -07:00
Jeff Sharkey
350083e36b Migrate bandwidth control to NMS, omit history. 
Both stats and policy make NMS calls that depend on bandwidth control
being enabled, so move enable/disable into NMS and drop calls when
disabled.  This avoids throwing heavy ISE exceptions when disabled.

Only include recent data when writing NetworkStatsHistory as part of
dumpsys call.  Introduce manual poll event for Settings UI.

Bug: 4982115, 4770435, 4515856
Change-Id: I257820b057af2f0f99c736fb4f61e55b9fdc3e66
 2011-06-30 15:47:51 -07:00
Dianne Hackborn
e6b3af24c4 Merge "Fix issue #4902856: Don't let apps register non-explicit PendingIntents" 2011-06-30 13:57:27 -07:00
Chia-chi Yeh
7d1279b309 Merge "VPN: refactor few JNI methods for the usage of legacy VPN." 2011-06-30 12:43:14 -07:00
Chia-chi Yeh
f4e3bf892e VPN: refactor few JNI methods for the usage of legacy VPN. 
Now default routes are handled in JNI instead of VpnBuilder.

Change-Id: Ib026bba6793b64aae0f8356df3d2aaae489d08b4
 2011-06-30 12:41:11 -07:00
Dianne Hackborn
6c418d585e Fix issue #4902856: Don't let apps register non-explicit PendingIntents 
Location manager now checks for such intents, and logs a warning when
they are given to it.  Nothing thrown yet, it needs to check the
targetSdkVersion of the caller somehow.

When sending the pending intent, we require that the recipient hold the
appropriate permission.  This should pretty much close the security hole.

Includes a bunch of infrastructure in the activity manager needed to
support all this.

Change-Id: I4dba7a98a7b8bbb9e347666451aa9cb1efad1848
 2011-06-30 11:23:54 -07:00
Irfan Sheriff
c9d3946018 Merge "DnsPinger changes incl. binding" 2011-06-30 08:51:01 -07:00
Jeff Sharkey
b3f19ca36c Enforce background data flag, rules through netd. 
Connect up netd penalty box through NMS, and enforce the existing
background data flag by putting all UIDs in penalty box.  Allow
platform applications to have policy applied.  Only dispatch unique
rules to netd, avoiding any repeats.

Bug: 4598463, 4965677
Change-Id: Ibf9beff998ba7a1ea92f5e2f7eeba7b483d4b918
 2011-06-30 00:17:46 -07:00
Jeff Brown
d640125318 Merge "Fix joystick and trackpad regression." 2011-06-29 21:20:36 -07:00
Jeff Brown
2e45fb6f95 Fix joystick and trackpad regression. 
Change-Id: I33b6756f95a6b0725ffa210f341da3c98426491b
 2011-06-29 21:19:05 -07:00
Isaac Levy
3ee9d05d97 DnsPinger changes incl. binding 
- Now attempting to bind the socket
- Now pinging google.com rather than android.com

Change-Id: I7fb6522ef66068a6e2faca43d3af12c9f1d0585b
 2011-06-29 17:05:53 -07:00
Mathias Agopian
272aaa382f Merge "SF transactions are now O(1) wrt IPC instead of O(N)." 2011-06-29 16:15:56 -07:00
Chia-chi Yeh
5231b0af51 Merge "VPN: add a method to handle requests of legacy VPNs." 2011-06-29 16:08:26 -07:00
Chia-chi Yeh
85a7ce02c8 VPN: add a method to handle requests of legacy VPNs. 
The code is working but not complete yet.

Change-Id: Id8c8f137665373ad52c626b9d34e5a2cad028597
 2011-06-29 16:05:58 -07:00
Mathias Agopian
439863f3b3 SF transactions are now O(1) wrt IPC instead of O(N). 
Change-Id: I57669852cbf6aabae244ea86940a08a5a27ffc43
 2011-06-29 15:05:41 -07:00
Dianne Hackborn
2c22882181 Merge "Plumb information from the framework about asec container size." 2011-06-29 14:05:01 -07:00
Mike Lockwood
0ccdc9247d Merge "GPS: Support for on-demand NTP time injection" 2011-06-29 12:47:05 -07:00
Mike Lockwood
9b9fb5cc08 GPS: Support for on-demand NTP time injection 
Change-Id: I83db0249c13598070ed70b9f90207305b60b468f
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-29 15:09:40 -04:00
Jeff Sharkey
afb60c36b7 Merge "Push interface quota rules from NetworkPolicyManager to kernel." 2011-06-29 10:53:06 -07:00
Ashish Sharma
50fd36d7c3 Push interface quota rules from NetworkPolicyManager to kernel. 
Change-Id: Id2b758f561820b44839f69bf5fbd676cae771fe3
 2011-06-29 10:51:06 -07:00
satok
cbd9752e53 Merge "Fix setAdditionalSubtypes" 2011-06-29 07:22:31 -07:00