summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Send ACTION_MANAGED_PROFILE_REMOVED broadcast."Amith Yamasani2014-05-021-0/+16
|\
| * Send ACTION_MANAGED_PROFILE_REMOVED broadcast.Adam Connors2014-05-021-0/+16
| | | | | | | | | | | | | | When the managed profile is removed, this new intent is used to inform the rest of the system. Change-Id: I1748bed0a7ee0122f69d5c78235a79f8e205efec
* | Fix issue #14492403: Oom scores appear to be incorrect...Dianne Hackborn2014-05-021-2/+2
| | | | | | | | | | | | | | | | ...and causing runtime restarts Got a little too aggressive with the delete key. *blush* Change-Id: Icd4637827424211abc2347f7f9407c2d4c95cfad
* | Merge "Make GET_TASKS signature|system."Dianne Hackborn2014-05-026-277/+36
|\ \
| * | Make GET_TASKS signature|system.Dianne Hackborn2014-05-026-277/+36
| |/ | | | | | | | | | | | | | | | | | | | | Normal apps can't hold it now. If they try to use getRecentTasks() or getRunningTasks() without the permission, they will only see their own tasks and home in the list. Also took this opportunity to eradicate all of the old pending thumbnail stuff. Change-Id: I6dc52a06221c78097162e4a8b482027b798bf3ee
* | Merge "Add playback state and metadata to dump"RoboErik2014-05-021-0/+9
|\ \ | |/ |/|
| * Add playback state and metadata to dumpRoboErik2014-05-011-0/+9
| | | | | | | | Change-Id: I813ff23c496f75776c8bd63f78bbe87683b19bc0
* | Merge "API for network cache subsystems."Jeff Davidson2014-05-021-15/+77
|\ \
| * | API for network cache subsystems.Jeff Davidson2014-04-301-15/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A network subsystem (e.g. Wi-Fi) will be responsible for implementing INetworkScoreCache. NetworkScoreService will load caches for each configured network subsystem. When it receives a call to update scores, it will separate the networks by type and call updateScores on the appropriate INetworkScoreCache. Each subsystem will also be responsible for requesting scores for new networks by calling NetworkScoreManager#requestScores. Bug: 14408144 Bug: 14137255 Change-Id: I76e5e5205bc359c39d6b9c1782126fb7f465cd96
* | | Fix unmatched jni method name.Jungshik Jang2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | It breaks systemserver Change-Id: Iecc5600d64a273c4bbf51bd8fd779a79a3dab107
* | | Implement logical address allocation logic for HDMI CEC.Jungshik Jang2014-05-021-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logical address in CEC is to distinguish each logical device from others. In order to allocate logical address for new device, CEC sends <Polling Message> to CEC bus. <Polling Message> is a CEC message which has the same address for both source and destination without body frame. (10bits). CEC allows one and more logical address for a device type. For example, there are 3 logical address defined for recorder device(1, 2, 9). Among logical address candidates for the given device type, CEC scans first the previous logical address (preferred logical address) of device. If a device has not been allocated any logical address, preferred address will be 15 (Unregistered), which means scan address from the minimum address number of type. For example for recorder device, it starts from 1. If no devices acks to the <Polling Message> during scan, it will be the logical address of the device. Since logical address is determined by a series of sending <Polling Message> it happens in IO thread with separate allocate logical address message instead of individual sendCommand message. Along with this, updated ADDR_FREE_USE(14) to ADDR_SPECIFIC_USE(14) which is revised name on HDMI 1.4. Change-Id: Ic96dcdbe4aaa3789cfed0352a88ca75369335a98
* | | Merge "resolved conflicts for merge of 4f8cd188 to master"Jeff Brown2014-05-021-2/+2
|\ \ \
| * \ \ resolved conflicts for merge of 4f8cd188 to masterJeff Brown2014-05-011-2/+2
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3
| | * \ \ am 7f6ab17d: Merge "Clean up some terminology related to interactive state." ↵Jeff Brown2014-05-011-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit '7f6ab17d414726868563105cd995b37dd519320b': Clean up some terminology related to interactive state.
| | | * | | Clean up some terminology related to interactive state.Jeff Brown2014-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
* | | | | | Implement add/remove device info api for Hdmi Cec device.Jungshik Jang2014-05-021-0/+72
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to manage info of all cec devices connected hdmi bus, HdmiCecController should have data structure for them. This change includes two major pieces. 1. HdmiCecDeviceInfo It's data structure containing basic device information such as logical address, physicall address, device type and vendor id. It will not be available to thirdparty but some system component like TIF needs this to update device information connected to its hdmi ports. 2. Managing device list in HdmiCecController. HdmiCecController is a host to manage all CEC device. and we need to have logic add or remove as well as get it. All cec devices are managed as sparsearray which uses logical address as key. This change introduces internal api and the later change will have logic to call these apis. Change-Id: Idc2f189ac0bffe904e011ced0ac991f16da07db1
* | | | | Merge "Implement native send and receive logic for HdmiCecController."Jungshik Jang2014-05-023-38/+262
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Implement native send and receive logic for HdmiCecController.Jungshik Jang2014-04-303-38/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change includes native jni implementation for incoming and outgoing message of CEC. For incoming message, native layer converts it into three pieces, source address (initiator), destination address (follower) and data body which includes opcode. In Java layer, it is delegated to main io thread. For now all messages are rejected by sending <Feature Abort> to initiator. For outoging message, all messages are sent to io thread and it delegates it into native layer. Native logic converts it into cec_message and pass it to HAL so that HAL performs sending message. In order to handle <Feature Abort> message, added [Abort reason] which is defined in hdmi_cec.h. Change-Id: If9fd74745f476105e5cfae964e39c78bae69d3e2
* | | | | am 2de2e225: am e3cceef7: am 0f7c0570: Merge "Minor cleanup of ↵Brian Carlstrom2014-05-011-130/+132
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | UsageStatsService" * commit '2de2e22540441fd02e03abae5bcae8feb873b929': Minor cleanup of UsageStatsService
| * | | | am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"Brian Carlstrom2014-05-011-130/+132
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3cceef7ececdac1c6df65d3f7a1557ac3ce5e3c': Minor cleanup of UsageStatsService
| | * \ \ \ 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 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is ↵Narayan Kamath2014-05-011-6/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null." * commit '5dca099df7100c531e111b50435605c318f1e6d4': Don't adjust ABI if PackageSetting#pkg is null.
| | * | | | | 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 c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic."Narayan Kamath2014-05-011-18/+32
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c1f81f9086037dde6e082b8a80c84277cb727726': Fix dex file pruning logic.
| | * | | | | 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 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps."Narayan Kamath2014-05-012-0/+66
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '51f4367cac606580a5ca10ec1cf2dcab3982aebc': Adjust instruction sets for shared UID apps.
| | * | | | | 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
| * | | | | | resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aospNarayan Kamath2014-05-012-98/+251
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a
| | * | | | | 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 d85ded89: am 645a920f: Merge "Fix OEM native library path bug."Narayan Kamath2014-05-011-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd85ded890d86d454a0571c63911ff911633e3a95': Fix OEM native library path bug.
| | * | | | | 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 eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"Narayan Kamath2014-05-011-4/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'eb5734989b3ef5455359f8807684a860ad04c134': Fix native-lib dir assignment & updating
| | * | | | | 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 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"Narayan Kamath2014-05-011-15/+45
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '99253c2da945cbd4725efced6cac2dc40c858d6c': Handle /oem and /vendor as well
| | * | | | | 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 a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps"Narayan Kamath2014-05-011-3/+29
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a7b465efc4eede46b8dfc8932c6c30346e8e79de': Support per-package lib dirs for bundled apps
| | * | | | | 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
| | * | | | | am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to ↵Michael Wright2014-04-302-0/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputWindowInfo::isTrustedOverlay()" * commit '8a02b20f6f3fdd5baa5d22321769303ce76ba80a': Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
| | | * | | | Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"Michael Wright2014-04-292-0/+2
| | | |\ \ \ \
| | | | * | | | Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()Zach Swasey2014-04-212-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where a View with filterTouchesWhenObscured will have all touches filtered when in magnification accessibility mode. This is due to magnification being a separate Window over top of the running Activity. The method onFilterTouchEventForSecurity in View will then always return false when filterTouchesWhenObscured is enabled on the View. By adding the magnification Window to the list of Trusted Overlays we can ensure that touches will work properly with this property enabled. Change-Id: I07706588a625682d05da5cb19f401139eb08a54c
| | * | | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-2932-541/+1215
| | |\ \ \ \ \ \