summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycombEric Laurent2011-02-035-39/+31
|\ | | | | | | | | * commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836': Fix issue 3371080
| * am 9c0a1003: Merge "Fix issue 3371080" into honeycombEric Laurent2011-02-035-39/+31
| |\ | | | | | | | | | | | | * commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5': Fix issue 3371080
| | * Fix issue 3371080Eric Laurent2011-02-035-39/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified default volume control logic in AudioService: 1 IN_CALL volume if in video/audio chat 2 NOTIFICATION if notification is playing or was playing less than 5s ago. 3 MUSIC Modified silent mode: - now also affect MUSIC stream type - entering silent mode when VOL- hard key is pressed once while selected stream volume is already at 0 (except for VOICE_CALL stream). - exiting silent mode when pressing VOL+ hard key while in silent mode Play sound FX (audible selections, keyboard clicks) at a fixed volume. Modified audio framework: - isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger) - iStreamActive() now specifies a time window during which the stream is considered active after it actually stopped. Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
* | | am dd954212: am a5861743: Merge "Fix issue #3418265: Rotation animation on ↵Dianne Hackborn2011-02-032-30/+98
|\ \ \ | |/ / | | | | | | | | | | | | | | | wallpaper is broken" into honeycomb * commit 'dd95421291f590ec0b1d8e79b73264516e1da027': Fix issue #3418265: Rotation animation on wallpaper is broken
| * | am a5861743: Merge "Fix issue #3418265: Rotation animation on wallpaper is ↵Dianne Hackborn2011-02-022-30/+98
| |\ \ | | |/ | | | | | | | | | | | | | | | broken" into honeycomb * commit 'a58617430d699d26948357f204f09a6ca0b837b8': Fix issue #3418265: Rotation animation on wallpaper is broken
| | * Fix issue #3418265: Rotation animation on wallpaper is brokenDianne Hackborn2011-02-022-30/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | Two problems: 1. The wallpaper offsets were being applied at the wrong place in the xform. 2. The background black needs become a clip around the newly revealed UI. Change-Id: I3b46aea2ace3c8c5a36fc5e37b4e2b67fff1b289
* | | Merge "Stop using netmask in the framework."Robert Greenwalt2011-02-031-19/+13
|\ \ \
| * | | Stop using netmask in the framework.Robert Greenwalt2011-02-031-19/+13
| | | | | | | | | | | | | | | | | | | | bug:2542681 Change-Id: Iaa2b30f7a43de28844d86a4a8a513e86d719608a
* | | | Merge "Bind addr and prefixLength together in LinkAddress"Robert Greenwalt2011-02-032-6/+24
|\ \ \ \ | |/ / /
| * | | Bind addr and prefixLength together in LinkAddressRobert Greenwalt2011-01-282-6/+24
| | | | | | | | | | | | | | | | | | | | bug:2542681 Change-Id: I90200446216d78c676498144946832afe75efdb8
* | | | Merge "Remove defunct secure FS work"Kenny Root2011-02-032-74/+17
|\ \ \ \
| * | | | Remove defunct secure FS workKenny Root2011-02-022-74/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3365047 Change-Id: I68eaea295881f5431907e1b93bdd73e644e84aa5
* | | | | Merge changes I80558c62,I6587f580Mike Lockwood2011-02-031-9/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: UsbService: Blacklist HID boot subclass devices (keyboards and mice) UsbService: Add support for blacklisting certain USB busses
| * | | | | UsbService: Blacklist HID boot subclass devices (keyboards and mice)Mike Lockwood2011-02-011-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I80558c6205e041ad730c7815aba97cb80132e820 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | | | UsbService: Add support for blacklisting certain USB bussesMike Lockwood2011-02-011-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to prevent applications from connecting to sensitive internal USB devices (like the modem) Change-Id: I6587f58018e3f8d8f78405d4004cce64db23b628 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am 50b029d5: am 7ba35f5a: Merge "[3418265] apply layer transformations to ↵Mathias Agopian2011-02-023-35/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | the DimLayer." into honeycomb * commit '50b029d578fa06cd0733dcc7c69cb94f5f824908': [3418265] apply layer transformations to the DimLayer.
| * | | | am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." ↵Mathias Agopian2011-02-023-35/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | into honeycomb * commit '7ba35f5ab3c838c7f1b3ab957be685ac1f506b2a': [3418265] apply layer transformations to the DimLayer.
| | * | | [3418265] apply layer transformations to the DimLayer.Mathias Agopian2011-02-023-35/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with this change DimLayers will behave just like any other layer, in particular they'll respect the layer transformations. Change-Id: Icb4a1275e8bca9e3deb5f57c9f9219aaa69f9877
* | | | | am e40afdf7: am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size ↵Dianne Hackborn2011-02-021-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | breaks thumbnails." into honeycomb * commit 'e40afdf7f44f30d78b0afc96717dae2bb883e3ea': Fix issue #3415137: New wallpaper size breaks thumbnails.
| * | | | am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size breaks ↵Dianne Hackborn2011-02-021-0/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | thumbnails." into honeycomb * commit '0035b5cad16c0565102105f5cd0222073b0ddf94': Fix issue #3415137: New wallpaper size breaks thumbnails.
| | * | | Fix issue #3415137: New wallpaper size breaks thumbnails.Dianne Hackborn2011-02-021-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I3ce4fa8f532cc378c390138bab0ff3126fe0f0c3
* | | | | am a70154b0: am c623fff0: Merge "Fix keyboard hidden flag." into honeycombJeff Brown2011-02-011-6/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a70154b0187603af3487bbe01b607818b12cc268': Fix keyboard hidden flag.
| * | | | am c623fff0: Merge "Fix keyboard hidden flag." into honeycombJeff Brown2011-01-311-6/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c623fff00c53f6002a8ec6c98cf4fdd6b1b2ad12': Fix keyboard hidden flag.
| | * | | Merge "Fix keyboard hidden flag." into honeycombJeff Brown2011-01-311-6/+9
| | |\ \ \
| | | * | | Fix keyboard hidden flag.Jeff Brown2011-01-311-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configuration.hardKeyboardHidden should be set to HARDKEYBOARDHIDDEN_YES when no keyboard is present or when it is disabled. The code in PhoneWindowManager.adjustConfigurationLw does the right thing. It also takes care of setting keyboardHidden correctly when only a soft keyboard is available. So it turns out that all we need to do to disable the hard keyboard is to set Configuration.keyboard to KEYBOARD_NOKEYS *before* asking the policy to adjust the configuration. Bug: 3406101 Change-Id: I3519d02af30d8068198cb3d6b8fdde601c2fe8b4
* | | | | | am db569b49: am 6cf32312: Merge "Do not check features in ↵Dianne Hackborn2011-02-011-20/+0
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | PackageManagerService" into honeycomb * commit 'db569b49180621c01fa55db88ed92071aae9b3bb': Do not check features in PackageManagerService
| * | | | am 6cf32312: Merge "Do not check features in PackageManagerService" into ↵Dianne Hackborn2011-01-311-20/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb * commit '6cf32312aaee6716ffd1df7098838b08d80054e4': Do not check features in PackageManagerService
| | * | | Merge "Do not check features in PackageManagerService" into honeycombDianne Hackborn2011-01-311-20/+0
| | |\ \ \
| | | * | | Do not check features in PackageManagerServiceKenny Root2011-01-311-20/+0
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackageManagerService shouldn't check features that a package declares that it uses because this will cause problems in the future when we add more features that older phones didn't explicitly declare. We must rely on markets to know about phones and filter them for us to avoid this situation. Bug: 3409434 Change-Id: I419a5b936be3572b83a485081a6c81b2f1c8741c
* | | | | am c253fc0f: am 076d059b: Merge "Not to update IME when Settings version is ↵satok2011-01-311-0/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | older than the last updated version." into honeycomb * commit 'c253fc0f8069c67eacf70def32436067584b5636': Not to update IME when Settings version is older than the last updated version.
| * | | | am 076d059b: Merge "Not to update IME when Settings version is older than ↵satok2011-01-311-0/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | the last updated version." into honeycomb * commit '076d059b54664b31920f0be13d56c657ab77cecc': Not to update IME when Settings version is older than the last updated version.
| | * | | Not to update IME when Settings version is older than the last updated version.satok2011-02-011-0/+17
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Check if just old version or not. - Sometimes, ContentObserver.onChange is called before finishing to save the actual value. This can be verified by checking the system settings version. If the version is not updated, cached value will be returned from Settings.Secure, and this should not be handled. Bug: 3406300 Change-Id: Ie3f5b484b5574e10a41dfc209ed31271a474b828
* | | | am 75057b15: am 4de68bae: Merge "Check for the STATUS_BAR permission for the ↵Joe Onorato2011-01-301-0/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | system UI properties." into honeycomb * commit '75057b1507881625368f76b2f401097b606bd530': Check for the STATUS_BAR permission for the system UI properties.
| * | | am 4de68bae: Merge "Check for the STATUS_BAR permission for the system UI ↵Joe Onorato2011-01-301-0/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | properties." into honeycomb * commit '4de68baed4bf18b33dc38f89f25410d3d5edfecf': Check for the STATUS_BAR permission for the system UI properties.
| | * | Merge "Check for the STATUS_BAR permission for the system UI properties." ↵Joe Onorato2011-01-301-0/+10
| | |\ \ | | | | | | | | | | | | | | | into honeycomb
| | | * | Check for the STATUS_BAR permission for the system UI properties.Joe Onorato2011-01-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the app doesn't have that permission, just mask out the bits. Also makes the systemUiVisibility field visible in hierarchyviewer. Change-Id: Ic3d3a3aed96b5c6448832755b4b2e6175117e5be
* | | | | am 09443aeb: am 62884505: Merge "Reset ANativeWindow crop on buffer geometry ↵Jamie Gennis2011-01-301-5/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | changes." into honeycomb * commit '09443aeb6470d66f5bc1938b70d74b3e2f9bbbb9': Reset ANativeWindow crop on buffer geometry changes.
| * | | | am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." ↵Jamie Gennis2011-01-301-5/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb * commit '628845056282a0c5b1a212ce5aeeaac092b91ec8': Reset ANativeWindow crop on buffer geometry changes.
| | * | | Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycombJamie Gennis2011-01-301-5/+3
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Reset ANativeWindow crop on buffer geometry changes.Jamie Gennis2011-01-281-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the ANativeWindow API and the two implementations to reset the window's crop rectangle to be uncropped when the window's buffer geometry is changed. Bug: 3359604 Change-Id: I64283dc8382ae687787ec0bebe6a5d5b4a0dcd6b
| | * | | Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-303-2/+11
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
| | | * \ \ Merge 0ef57993 from gingerbreadJean-Baptiste Queru2011-01-291-1/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
| | | * \ \ \ am 138757db: Merge "Make OBB results a one-way call" into gingerbreadKenny Root2011-01-291-1/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '138757db4f19cb626ef5c1d371d4fca004304a08': Make OBB results a one-way call
| | | * \ \ \ \ am 91c459ec: Copy user info from PackageSetting as wellKenny Root2011-01-261-0/+8
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91c459ec7dba6d56816ff5cbd92c627e0f718915': Copy user info from PackageSetting as well
* | | | \ \ \ \ \ resolved conflicts for merge of c608e106 to masterJeff Brown2011-01-303-3/+99
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I49117966f43080d86763bab51848dbc50e55ecf8
| * | | | | | | | am 3c89f6d1: Merge "Add "Use physical keyboard" option to system bar IME ↵Jeff Brown2011-01-303-3/+99
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button." into honeycomb * commit '3c89f6d1bd0821d0ae0205a5b48176156735aaac': Add "Use physical keyboard" option to system bar IME button.
| | * | | | | | | Merge "Add "Use physical keyboard" option to system bar IME button." into ↵Jeff Brown2011-01-303-3/+99
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb
| | | * | | | | | | Add "Use physical keyboard" option to system bar IME button.Jeff Brown2011-01-283-3/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3391067 Change-Id: I136087ca4f726d0068d5983d7d3686787ba60c55
* | | | | | | | | | am bdaee964: am e97a12e3: Fix screen size compatibility mode.Dianne Hackborn2011-01-301-7/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bdaee964f7d00806e714a7e453fff8d6a408c692': Fix screen size compatibility mode.
| * | | | | | | | | am e97a12e3: Fix screen size compatibility mode.Dianne Hackborn2011-01-301-7/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e97a12e340dfdc246b531dfb49596628bd24e81b': Fix screen size compatibility mode.