summaryrefslogtreecommitdiffstats
path: root/services/java/com/android
Commit message (Collapse)AuthorAgeFilesLines
...
| * Hide IFingerprintService and IFingerprintServiceReceiverJim Miller2014-06-171-1/+0
| | | | | | | | | | | | | | | | The @hide was being ignored because they were being used by the constructor. Fixed by making the FingerprintManager constructor hidden. Change-Id: I3cd409df5055579f5004b08d00d5d951b8e5afd3
* | Refactor BatteryService to new pattern.Jeff Brown2014-06-171-13/+3
| | | | | | | | | | | | Apply SystemService pattern to BatteryService. Change-Id: I4971b2da8d2aed4d14440fb65863a8b916bab03c
* | Resolve boot time dependencies related to the power manager.Jeff Brown2014-06-171-171/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a bug where native daemons may try to communicate with the power manager before it was fully initialized due to a race between publishing the binder service and completing init(). The solution was to simplify the dependencies related to the power manager. It turns out that most services that were passed in init are not actually needed until systemReady. What remained was a dependency on the activity manager to check permissions for incoming calls. So now we start activity manager first. However, the activity manager also depends on power manager for wakelocks. To break the cycle, we now defer initializing the activity manager's wakelocks until after the power manager has been started. Cleaned up a bunch of boot-time service dependencies so that we can have better confidence that they are correctly maintained. Bug: 13884219 Change-Id: If08e2d7ccd44e7026a72441bb6bd5afd7bb9fffe
* | Merge "Switch everything to scheduled jobs"Christopher Tate2014-06-171-8/+1
|\ \ | |/ |/|
| * Switch everything to scheduled jobsChristopher Tate2014-06-171-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | Everything that used the IdleMaintenance APIs/broadcasts gets to use the spiffy new JobScheduler instead. Hooray! On top of that, the now-obsolete "idle maintenance" APIs are now gone entirely. Double hooray! Bug 14993295 Change-Id: I5fb67c296ca8cd0ba8a2c8760a0f0d9d962d813b
* | First pass at FingerprintService integration with HAL.Jim Miller2014-06-171-0/+10
|/ | | | | | | | | Move FingerprintService to framework services directory Fix merge conflicts. Tested: scanning, enrolling, removing. Change-Id: I58b2b902cb671dc82cdaa54a195ba5f1a154622c
* am 34852095: Merge "Don\'t enable Ethernet on the emulator." into ↵Lorenzo Colitti2014-06-111-5/+13
|\ | | | | | | | | | | | | lmp-preview-dev * commit '34852095d9148945edc39c2df9513c41998eb55b': Don't enable Ethernet on the emulator.
| * Merge "Don't enable Ethernet on the emulator." into lmp-preview-devLorenzo Colitti2014-06-101-5/+13
| |\
| | * Don't enable Ethernet on the emulator.Lorenzo Colitti2014-06-101-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't start the Ethernet service on the emulator because it interferes with qemu's SLIRP emulation, which uses IPv4 over eth0. Bug: 15341003 Change-Id: I4041a17b19a4861cae4fbf47ab5e05b007385e19
* | | am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-devChristopher Tate2014-06-111-4/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'd8f71d34c3c7fb161a1586de8edb52161c32d672': Out with the old; in with the new
| * | Out with the old; in with the newChristopher Tate2014-06-101-4/+4
| |/ | | | | | | | | | | | | | | Switch to the official "JobScheduler" etc naming. Bug 14997851 Change-Id: I73a61aaa9af0740c114d08188bd97c52f3ac86b7
* | merge 4ce22057, regen api/current.txtEd Heyl2014-06-091-8/+0
|\ \ | |/ | | | | Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
| * Remove HdmiCecServiceJinsuk Kim2014-06-091-8/+0
| | | | | | | | | | | | | | The service is replaced with HdmiControlService. Removing all the related classes and the initialization of the service. Change-Id: Ic7baaddffb9873613ddd1096e874f226da983939
* | resolved conflicts for merge of ebe661c4 to masterJae Seo2014-06-031-1/+1
|\ \ | |/ | | Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
| * Put TV Input Framework under android.media.tv, including TvContractJae Seo2014-06-021-1/+1
| | | | | | | | | | Bug: 15345342 Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
* | WifiService and WifiPasspointService hook upYuhao Zheng2014-06-021-5/+5
| | | | | | | | | | | | | | - add a reference to passpoint service in wifi state machine - break dependency loop at boot phase Change-Id: I34c0ce55efa5235ebaba1fa6772f559d608ee5ba
* | Derive LauncherAppsService from SystemServiceAmith Yamasani2014-06-011-2/+1
| | | | | | | | | | | | And encapsulate the aidl interface implementation. Change-Id: Id9a2544b411648e2596de18682079a64e95b0710
* | Restrictions ManagerAmith Yamasani2014-05-311-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mechanism to register a provider for requesting an administrator to respond to permission requests. Request format and response format constants. Description of manifest template for static restrictions. Int type introduced in RestrictionEntry. Needs more javadoc and better description of manifest templates, including specifying the XML attributes. Change-Id: I5a654d364e98379fc60f73db2e06bf9a8310263d
* | resolved conflicts for merge of 92ab0b91 to masterJeff Brown2014-05-291-14/+1
|\ \ | |/ |/| | | Change-Id: I66d6849700759163669faa930f07a7e968df5155
| * am aeb4e071: Merge "Add dumpsys to dock observer." into klp-modular-devJeff Brown2014-05-301-14/+1
| |\ | | | | | | | | | | | | * commit 'aeb4e071abb100d10c39d154b05c2911d399395d': Add dumpsys to dock observer.
| | * Add dumpsys to dock observer.Jeff Brown2014-05-291-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor refactoring of dock observer to allow its state to be inspected and modified via dumpsys for debugging purposes. eg. View current state. adb shell dumpsys DockObserver eg. Simulate being docked. adb shell dumpsys DockObserver set state 1 eg. Reset back to normal. adb shell dumpsys DockObserver reset Change-Id: Ie48db775290ebed9aa4d9d9d5ac5a6fcb6122ac9
| * | resolved conflicts for merge of 452c5921 to klp-modular-dev-plus-aospBrian Carlstrom2014-05-281-1/+1
| |\ \ | | | | | | | | | | | | Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678
| | * \ am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '197565e0e800be3c731e679914f40afa1aab98fd': Move to dalvik.vm.lib.2 to force default to libart
| | | * | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14298175 (cherry-picked from commit 2ef5abb8d534f016582d6023054cbe69d8114b6b) Change-Id: Icd91982c09076e87092906106cbff4a81589e8de
| | * | | am d5ee4144: Merge "Increase start timeout for wrapped process"Dmitriy Ivanov2014-05-231-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'd5ee4144c4beae54219e1b8eb10418b02dd4a63b': Increase start timeout for wrapped process
| | | * | Increase start timeout for wrapped processDmitriy Ivanov2014-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * apparently 300*1000 for valgrind is not enough (hammerhead aosp tot). Change-Id: Ia3f26cb67d3aa0ebdec68f3c1a764bad5e7f4f95
| | * | | am 838b1e22: Merge "Fix NPE in PackageManagerService."narayan2014-05-211-10/+12
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '838b1e2215cbc27e77530f4c79124c088353e0e7': Fix NPE in PackageManagerService.
| | | * | Fix NPE in PackageManagerService.narayan2014-05-211-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that each package from the setting has a parsed pkg before we attempt to perform dex-opt on it. If it doesn't have a parsed package, adjust the ABI in the settings, but don't perform dexopt. It will be dexopted later if it's still active based on the setting. bug: 15081286 Change-Id: Ifb6d1d5efdc9c59b251731972afa951ad930d05c
| | * | | am ec71fed0: Merge "Improve ABI handling for shared user ids."Brian Carlstrom2014-05-211-26/+71
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'ec71fed089965c4d731eaa90344849a1775f937a': Improve ABI handling for shared user ids.
| | | * | Improve ABI handling for shared user ids.Narayan Kamath2014-05-201-26/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The key improvement is that we need to keep track of the package that's currently being scanned (this includes new installs and upgrades of existing packages) and treat it specially. If we didn't do that, In the case of upgrades we would perform the shared UID calculation based on the ABI of the old package, and not the current package. This change also allows us to perform the CPU ABI calculation before dexopt, which saves us from having to do it twice and fixes a bug where we were using the wrong package path to dexopt a package. This also has the side effect of fixing 15081286. bug: 15081286 Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
| | * | | am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."Narayan Kamath2014-05-191-17/+25
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'a4fd1baac68dcd73957e0fca0c02089ecf9a268a': Fail if we're unable to agree on an ISA for shared UIDs.
| | | * | Fail if we're unable to agree on an ISA for shared UIDs.Narayan Kamath2014-05-191-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not worth the complexity of rescanning the APK and extracting a shared library with a different ABI. Also gets rid of an unnecessary command line argument and checks for dex-opt failures while adjusting shared ABIs. bug: 14453227 Change-Id: I6a0695e24cba37e93540c540507088e95b89089b
| | * | | am 706b1d7e: Merge "Remove "required" prefix from ABI fields."Narayan Kamath2014-05-155-54/+54
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '706b1d7ea0214b6858730e68c95c6a6d6d9a4c30': Remove "required" prefix from ABI fields.
| | | * | Remove "required" prefix from ABI fields.Narayan Kamath2014-05-155-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per a comment on an earlier code review. (cherry-picked from commit a9d64733421d6765eab5c2730fa912f068e26047) Change-Id: I064cffc13c323b721f3a16c83e0e95ee348ef9f6
| | * | | am b7d7cbc9: Merge "Fix background PackageUsage writing."Brian Carlstrom2014-05-131-4/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'b7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a': Fix background PackageUsage writing.
| | | * | Fix background PackageUsage writing.Brian Carlstrom2014-05-121-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia358b61e648b427c86cf75ae096cd2a68ace209f
| | * | | am b98ca5b0: Merge "If PackageUsage information is missing, treat as first ↵Brian Carlstrom2014-05-091-1/+8
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | boot and compile everything" * commit 'b98ca5b0dd73f374178022b4a4b37412f01a3c03': If PackageUsage information is missing, treat as first boot and compile everything
| | | * | If PackageUsage information is missing, treat as first boot and compile ↵Brian Carlstrom2014-05-091-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | everything Bug: 14663243 Change-Id: I0ae33882044211f777590f482e17e87596be4463
* | | | | 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