summaryrefslogtreecommitdiffstats
path: root/services/java/com
Commit message (Collapse)AuthorAgeFilesLines
* Merge 37dbfcafJean-Baptiste Queru2011-07-071-0/+62
|\ | | | | | | Change-Id: Iae55ecada8dc231c88bb87b32e8bd5e7b6a47bd0
| * am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns ↵Robert Greenwalt2011-07-061-0/+61
| |\ | | | | | | | | | | | | | | | | | | cache per interface" * commit '7022db4cd2ca3721631595d7379eabb2cc77f6a9': Added methods to support dns cache per interface
| | * am 38bb0123: Merge "Added methods to support dns cache per interface"Robert Greenwalt2011-07-061-0/+61
| | |\ | | | | | | | | | | | | | | | | * commit '38bb0123b8b9857c3119fd359739daf872f619d6': Added methods to support dns cache per interface
| | | * Merge "Added methods to support dns cache per interface"Robert Greenwalt2011-07-011-0/+61
| | | |\
| | | | * Added methods to support dns cache per interfaceMattias Falk2011-04-191-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some methods to NetworkManagementService as part of the work to implement a dns cache per interface. Change-Id: I5c7369075dee6b6a4ff67b27f1df7cc124f54c14
| * | | | am fa5e3b65: am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." ↵Dianne Hackborn2011-06-241-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit 'fa5e3b658f3f42eabec82c9f8e44d8a4cc565249': DO NOT MERGE. Fix density compat mode.
| | * \ \ \ am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2Dianne Hackborn2011-06-241-5/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d': DO NOT MERGE. Fix density compat mode.
| | | * | | | DO NOT MERGE. Fix density compat mode.Dianne Hackborn2011-06-231-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue #4770360: older app compatibility mode is really tiny on ICS phones We were applying the density compat mode scaling multiple times to display metrics, causing bad values. Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
* | | | | | | Merge "Moved WifiWatchdogService and DnsPinger"Irfan Sheriff2011-07-063-996/+1
|\ \ \ \ \ \ \
| * | | | | | | Moved WifiWatchdogService and DnsPingerIsaac Levy2011-07-063-996/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moved WWS and DnsPinger in prep for StateMachine rewrite intent. Change-Id: I912ca80d31ee2ded99eb345a2e5a55d01bd9910c
* | | | | | | | Merge "Add the "debug.jni.logging" property so third-party developers can ↵Elliott Hughes2011-07-061-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | debug their JNI problems."
| * | | | | | | | Add the "debug.jni.logging" property so third-party developers can debug ↵Elliott Hughes2011-07-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | their JNI problems. This turns on the super-verbose but indispensible logging of all native method calls and all calls to JNI functions (for third-party code only). In particular, if you have a local reference bug, you can search for the reference given in the crash and see exactly where it came from. In every case I've seen so far, that's pinpointed the bug exactly. Change-Id: Ifb7ba02ae637bdd53cd8500febdcb9d4d7799bda
* | | | | | | | | Merge "UsbDeviceManager: Initialize RNDIS ethernet address based on device ↵Mike Lockwood2011-07-061-1/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | serial number"
| * | | | | | | | | UsbDeviceManager: Initialize RNDIS ethernet address based on device serial ↵Mike Lockwood2011-07-061-1/+27
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number Change-Id: I4775e5d8350385777f70f1b28ac00aa22dbd9487 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | Merge "Addressing comments during security review of the interrogation feature."Svetoslav Ganov2011-07-061-37/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Addressing comments during security review of the interrogation feature.Svetoslav Ganov2011-07-061-37/+47
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Pretty much minor fixes for improving readability. Change-Id: I76efdcc574af9a277b54eeb9fb5caf34948fcfde
* | | | | | | | | Make full backup API available to appsChristopher Tate2011-07-062-25/+50
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New methods for full backup/restore have been added to BackupAgent (still hidden): onFullBackup() and onRestoreFile(). The former is the entry point for a full app backup to adb/socket/etc: the app then writes all of its files, entire, to the output. During restore, the latter new callback is invoked, once for each file being restored. The full backup/restore interface does not use the previously-defined BackupDataInput / BackupDataOutput classes, because those classes provide an API designed for incremental key/value data structuring. Instead, a new FullBackupDataOutput class has been introduced, through which we restrict apps' abilities to write data during a full backup operation to *only* writing entire on-disk files via a new BackupAgent method called fullBackupFile(). "FullBackupAgent" exists now solely as a concrete shell class that can be instantiated in the case of apps that do not have their own BackupAgent implementations. Along with the API change, responsibility for backing up the .apk file and OBB container has been moved into the framework rather than have the application side of the transaction do it. Change-Id: I12849b06b1a6e4c44d080587c1e9828a52b70dae
* | | | | | | | Merge "UsbService: USB connected notification now redirects to USB screen in ↵Mike Lockwood2011-07-061-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings"
| * | | | | | | | UsbService: USB connected notification now redirects to USB screen in SettingsMike Lockwood2011-07-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2dc6d1294da53acfa7589ba5b693ec671695cd21 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | Fix NPE in getLastInputMethodSubtypesatok2011-07-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4991393 Change-Id: I4ced2a2ca4815c7cee84a72dc6131fb8c4ee7216
* | | | | | | | | VPN: implement status report for legacy VPN.Chia-chi Yeh2011-07-042-21/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81c28dafd9588572df76cbc303b0d6a0f41f9bc6
* | | | | | | | | VPN: rename some variables.Chia-chi Yeh2011-07-031-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f15b5ab30f591e26242fca27af25f578809534c
* | | | | | | | | VPN: convert prepare() into a form which helps solve race conditions.Chia-chi Yeh2011-07-032-32/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When someone tries to revoke packageA, it is possible that packageA is already revoked by packageB. In this case packageB should not be revoked, and the new prepare() can help solve this problem. Change-Id: Iee056a191dd99467b8ad1b5379a17b02d404bad1
* | | | | | | | | VPN: minor refinement.Chia-chi Yeh2011-07-031-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b59cbe8554b6c6f8da48c465252489394f32653
* | | | | | | | | VPN: remove the old VpnService.Chia-chi Yeh2011-07-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now VPN is (kind of) integrated into ConnectivityService. Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55
* | | | | | | | | Merge "VPN: export legacy VPN in IConnectivityManager."Chia-chi Yeh2011-07-021-0/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | VPN: export legacy VPN in IConnectivityManager.Chia-chi Yeh2011-07-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1
* | | | | | | | | Merge "VPN: merge JNI methods."Chia-chi Yeh2011-07-021-20/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | VPN: merge JNI methods.Chia-chi Yeh2011-07-021-20/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy VPN needs to change routes by itself. Change-Id: I4cf6639f2b00225810f49704ae05797fc70921d9
* | | | | | | | | | Merge "VPN: give legacy VPN a fake package name."Chia-chi Yeh2011-07-021-58/+73
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | VPN: give legacy VPN a fake package name.Chia-chi Yeh2011-07-021-58/+73
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add more comments. Change-Id: I0cbc495fcb2c8dd105e16a841619b3b9bd227eae
* | | | | | | | | Merge "Drop obsolete touch screen hacks."Jeff Brown2011-07-011-12/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Drop obsolete touch screen hacks.Jeff Brown2011-07-011-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I47354c37ee2cc2b36340eb709bb5043b3ba78ed9
* | | | | | | | | | Merge "Don't crash when the load average service is started."Dianne Hackborn2011-07-011-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Don't crash when the load average service is started.Dianne Hackborn2011-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie40f549d50942793c940f8728ce9c392c25f4c60
* | | | | | | | | | Merge "When removing a task, also kill its processes."Dianne Hackborn2011-07-011-27/+27
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | When removing a task, also kill its processes.Dianne Hackborn2011-07-011-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5945fef21ad6f028e71e36d3cb55d35e0b6401a6
* | | | | | | | | Merge "Revert "Add keychain user with special keystore access permissions""Brian Carlstrom2011-07-011-5/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Add keychain user with special keystore access permissions"Brian Carlstrom2011-06-301-5/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8c2a1a90a81f04573bfa578eab32f5fd4a30eafb. Conflicts: cmds/keystore/keystore.c Bug:4970237 Change-Id: I626023d695becfada47e5f319b18e0889b766563
* | | | | | | | | UsbDeviceManager: Reset sys.usb.config if it is "none" at bootMike Lockwood2011-07-011-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to recover if we crash while changing USB configurations Change-Id: I22ba9a1ff0a8bcbfd4a0f18af0c95a3b66b99060 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | UsbService: Use Slog instead of Log, and disable some loggingMike Lockwood2011-07-013-32/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I094ab99919055848a9fa76363eae6d0df51de9fd Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | USB: Update strings for USB connected notificationsMike Lockwood2011-07-011-107/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have different strings depending on the current USB mode. Change-Id: Icc6392d5700a6fee008b75287d8eb0f06db1d880 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | VPN: integrate legacy VPN.Chia-chi Yeh2011-07-011-24/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00e77664354c05e0edfcd5fb2e3da2ca434ed521
* | | | | | | | | VPN: Use List<String> instead for dnsServers and searchDomains.Chia-chi Yeh2011-07-012-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d72c182ad47f59121a04b68ec6c2d164e2d00a8
* | | | | | | | | VPN: rename service(s) to daemon(s) to reduce confusion.Chia-chi Yeh2011-07-011-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9739e63c8e41e8b63d024dc4f17283c76bb4ff97
* | | | | | | | | VPN: fix the build.Chia-chi Yeh2011-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibeaa067cf95636e09746d16f402c78c99d7cb681
* | | | | | | | | Merge "VPN: refactor a little bit for the upcoming integration of legacy VPN."Chia-chi Yeh2011-06-301-27/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | VPN: refactor a little bit for the upcoming integration of legacy VPN.Chia-chi Yeh2011-06-301-27/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0fe0dffe59d8d9c9a0fdd05e07b07aa6c8da0a80
* | | | | | | | | | Merge "Migrate bandwidth control to NMS, omit history."Jeff Sharkey2011-06-304-37/+62
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Migrate bandwidth control to NMS, omit history.Jeff Sharkey2011-06-304-37/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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