summaryrefslogtreecommitdiffstats
path: root/services/java
Commit message (Collapse)AuthorAgeFilesLines
* Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| | | | | Bug: 14298175 Change-Id: I8afa91bddfb6fec6b61c39286a16594eb947830e
* DO NOT MERGE - Run the task manager service at startupChristopher Tate2014-05-231-0/+5
| | | | | | | | Also moves most of it into android.app.task rather than android.content. (Cherrypick from master) Change-Id: Ic07a664bf54bc3e40aa0b892946edba4bf37262a
* Make the EthernetManager available.Lorenzo Colitti2014-05-211-0/+8
| | | | Change-Id: I7a60e977d7a40a5d0367168f2f6633ccae591ac4
* Fix a boot failure due to Wifi / Wifi PasspointYuhao Zheng2014-05-201-4/+4
| | | | | Bug: 15060373 Change-Id: Ie72fd2e4b855c46a8f9ed12deb8b07fd0c29f522
* Fix a runtime break caused by merge conflictVinit Deshpande2014-05-201-1/+1
| | | | | | | | | Kwd changed the name of WifiHotspotService to PasspointService; and the reference to the name was moved in master. Merge ended up picking up incorrect name WifiPasspointService. This change fixes that. Bug: 15106138 Change-Id: Ib6d8aee53db39314a9d98abcbd8e0863210de1bb
* Hotspot 2.0 framework APIs -- initial implementationYuhao Zheng2014-05-181-4/+4
| | | | | | | | Cherry-picked from klp-wireless-dev-mirror SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4 Bug: 5485670 Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5
* Merge "AudioService/WireAccessoryManager: change boot completion detection ↵Eric Laurent2014-05-081-1/+9
|\ | | | | | | method"
| * AudioService/WireAccessoryManager: change boot completion detection methodEric Laurent2014-05-061-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | BOOT_COMPLETED intent is not a reliable way for system services to detect boot completion. The intent broadcast can be significantly delayed and there is no guaranty that system services receive it before apps. Use a systemReady() method called by SystemServer instead. Bug: 14323903. Change-Id: I781596a3545e7a1e719799982347cbcd9a4c9009
* | Initial implementation of WifiScannerVinit Deshapnde2014-05-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | This change implements basic functionality of WifiScanner. Following functionality is enabled 1. Scanning - specify a list of channels to scan 2. Significant change detection 3. AP hotlist Change-Id: Ieef75b96bdbbd3c7d9b9e698bd16e64d3b465254
* | initial Best Network Selection implementationvandwalle2014-05-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -add dhcpserver, defaultGwMAC address, linked configuration and user choices link lists to WiFiconfiguration -add default gateway mac address to RouteInfo -add a Date to the ScanResult -add BSSID date to the WifiConfiguration - make framework auto-join into a config option - add Settings option for showing RSSI in Wifi picker view; add auto-join specific status to WifiConfiguration Change-Id: I5cfc4f2a48c9f3bc9766e8e68e24eff7b57f2821 Changes to be committed: modified: core/java/android/provider/Settings.java modified: wifi/java/android/net/wifi/ScanResult.java modified: wifi/java/android/net/wifi/WifiConfiguration.java
* | resolved conflicts for merge of 0b5598c9 to masterBrian Carlstrom2014-05-071-0/+8
|\ \ | |/ |/| | | Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
| * am 691079dd: am a21ba5be: Merge "Add BackgroundDexOptService"Brian Carlstrom2014-05-072-0/+99
| |\ | | | | | | | | | | | | * commit '691079ddc0055fac9b82dccaf35b4591978b2a55': Add BackgroundDexOptService
| | * am a21ba5be: Merge "Add BackgroundDexOptService"Brian Carlstrom2014-05-074-2/+183
| | |\ | | | | | | | | | | | | | | | | * commit 'a21ba5bec748e2f10d7e6d38181ec1124991cb60': Add BackgroundDexOptService
| | | * Add BackgroundDexOptServiceBrian Carlstrom2014-05-064-2/+183
| | | | | | | | | | | | | | | | Change-Id: I0439a04f693ba92df906cbda34f8e53b32f63329
| | * | am edb88bcd: Merge "Use package usage information to decide what dex files ↵Brian Carlstrom2014-05-073-72/+277
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | to optimize in PackageManagerService" * commit 'edb88bcd232176e575f2dbee2cfdb1bfbe33faef': Use package usage information to decide what dex files to optimize in PackageManagerService
| | | * Use package usage information to decide what dex files to optimize in ↵Brian Carlstrom2014-05-063-72/+277
| | | | | | | | | | | | | | | | | | | | | | | | PackageManagerService Change-Id: Iac137311e2e9d5139b5aa8651c6f3d296802612a
| | * | am 0f7c0570: Merge "Minor cleanup of UsageStatsService"Brian Carlstrom2014-05-011-130/+132
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '0f7c0570e091a284481c2406d8275d87c3786c1d': Minor cleanup of UsageStatsService
| | | * Minor cleanup of UsageStatsServiceBrian Carlstrom2014-05-011-130/+132
| | | | | | | | | | | | | | | | Change-Id: Idea0e29f347d14e48e87aad38a261d0493bd5fd3
| | * | am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."Narayan Kamath2014-05-011-6/+7
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '1cec7f8539e6465ff80577169d7d07df3c2574b7': Don't adjust ABI if PackageSetting#pkg is null.
| | | * Don't adjust ABI if PackageSetting#pkg is null.Narayan Kamath2014-05-011-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If means the package hasn't been scanned yet, and we will adjust the ABI during the scan of the last package in the shared user group. NOTE: This needs some more cleaning up, which will be done along with the remaining TODO in this function. (cherry picked from commit 6609990e35b11c38f55f6e632160d4f2ff201ea3) Change-Id: Ibace7849485865054e062d2b979f320bf89ff0f3
| | * | am 27f2bfc4: Merge "Fix dex file pruning logic."Narayan Kamath2014-05-011-18/+32
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '27f2bfc406157039c5241f6a4f38f597b2076e2a': Fix dex file pruning logic.
| | | * Fix dex file pruning logic.Narayan Kamath2014-05-011-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should now prune all normal files from /data/dalvik-cache in addition to looking for dex files in all subdirectories of /data/dalvik-cache. (cherry picked from commit 51a6f9253399588eedf77d75c578d9aa23d11529) Change-Id: I536dfdc48e94155e7be64eb4efd9f7f2a1d2d00a
| | * | am bcc3b312: Merge "Adjust instruction sets for shared UID apps."Narayan Kamath2014-05-012-0/+66
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'bcc3b312b0662ae2f8b8444eaedd5f35fc75c411': Adjust instruction sets for shared UID apps.
| | | * Adjust instruction sets for shared UID apps.Narayan Kamath2014-05-012-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since shared UID apps are run in the same process, we'll need to make sure they're compiled for the same instruction set. This change implements the recompilation of apps that don't have any ABI constraints. Apps that *do* have ABI constraints are harder to deal with, since we'll need to rescan them to figure out the full list of ABIs they support and then re-extract the native libraries from these apps once we find an ABI we can use throughout. (cherry picked from commit 85703d58af1dac692d7d83c03220e45ab2a5aded) Change-Id: I8311a683468488cc7e30381965487a3d391609ae
| | * | am 2a9a0471: Merge "Package manager changes for dual zygote stack."Narayan Kamath2014-05-012-98/+251
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '2a9a047140b8da8f9cd7147c8bed60eeb61d1b6a': Package manager changes for dual zygote stack.
| | | * Package manager changes for dual zygote stack.Narayan Kamath2014-05-012-98/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pass down the app's instruction set to dexopt so that it can compile the dex file for the right architecture. - Also pass down the app's instruction set to rmdex, movedex and getSize so that they can construct the cache file location properly. - Temporarily compile "system" jars such as am,wm etc. for both architectures. A follow up change will ensure that they're compiled only for one architecture (the same arch. as the system server). - Java "shared" libraries are now compiled for the right architecture when an app requires them. - Improve the app native library ABI detection to account for system apps installed in /system/lib{64}/<packagename> and also handle sdcard and forward locked apps correctly. (cherry-picked from commit b4d35dc8e9702f9d0d82d35a105f0eea35672b52)
| | * | am 645a920f: Merge "Fix OEM native library path bug."Narayan Kamath2014-05-011-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '645a920fd2c478c545c6bb659f2eab36545fe116': Fix OEM native library path bug.
| | | * Fix OEM native library path bug.Jeff Sharkey2014-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13340779 (cherry picked from commit 7d3328d14bbbee01a9de1ff5b13b0446c709d835) Change-Id: I1b4c5d138cafe3651d475ca1e048f495ff6c5f10
| | * | am 986b901a: Merge "Fix native-lib dir assignment & updating"Narayan Kamath2014-05-011-4/+4
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '986b901ae280928e91193527f7c883b296fc62fc': Fix native-lib dir assignment & updating
| | | * Fix native-lib dir assignment & updatingChristopher Tate2014-05-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The per-package /system/lib/* feature introduced bugs in the native library path handling during app upgrade installs. The crux of the fix is that when recalulating the desired native library directory, the basis for the calculation needs to be the scanned APK's location rather than the extant package settings entry -- because that entry refers to the pre-upgrade state of the application, not the new state. Bug 14233983 (cherry picked from commit 353e39a973dbbadce82fee2f83ad194e04a47449) Change-Id: I26f17a596ca2cd7f963955c0642548c15138ae26
| | * | am fde59428: Merge "Handle /oem and /vendor as well"Narayan Kamath2014-05-011-15/+45
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'fde594288bff0b8f95567e6b27f273f50f0c5f87': Handle /oem and /vendor as well
| | | * Handle /oem and /vendor as wellChristopher Tate2014-05-011-15/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 13170859 (cherry-picked from commit 740888f62eae158d5775be716620f0d56d87f587) Change-Id: I7b5e206697fcbec146cac6cd83fca5c583a8cbd7
| | * | am d91358b2: Merge "Support per-package lib dirs for bundled apps"Narayan Kamath2014-05-011-3/+29
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'd91358b2b977ef7c3551a486f51475c0441aba6e': Support per-package lib dirs for bundled apps
| | | * Support per-package lib dirs for bundled appsNarayan Kamath2014-05-011-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bundled apps can now use /system/lib/apkname or /system/lib64/apkname in addition to the (globally shared) /system/lib and /system/lib64 directories. Note that when an app is updated post hoc the update APK will look to its normal library install directory in /data/data/[packagename]/lib, so such updates must include *all* needed libraries -- the private /system/lib/apkname dir will not be in the path following such an update. "apkname" here is the base name of the physical APK that holds the package's code. For example, if a 32-bit package is resident on disk as /system/priv-app/SettingsProvider.apk then its app-specific lib directory will be /system/lib/SettingsProvider Bug 13170859 (cherry picked from commit addfbdc09ccf258395db8bfc510989a4c583f7ab) Change-Id: Id82da78024a6325458b8b134d7d91ad0e5f0785e
| | * | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-2930-513/+1209
| | |\ \
| | | * \ am 9bbd2f97: am 2cacc619: Merge "Don\'t wait for finishing animation when ↵Craig Mautner2014-03-251-2/+7
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | second display is disconnected" * commit '9bbd2f977ba4d6c4642f96673f937a677ff0beb2': Don't wait for finishing animation when second display is disconnected
| | | * \ \ am ca903d38: am 81e094d7: Merge "Move task to top in window manager." into ↵Craig Mautner2014-03-251-0/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'ca903d3809ccd78b73b634ff7591863dbed55823': Move task to top in window manager.
| | | | * \ \ Merge "Move task to top in window manager." into klp-devCraig Mautner2014-03-251-0/+2
| | | | |\ \ \
| | | | | * | | Move task to top in window manager.Craig Mautner2014-03-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain situations it was possible for a task to move to the top in activity manager but not in window manager. This resulted in the task appearing behind the launcher icons. Fixes bug 13410184. Change-Id: If0582b395e126a8aff70a0e4c64b731083c6ae8a
| | | * | | | | am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on ↵Matthew Williams2014-03-244-28/+32
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reschedule. * commit '4701b51af216ce2b6fa9fa508ebba47bf13063c7': DO NOT MERGE: Downgrade expedited to normal on reschedule.
| | | | * | | | DO NOT MERGE: Downgrade expedited to normal on reschedule.Matthew Williams2014-03-244-28/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 12033540 Expedited was previously tracked by a redundant internal variable, ostensibly as an optimisation. This variable could differ from the value in the bundle depending on how the operation is initialised, which led to confusion. Now an expedited sync will only be treated as such on its first execution. Change-Id: Ibfc4e9e49b86c82f2364a6ef55f887705a053eb6
| | | * | | | | am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure ↵Craig Mautner2014-03-242-4/+22
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content is shown." * commit '103ed3558764f1fd41c9a5399e2030baa4110bfb': Set ScreenshotSurface secure if any secure content is shown.
| | | * \ \ \ \ \ am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into ↵Chad Brubaker2014-03-211-26/+51
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'eb3c0d9ac387bb0aea5b4956daac1403253bc76d': Fix support for simultaneous VPN tuns
| | | | * | | | | Merge "Fix support for simultaneous VPN tuns" into klp-devChad Brubaker2014-03-211-26/+51
| | | | |\ \ \ \ \
| | | | | * | | | | Fix support for simultaneous VPN tunsChad Brubaker2014-03-151-26/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A VPN can once again bring up a new tun interface while the old tun is running. Once the new tun is set up the routing rules will be removed from the old tun. It is up to the application to drain the old tun of traffic and close it. If the new tun fails to come up the old tun will remain untouched and can still be used. To prevent leakage the new rules are added before the old tun is shutdown. Netd/Dns has been changed to allow multiple rules to exist at once with the most recently added rule taking priority. Bug: 12134439 Change-Id: I7e00c7c68cc339d81f09b3d2a33276ffc76985f5
| | | * | | | | | | am 1fce89d9: am de4e7b49: Merge "Include the interface for ↵Chad Brubaker2014-03-212-3/+3
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clearDnsInterfaceForUidRange" into klp-dev * commit '1fce89d946760a1bcf3a733f55494f963eab00c2': Include the interface for clearDnsInterfaceForUidRange
| | | | * | | | | | Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-devChad Brubaker2014-03-212-3/+3
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Include the interface for clearDnsInterfaceForUidRangeChad Brubaker2014-03-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With netd allowing overlapping rules for uid range rules the interface name is needed to make sure only the correct rule is removed. Bug: 12134439 Change-Id: I94f77f154f49ca8d5f6cf49683a4473cc92c3eb7
| | | * | | | | | | am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race ↵Mike Lockwood2014-03-211-1/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition when starting USB accessory mode" into klp-dev * commit '71060db65e0e1c903b429c932cd6e27beec10a3e': UsbDeviceManager: A better fix for race condition when starting USB accessory mode
| | | | * | | | | | UsbDeviceManager: A better fix for race condition when starting USB ↵Mike Lockwood2014-03-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accessory mode On some devices, the USB "set configuration" command is propogated to the framework after the "start accessory" event is received. However, on other devices like the 2011 ADK board, no "set configuration" command is sent at all until we have reenumerated in acccessory mode. To fix the original problem without breaking other devices, we can simply remove assumptions about if or when "set configuration" will be received. Now we simply remain switch USB configuration to accessory mode when we receive the "start accessory" command, and remain there until the existing 10 second timeout expires. Bug: 13393825 Change-Id: I4c9e3423185bd7252a907e4568d9e3ff06044b7d
generated by cgit v1.1 at 2025-01-07 07:03:13 +0000