summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* am 89b73a75: am 361a6ad1: Merge "Handle native library deletion in ↵Kenny Root2010-10-151-3/+0
|\ | | | | | | | | | | | | | | | | scanPackage" into gingerbread Merge commit '89b73a75467d85c58467c5b8c080c77d25860fe0' * commit '89b73a75467d85c58467c5b8c080c77d25860fe0': Handle native library deletion in scanPackage
| * am 361a6ad1: Merge "Handle native library deletion in scanPackage" into ↵Kenny Root2010-10-131-3/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '361a6ad16dedfed871c76e8fa64eb45aa82a0088' into gingerbread-plus-aosp * commit '361a6ad16dedfed871c76e8fa64eb45aa82a0088': Handle native library deletion in scanPackage
| | * Merge "Handle native library deletion in scanPackage" into gingerbreadKenny Root2010-10-131-3/+0
| | |\
| | | * Handle native library deletion in scanPackageKenny Root2010-10-131-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deletion of native libraries was initially added to FileInstallArgs.cleanUpResourcesLI() as a way to get rid of old native libraries during an upgrade, but it runs well after scanPackage unpacks the new native libraries. scanPackage now removes old libraries before unpacking the new ones, so we don't need this code anymore. Bug: 3087739 Change-Id: I54aca830ec34d6440ba22f117d55aa3107bf5b75
* | | | am b4f26a9d: am e6ae5c39: Merge "Add shutdown assurance" into gingerbreadKenny Root2010-10-151-0/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd' * commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd': Add shutdown assurance
| * | | am e6ae5c39: Merge "Add shutdown assurance" into gingerbreadKenny Root2010-10-131-0/+19
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'e6ae5c39848d2a3a6f3fb750811550969799e410' into gingerbread-plus-aosp * commit 'e6ae5c39848d2a3a6f3fb750811550969799e410': Add shutdown assurance
| | * | Add shutdown assuranceKenny Root2010-10-131-0/+19
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If something kills system_server before it completes its shutdown action, the runtime will just restart giving the illusion that a reboot for an OTA or something else has happened. To prevent this, write a system property containing the reboot reason before initiating the shutdown with all the services. If the system_server is killed before it completes, the next time the main thread of system_server starts up, it will immediately execute the shutdown action. Bug: 3022556 Change-Id: I81723bac333430f04205e7a7b799914d96f170eb
* | | am 1442818a: am c792c2e9: Merge "GPS: Remove unnecessary and broken test in ↵Mike Lockwood2010-10-141-3/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | AgpsRilInterface updateNetworkState glue" into gingerbread Merge commit '1442818a10988cc011f55104e997474b5d3d2468' * commit '1442818a10988cc011f55104e997474b5d3d2468': GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
| * | am c792c2e9: Merge "GPS: Remove unnecessary and broken test in ↵Mike Lockwood2010-10-131-3/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | AgpsRilInterface updateNetworkState glue" into gingerbread Merge commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e' into gingerbread-plus-aosp * commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e': GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
| | * Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface ↵Mike Lockwood2010-10-131-3/+1
| | |\ | | | | | | | | | | | | updateNetworkState glue" into gingerbread
| | | * GPS: Remove unnecessary and broken test in AgpsRilInterface ↵Mike Lockwood2010-10-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | updateNetworkState glue Change-Id: Ic934c478f0eb6c6d368caaf41aec8235d329ef34 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am 4ce930da: am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes ↵Dianne Hackborn2010-10-141-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActivityManager crash" into gingerbread Merge commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea' * commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea': Fix issue #3089800: adb shell am -W causes ActivityManager crash
| * | | am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes ↵Dianne Hackborn2010-10-121-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActivityManager crash" into gingerbread Merge commit '259c849989ccd30b0bb4569d11f125ed2c0c1911' into gingerbread-plus-aosp * commit '259c849989ccd30b0bb4569d11f125ed2c0c1911': Fix issue #3089800: adb shell am -W causes ActivityManager crash
| | * | Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" ↵Dianne Hackborn2010-10-121-2/+2
| | |\ \ | | | | | | | | | | | | | | | into gingerbread
| | | * | Fix issue #3089800: adb shell am -W causes ActivityManager crashDianne Hackborn2010-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I5508afeb523d84e552117f94c8b70e2bae2c33fa
| * | | | am 590b73bc: NFC API revision round 2.Nick Pelly2010-10-121-90/+136
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp * commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6': NFC API revision round 2.
| | * | | NFC API revision round 2.Nick Pelly2010-10-121-90/+136
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag, RawTagConnection, NdefTagConnection. - Add implementations for all of the new NFC API. Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | NFC API revision round 2.Nick Pelly2010-10-141-90/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag, RawTagConnection, NdefTagConnection. - Add implementations for all of the new NFC API. Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6 Signed-off-by: Nick Pelly <npelly@google.com> Conflicts: Android.mk CleanSpec.mk core/java/android/app/ContextImpl.java
* | | | Actually draw the drag thumbnailChris Tate2010-10-141-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now sets the layer and thumbnail dimensions correctly. Also removed the leftover bits of the now-replaced thumbnail measurement/drawing mechanism. Fixes bug 3077339 Change-Id: I02983648e0a7ce2ce5fee10825f744e20a3a5b8d
* | | | am 8a703c77: am 8e2be267: Add versionCode and versionName to dumpsys packagesAndy Stadler2010-10-131-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '8a703c772ef233998fccfbdb159c8879c72fa5d3' * commit '8a703c772ef233998fccfbdb159c8879c72fa5d3': Add versionCode and versionName to dumpsys packages
| * | | am 8e2be267: Add versionCode and versionName to dumpsys packagesAndy Stadler2010-10-121-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58' into gingerbread-plus-aosp * commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58': Add versionCode and versionName to dumpsys packages
| | * | Add versionCode and versionName to dumpsys packagesAndy Stadler2010-10-121-0/+2
| | | | | | | | | | | | | | | | | | | | bug: 3090491 Change-Id: If116baaeb83bd282c5c5534fde6248f19830a71c
* | | | am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbreadJoe Onorato2010-10-137-220/+437
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96' * commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96': Remove dead code, and make the animation a setting. turn off the electron beam
| * | | am ba799098: Merge changes I76513387,I335fb671 into gingerbreadJoe Onorato2010-10-127-220/+437
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp * commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e': Remove dead code, and make the animation a setting. turn off the electron beam
| | * | Remove dead code, and make the animation a setting.Joe Onorato2010-10-123-213/+183
| | | | | | | | | | | | | | | | | | | | | | | | When we don't do the brightness fade, turn off the electron beam instead. Change-Id: I76513387c4fb420a67e59e005f6e8c3bc72f7f08
| | * | turn off the electron beamMathias Agopian2010-10-124-7/+254
| | | | | | | | | | | | | | | | Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
* | | | Allow notifications to not specify a contentIntent.Joe Onorato2010-10-131-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If they don't, the click events will be passed through to the individual views in the notification view, which may have their own PendingIntents attached. Previously, it was against the UX spec to allow this, but now we are changing that and will have buttons in there. Change-Id: I674234212f64b2b8802a0708b7eed0614e147ca3
* | | | am 4b255a23: am 03aa28fb: Merge "Improve the input policy handling a bit." ↵Jeff Brown2010-10-131-44/+64
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '4b255a23041225103a6870e77a236f78c2816eda' * commit '4b255a23041225103a6870e77a236f78c2816eda': Improve the input policy handling a bit.
| * | | am 03aa28fb: Merge "Improve the input policy handling a bit." into gingerbreadJeff Brown2010-10-121-44/+64
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '03aa28fb36589a3d601be08e75c08a24c4344d6f' into gingerbread-plus-aosp * commit '03aa28fb36589a3d601be08e75c08a24c4344d6f': Improve the input policy handling a bit.
| | * | Improve the input policy handling a bit.Jeff Brown2010-10-121-44/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some issues with Monkeys turning off their own screens. Ook ook! Added some more comments to explain what's going on. Change-Id: Id2bc0466161a642a73ef7ef97725d1c81e984b12
* | | | Merge "Dynamically show the menu button on the system bar."Daniel Sandler2010-10-131-2/+31
|\ \ \ \
| * | | | Dynamically show the menu button on the system bar.Daniel Sandler2010-10-131-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows with FLAG_NEEDS_MENU_KEY (or windowNeedsMenuKey=true in their theme) will cause the system bar to show a menu icon. (Note that the phone's status bar currently ignores this, but phones tend to have hardware menu keys anyway.) Additionally, all windows whose package's SDK version is pre-Honeycomb will have FLAG_NEEDS_MENU_KEY set by default. Bug: 3003728 Change-Id: I2d983763a726ea4f32cd1af9b0390e30478b11d1
* | | | | resolved conflicts for merge of 8bb7a1df to masterKenny Root2010-10-131-274/+234
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / Change-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9
| * | | am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbreadKenny Root2010-10-111-275/+237
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp * commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45': OBB: rearrange to be entirely asynchronous
| | * | Merge "OBB: rearrange to be entirely asynchronous" into gingerbreadKenny Root2010-10-111-275/+237
| | |\ \ | | | |/ | | |/|
| | | * OBB: rearrange to be entirely asynchronousKenny Root2010-10-111-275/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrange structure of MountService handling of OBBs to be entirely asynchronous so we don't rely on locking as much. We still need the locking to support dumpsys which has been improved to output all the data structures for OBBs. Added more tests to cover more of the error return codes. Oh and fix a logic inversion bug. Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
| * | | am 1da8d4d1: Merge "Fix an event injection bug when the policy is bypassed." ↵Jeff Brown2010-10-113-163/+99
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '1da8d4d1697cec871dea8c30dad67e90db10bde6' into gingerbread-plus-aosp * commit '1da8d4d1697cec871dea8c30dad67e90db10bde6': Fix an event injection bug when the policy is bypassed.
| | * | Merge "Fix an event injection bug when the policy is bypassed." into gingerbreadJeff Brown2010-10-113-163/+99
| | |\ \
| | | * | Fix an event injection bug when the policy is bypassed.Jeff Brown2010-10-113-163/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the concept of a "trusted" event to distinguish between events from attached input devices or trusted injectors vs. other applications. This change enables us to move certain policy decisions out of the dispatcher and into the policy itself where they can be handled more systematically. Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
* | | | | am 1c67b7af: am a4e95dfe: Merge "Grant URI permissions to the MCS" into ↵Kenny Root2010-10-121-10/+43
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '1c67b7af0147080de807db3cc564899db85b43a8' * commit '1c67b7af0147080de807db3cc564899db85b43a8': Grant URI permissions to the MCS
| * | | | am a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbreadKenny Root2010-10-111-10/+43
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e' into gingerbread-plus-aosp * commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e': Grant URI permissions to the MCS
| | * | | Merge "Grant URI permissions to the MCS" into gingerbreadKenny Root2010-10-111-10/+43
| | |\ \ \
| | | * | | Grant URI permissions to the MCSKenny Root2010-10-111-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the PackageManagerService is asked to install from a URI, it might be explicitly granted the permission to read from the URI content provider. We need to pass along these permissions to the MediaContainerService (DefaultContainerService) to ensure the MCS can read from the content provider. Change-Id: Ie7ddaeb638af82b60792a4c3f8c99e1e8eef1916
* | | | | | am 14854820: am c0ad216c: Merge "Add a configuration option to turn on the ↵Joe Onorato2010-10-121-1/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen when you unplug the device." into gingerbread Merge commit '14854820eac895a925791fb41ccd330447fd4f02' * commit '14854820eac895a925791fb41ccd330447fd4f02': Add a configuration option to turn on the screen when you unplug the device.
| * | | | | am c0ad216c: Merge "Add a configuration option to turn on the screen when ↵Joe Onorato2010-10-111-1/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | you unplug the device." into gingerbread Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp * commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3': Add a configuration option to turn on the screen when you unplug the device.
| | * | | | Merge "Add a configuration option to turn on the screen when you unplug the ↵Joe Onorato2010-10-111-1/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | device." into gingerbread
| | | * | | | Add a configuration option to turn on the screen when you unplug the device.Joe Onorato2010-10-111-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3068624 Change-Id: I7366ece2528b31feee920f4600a475e81a0f3709
* | | | | | | Pass the starting touch point in the DRAG_STARTED messageChris Tate2010-10-121-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 3089251 Change-Id: I072742dc6c5745083cdac8dcfa19fb1f2bbbf404
* | | | | | | am a75803e9: am 0a789236: Merge "Temporarily turn on backup/restore debug ↵Chris Tate2010-10-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logs" into gingerbread Merge commit 'a75803e9502a5687d825d7ff8f62ec70b540a3c2' * commit 'a75803e9502a5687d825d7ff8f62ec70b540a3c2': Temporarily turn on backup/restore debug logs
| * | | | | | am 0a789236: Merge "Temporarily turn on backup/restore debug logs" into ↵Chris Tate2010-10-111-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '0a7892367f46e3653e9857195ec19356f848b7f8' into gingerbread-plus-aosp * commit '0a7892367f46e3653e9857195ec19356f848b7f8': Temporarily turn on backup/restore debug logs