summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* am 198297b4: am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER ↵Joe Onorato2010-09-291-1/+1
|\ | | | | | | | | | | | | | | | | permission in userActivity.""" into gingerbread Merge commit '198297b495d975cd4889f5136cd69368bd319eed' * commit '198297b495d975cd4889f5136cd69368bd319eed': Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
| * am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in ↵Joe Onorato2010-09-291-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | userActivity.""" into gingerbread Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp * commit 'f01a873029641da2155ca1882f311d8f4e92675a': Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
| | * Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""Joe Onorato2010-09-291-1/+1
| | | | | | | | | | | | This reverts commit 4da4827504df019d4e64dd864f70526ff6d384a0.
* | | am 8bd545ab: am 212d81a0: Merge "Move all the permissions check up for ↵Kenny Root2010-09-291-13/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | unmount" into gingerbread Merge commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c' * commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c': Move all the permissions check up for unmount
| * | am 212d81a0: Merge "Move all the permissions check up for unmount" into ↵Kenny Root2010-09-291-13/+22
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp * commit '212d81a004f50e51ed8f6d803b79f4b71546b351': Move all the permissions check up for unmount
| | * Merge "Move all the permissions check up for unmount" into gingerbreadKenny Root2010-09-291-13/+22
| | |\
| | | * Move all the permissions check up for unmountKenny Root2010-09-291-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have already scanned the state of the OBB in mountObb, so check the caller against the stored state in the unmountObb call. This allows us to ensure the calling binder is the same one that mounted it since we tie the lifecycle of the OBB to the lifecycle of the binder. Change-Id: I45d9cfbab5d3f5b37a6a9b594b10bd8b91cccc45
* | | | resolved conflicts for merge of f4c3b7e9 to masterNick Pelly2010-09-292-0/+2127
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
| * | | am 038cabe0: NFC integrationNick Pelly2010-09-282-0/+2127
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp * commit '038cabe0247ee46df62f9363f1a303bc5b9c1028': NFC integration
| | * | NFC integrationNick Pelly2010-09-282-0/+2127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010) Conflicts: core/java/android/app/ApplicationContext.java core/java/android/provider/Settings.java core/jni/Android.mk core/jni/AndroidRuntime.cpp core/res/AndroidManifest.xml include/utils/Asset.h Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER ↵Mike Lockwood2010-09-281-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission in userActivity."" into gingerbread Merge commit '05e110506156a1b782232833b907afb428802b69' * commit '05e110506156a1b782232833b907afb428802b69': Revert "Check for the DEVICE_POWER permission in userActivity."
| * | | am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in ↵Mike Lockwood2010-09-281-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | userActivity."" into gingerbread Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp * commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845': Revert "Check for the DEVICE_POWER permission in userActivity."
| | * | Revert "Check for the DEVICE_POWER permission in userActivity."Mike Lockwood2010-09-281-1/+1
| | |/ | | | | | | | | | | | | | | | The change broke SetupWizard and probably other apps This reverts commit 059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.
* | | Wifi: Update code for new BT Apis.Jaikumar Ganesh2010-09-281-15/+11
| | | | | | | | | | | | Change-Id: I1deb0a9a1533958cdb79179bebd2d3b435b0b07c
* | | Update code for new BT APIs.Jaikumar Ganesh2010-09-281-4/+35
| | | | | | | | | | | | Change-Id: I53aa17b6c2a5ee50d47df91960a7f997eb7b1107
* | | resolved conflicts for merge of d8e8186c to masterKenny Root2010-09-281-22/+39
|\ \ \ | |/ / | | | | | | Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5
| * | am 05105f7a: Update OBB API to include callbacksKenny Root2010-09-281-22/+39
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp * commit '05105f7abe02b2dff91d6260b3628c8b97816bab': Update OBB API to include callbacks
| | * Update OBB API to include callbacksKenny Root2010-09-281-22/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a callback for users of the StorageManager API to be able to receive notifications when the requested operation completes for mountObb and unmountObb. Add NDK API to get to ObbInfo like the Java API has. Also update the docs for the API and remove the "STOPSHIP" comments. Change-Id: I23a4409c7f8b74d3169614beba920b4d667990a4
* | | am f5bdeba1: am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in ↵Joe Onorato2010-09-281-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | userActivity." into gingerbread Merge commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d' * commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d': Check for the DEVICE_POWER permission in userActivity.
| * | am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." ↵Joe Onorato2010-09-281-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp * commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a': Check for the DEVICE_POWER permission in userActivity.
| | * Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbreadJoe Onorato2010-09-281-1/+1
| | |\
| | | * Check for the DEVICE_POWER permission in userActivity.Joe Onorato2010-09-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: I6c8038a960bdf32dfad3b0571d86f51f87784370
* | | | am b047e3cd: am aeb2c62e: Merge "Fix several audio effects problems." into ↵Eric Laurent2010-09-281-8/+32
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c' * commit 'b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c': Fix several audio effects problems.
| * | | am aeb2c62e: Merge "Fix several audio effects problems." into gingerbreadEric Laurent2010-09-281-8/+32
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68' into gingerbread-plus-aosp * commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68': Fix several audio effects problems.
| | * | Fix several audio effects problems.Eric Laurent2010-09-281-8/+32
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the following issues in LVM effect bundle wrapper: - memory leaks in EffectCreate() in case effect creation fails at various stages - Added saturation when accumulating to output buffer - Fixed problems with enabled effects count when an effect is released while enabled - Do not allocate temporary buffer for accumulation each time process() is called Fixed the following issues in effects framework (AudioFlinger) - Release effect synchronously in the library when deleted from effect chain - Do not call the effect process function if no tracks are present in the same audio session Change-Id: Ifbd80a163415cfb3c0a337c12082853ea45d9c91
* | | am b763a6dc: am 08cf57d7: Merge "Fixes to granting URI permissions - take ↵Dianne Hackborn2010-09-281-15/+61
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into account path perms." into gingerbread Merge commit 'b763a6dc41dcce76585c56657903ae72c5422ae1' * commit 'b763a6dc41dcce76585c56657903ae72c5422ae1': Fixes to granting URI permissions - take into account path perms.
| * | am 08cf57d7: Merge "Fixes to granting URI permissions - take into account ↵Dianne Hackborn2010-09-281-15/+61
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | path perms." into gingerbread Merge commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5' into gingerbread-plus-aosp * commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5': Fixes to granting URI permissions - take into account path perms.
| | * Merge "Fixes to granting URI permissions - take into account path perms." ↵Dianne Hackborn2010-09-281-15/+61
| | |\ | | | | | | | | | | | | into gingerbread
| | | * Fixes to granting URI permissions - take into account path perms.Dianne Hackborn2010-09-281-15/+61
| | | | | | | | | | | | | | | | Change-Id: I8073061a578eda90dadd3b0b909047aae0d64f2d
* | | | am 6db64689: am c89dd54c: Remove logging on wifilock acquire/releaseIrfan Sheriff2010-09-281-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '6db6468956fa6d71d68e410a532ed7b1bcaecf74' * commit '6db6468956fa6d71d68e410a532ed7b1bcaecf74': Remove logging on wifilock acquire/release
| * | | am c89dd54c: Remove logging on wifilock acquire/releaseIrfan Sheriff2010-09-281-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'c89dd54ceeec99173d51d1196e2c03a58f120211' into gingerbread-plus-aosp * commit 'c89dd54ceeec99173d51d1196e2c03a58f120211': Remove logging on wifilock acquire/release
| | * | Remove logging on wifilock acquire/releaseIrfan Sheriff2010-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 3042300 Change-Id: Ia3ce184f53bdd9afee1c78bb9c294af57364f266
| * | | am 4fc3d2f0: DO NOT MERGErepo sync . build/envsetup.sh lunch passion-en2010-09-271-1/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a' into gingerbread-plus-aosp * commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a': DO NOT MERGE
| | * | DO NOT MERGErepo sync . build/envsetup.sh lunch passion-eng2010-09-271-1/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | This is a manual cherrypick of: Change I3a76de15: Fixing font scale in WindowManagerService. There was a bug that causes WindowManagerService to lose the fontScale setting. Change-Id: I9b993e11f6a3e75735d8ed05596083893543d732
* | | Fix build.Hung-ying Tyan2010-09-281-10/+0
| | | | | | | | | | | | Change-Id: Iae02fabe42013705592f75748388daf8fa5ed54e
* | | resolved conflicts for merge of 2a36a778 to masterHung-ying Tyan2010-09-285-3306/+0
|\ \ \ | |/ / | | | | | | Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
| * | am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." ↵Hung-ying Tyan2010-09-275-3316/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp * commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3': Move SipService out of SystemServer to phone process.
| | * Merge "Move SipService out of SystemServer to phone process." into gingerbreadHung-ying Tyan2010-09-275-3316/+0
| | |\
| | | * Move SipService out of SystemServer to phone process.Hung-ying Tyan2010-09-285-3316/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Companion CL: https://android-git/g/#change,70187 http://b/issue?id=2998069 Change-Id: I90923ac522ef363a4e04292f652d413c5a1526ad
* | | | am d0cb228b: am 23142acf: Merge "squeeze a few more bits of randomness into ↵Nick Kralevich2010-09-271-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | /dev/random" into gingerbread Merge commit 'd0cb228b9af0b67fa3372ee075287e7409249550' * commit 'd0cb228b9af0b67fa3372ee075287e7409249550': squeeze a few more bits of randomness into /dev/random
| * | | am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" ↵Nick Kralevich2010-09-271-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp * commit '23142acffab69738b967812fdbdf7bbda18a44d8': squeeze a few more bits of randomness into /dev/random
| | * | Merge "squeeze a few more bits of randomness into /dev/random" into gingerbreadNick Kralevich2010-09-271-0/+1
| | |\ \
| | | * | squeeze a few more bits of randomness into /dev/randomNick Kralevich2010-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ida30c33985411f353c828b43ea26ca1b7e6502af
* | | | | resolved conflicts for merge of 191a25e1 to masterWu-cheng Li2010-09-272-6/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c
| * | | | am 83ea6389: Merge "The old overlay should be destroyed if orientation ↵Wu-cheng Li2010-09-272-6/+16
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes." into gingerbread Merge commit '83ea6389097570e8526a0b612051bb591186f165' into gingerbread-plus-aosp * commit '83ea6389097570e8526a0b612051bb591186f165': The old overlay should be destroyed if orientation changes.
| | * | | Merge "The old overlay should be destroyed if orientation changes." into ↵Wu-cheng Li2010-09-272-6/+16
| | |\ \ \ | | | |_|/ | | |/| | | | | | | gingerbread
| | | * | The old overlay should be destroyed if orientation changes.Wu-cheng Li2010-09-272-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the orientation was wrong after suspend and resume. When the camera app is resumed behide the lock screen, it orinteation is portrait. When users slide to unlock the screen, surfaceChanged is called and the orientation is landscape. The camera app stops the preview, sets the display orientation, and starts the preview. Overlay should be destroyed if the orientation has changed. bug:3031640 Change-Id: I38b527f9ea78c91b538463292152c023383b4695
| * | | | am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into ↵Dianne Hackborn2010-09-272-2/+34
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp * commit 'd8691d73d158acd9ffc63748126e822afd656707': Allow all apps to call ContentResolver.getType().
| | * | | Merge "Allow all apps to call ContentResolver.getType()." into gingerbreadDianne Hackborn2010-09-272-2/+34
| | |\ \ \
| | | * | | Allow all apps to call ContentResolver.getType().Dianne Hackborn2010-09-262-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't find the bug number for this, but it is needed for some things we are doing where the app building an intent may not have access to the URI in the data field. This is for HC, but doing in GB to avoid introducing integration issues. Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
generated by cgit v1.1 at 2024-07-13 21:28:03 +0000