summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix issue 3388775."Eric Laurent2011-03-021-6/+6
|\
| * Fix issue 3388775.Eric Laurent2011-03-011-6/+6
| | | | | | | | | | | | | | | | | | Do not select A2DP output for media strategy when it is suspended because BT SCO is active. Media audio will be routed to speakers or SCO HS (depending on phone state and activity on stream VOICE_CALL) which is less confusing than not hearing anything while music progress bar is moving. Change-Id: Iff8cc1ea9bf9bde0b33035c4d91398db0934b836
* | am 0e99d3bf: am df33b8c5: Merge "Check for NTP time as soon as WIFI is ↵Amith Yamasani2011-03-021-0/+32
|\ \ | | | | | | | | | | | | | | | | | | connected." into honeycomb * commit '0e99d3bfab99254cc187de127a7a4767f165cde8': Check for NTP time as soon as WIFI is connected.
| * \ am df33b8c5: Merge "Check for NTP time as soon as WIFI is connected." into ↵Amith Yamasani2011-03-011-0/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | honeycomb * commit 'df33b8c51d431a7c0f7a89ead8dfacdd3660ff48': Check for NTP time as soon as WIFI is connected.
| | * \ Merge "Check for NTP time as soon as WIFI is connected." into honeycombAmith Yamasani2011-03-011-0/+32
| | |\ \
| | | * | Check for NTP time as soon as WIFI is connected.Amith Yamasani2011-03-011-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Listen for connectivity changes. If WIFI is connected, check if we have recently checked for NTP time. If we haven't yet checked the time or it has been long enough (a day), then connect to the NTP server and get the latest time. Update the time if it is significantly out of sync. This doesn't poll the NTP server every time there is connectivity, only if it hasn't been checked since boot or has been a day. This fixes the problem that during SetupWizard, we try to contact the NTP server before there is connectivity and fail. Now, as soon as the user chooses a WiFi network to connect to, it will update the time before getting to the Date/Time step. Then as soon as the user corrects the TZ, the date/time should be correct. Bug: 3491920 Change-Id: I62664156616510b67ecd6a1c24dd838b98d5204f
| * | | | am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT ↵Wink Saville2011-02-281-7/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | MERGE." into honeycomb * commit '0eb6af892948ba23bf9de5c5a6172c6ec50f8f71': Fixing the write of BackgroundData setting, DO NOT MERGE.
| | * | | Fixing the write of BackgroundData setting, DO NOT MERGE.Wink Saville2011-02-281-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I outsmarted myself trying to minimize writes and caused no writes to occur. bug:3485934 Change-Id: I43b6ebbed3f13277edfb2e28f09cf7b98ea66776
| * | | | am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-141/+83
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ce57a7f35344e76689d30f45964d1e37b78280cb': GpsLocationProvider: Clean up HAL initialization/cleanup sequence Fixed GSM encoded network initiated position request Ensuring thread-safe usage of DateFormat. Fixing infinite loop for zero duration. Fix for an infinite loop while scrolling lists. WAPPushManager, WAP Push over SMS message handler Add --non-constant-id to aapt.
| | * \ \ \ am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-141/+83
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6504490cde3ec5d48321d539e654d1f2072b33f9': GpsLocationProvider: Clean up HAL initialization/cleanup sequence Fixed GSM encoded network initiated position request Ensuring thread-safe usage of DateFormat. Fixing infinite loop for zero duration. Fix for an infinite loop while scrolling lists. WAPPushManager, WAP Push over SMS message handler Add --non-constant-id to aapt.
| | | * \ \ \ am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-141/+83
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505': GpsLocationProvider: Clean up HAL initialization/cleanup sequence Fixed GSM encoded network initiated position request Ensuring thread-safe usage of DateFormat. Fixing infinite loop for zero duration. Fix for an infinite loop while scrolling lists. WAPPushManager, WAP Push over SMS message handler Add --non-constant-id to aapt.
| | | | * | | | GpsLocationProvider: Clean up HAL initialization/cleanup sequenceMike Lockwood2011-02-231-141/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5467000f3f3da5cbe1f112dad97a032688d2eac Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | Merge "Start using NetworkUtils.numericToInetAddress."Robert Greenwalt2011-03-023-13/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Start using NetworkUtils.numericToInetAddress.Robert Greenwalt2011-03-023-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generates InetAddresses without risking an accidental dns lookup. For use with supposedly numeric-only ip address strings. Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
* | | | | | | | | Merge "Fix issue #3431230: "am" debugging commands failing on -userdebug builds"Dianne Hackborn2011-03-021-4/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue #3431230: "am" debugging commands failing on -userdebug buildsDianne Hackborn2011-03-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b5a8bf68d3bd76c7331ee97bab9a68b5033cb5a
* | | | | | | | | | Merge "Switch to returnCode for IPackageDeleteObserver"Kenny Root2011-03-021-8/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Switch to returnCode for IPackageDeleteObserverKenny Root2011-03-011-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the IPackageDeleteObserver only knew whether the deletion succeeded or failed, but not the reason why. Bug: 2520191 Change-Id: I1f0d7c04f06c539660b6e17e7e133defb0f61b5b
* | | | | | | | | | Merge "Fix Issue 14340: Sticky Service killed with onDestroy not called, not ↵Dianne Hackborn2011-03-011-4/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restarted."
| * | | | | | | | | | Fix Issue 14340: Sticky Service killed with onDestroy not called, not restarted.Dianne Hackborn2011-03-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2804c49ad5669ca89744c6d92ead0c7d21ee31d5 http://code.google.com/p/android/issues/detail?id=14340
* | | | | | | | | | | Merge "UsbDeviceSettingsManager: don't write settings file when not necessary"Mike Lockwood2011-03-011-8/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | UsbDeviceSettingsManager: don't write settings file when not necessaryMike Lockwood2011-03-011-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48772f71822e3489f9e6c640985055569a656124 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | Merge "Fix UsbDeviceSettingsManager locking."Mike Lockwood2011-03-012-156/+181
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix UsbDeviceSettingsManager locking.Mike Lockwood2011-03-012-156/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I93117ce791de95b0ab95017601f5d90ed5dd7a6a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | Merge "Move USB framework support from android.hardware to ↵Mike Lockwood2011-03-015-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | android.hardware.usb package"
| * | | | | | | | | | | Move USB framework support from android.hardware to android.hardware.usb packageMike Lockwood2011-03-015-17/+17
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | Merge "Fix issue 3479042."Eric Laurent2011-03-015-1/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix issue 3479042.Eric Laurent2011-02-285-1/+28
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that when an AudioRecord using the resampler is restarted, the resampler state is not reset (as there is no reset function in the resampler). The consequence is that the first time the record thread loop runs, it calls the resampler which consumes the remaining data in the input buffer and when this buffer is released the input index is incremented over the limit. The fix consists in implementing a reset function in the resampler. A similar problem was also present for playback but unoticed because the track buffer is always drained by the mixer when a track stops. The only problem for playback was that the initial phase fraction was wrong when restarting a track after stop (it was correct after a pause). Change-Id: Ifc2585d685f4402d29f4afc63f6efd1d69265de3
* | | | | | | | | | | Merge "Using AsyncChannel for wifi connectivity"Irfan Sheriff2011-03-011-37/+34
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Using AsyncChannel for wifi connectivityIrfan Sheriff2011-02-281-37/+34
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieee5a3a1a739238d8a6659493684f1be0cbea691
* | | | | | | | | | Merge "Add platform features for USB host and USB accessory support."Mike Lockwood2011-02-281-3/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add platform features for USB host and USB accessory support.Mike Lockwood2011-02-281-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed config_hasUsbHostSupport framework resource, which is now obsolete. Change-Id: I6f18cc1c4f68085de8b8363e1b5edff79aff404f Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | Merge "UsbManager: Enhancements for managing USB devices and accessories"Mike Lockwood2011-02-285-40/+1091
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | UsbManager: Enhancements for managing USB devices and accessoriesMike Lockwood2011-02-285-40/+1091
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a USB device or accessory is connected, the UsbService now asks the user which application to associate with the device or accessory. Applications interested in devices or accessories must specify the devices they work with via meta-data attached to their manifest. Permission to communicate with the device is assigned when the user chooses the activity to use for the device. The user has the option of clicking the "always use this application" checkbox to make the assignment automatic in the future. The user may later clear this preference and revoke permission for an application to have permission to communicate with the device by clicking the "Clear defaults" button for the activity in the Manage Applications panel in Settings. Added class UsbResolveActivity (a subclass or ResolveActivity for choosing an activity for a USB device or accessory) Added UsbDeviceManager, which manages the mapping between USB devices/accessories and applications, including default applications for devices and accessories, and manages application permissions. Add interface to allow Settings to clear device and accessory preferences and permissions for an application. Remove obsolete ACCESS_USB permission. Add new signatureOrSystem MANAGE_USB permission to allow administrating preferences and permissions. Moved UsbService.java to a "usb" subdirectory, along with new classes UsbResolveActivity and UsbDeviceManager. Change-Id: I92554381e9779e68ce380daaee4e1401fb875703 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | Small change to AppWidgetProviderInfo public field name and docsAdam Cohen2011-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia799cfc1824ccee1f7fd041ae8ecaa1a0395c3f6
* | | | | | | | | | Merge "You can now specify a custom display size as NxM."Dianne Hackborn2011-02-281-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | You can now specify a custom display size as NxM.Dianne Hackborn2011-02-281-2/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieb6df51aab009689f0f19b8887025261c5ceb69f
* | | | | | | | | | Fix bug 3376700 Volume too loud at lowest settingJean-Michel Trivi2011-02-271-1/+9
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change volume attenuation curve to provide more attenuation at low volume settings, and finer steps at high volume. See bug entry for link to doc with curve values. Change-Id: I750548b2161a4c550ef982ba793156e4518119e8
* | | | | | | | | am 0dc5fdb9: am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from ↵Jamie Gennis2011-02-271-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | using layer token 31." into gingerbread * commit '0dc5fdb9b2fd3b3e2ede5e9607bc21423f357a01': Prevent SurfaceFlinger from using layer token 31.
| * | | | | | | am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer ↵Jamie Gennis2011-02-271-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | token 31." into gingerbread * commit 'e630e5f49ba15005172dceeda7299569b2d2351f': Prevent SurfaceFlinger from using layer token 31.
| | * | | | | | am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into ↵Jamie Gennis2011-02-271-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '919853ce244f853966817d4adb2f3b7b6e4bbe74': Prevent SurfaceFlinger from using layer token 31.
| | | * \ \ \ \ \ Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbreadJamie Gennis2011-02-271-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Prevent SurfaceFlinger from using layer token 31.Jamie Gennis2011-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2964479 Change-Id: I81e948924bff35b8b300d409f2c09f3779bcdeec
| | * | | | | | | | am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into ↵Robert Greenwalt2011-02-161-44/+17
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | / / / / | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '3259d8853760a72b811757e1711119d041962a1c': DO NOT MERGE - backport of l92a02b31 from master
| | | * | | | | | DO NOT MERGE - backport of l92a02b31 from masterRobert Greenwalt2011-02-111-44/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix handling of multiple possible default networks. bug:3328196 Change-Id: I994f1621ff82de454192945a9cae961e1710d537
| | * | | | | | | am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer ↵Mathias Agopian2011-02-092-6/+9
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renders the device unable to sleep" into gingerbread * commit 'ada1b6f297596cac4451edbc83df060a31cdda68': fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
| | | * | | | | | fix [3421350] Killing a game that uses the accelerometer renders the device ↵Mathias Agopian2011-02-032-6/+9
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unable to sleep when an app dies, make sure to disable all sensors that process is connected to, regardless of wether this was the LAST connection to this sensor. Change-Id: I400fa1c1389b2bd05a1d19abea8a35ec5bcba273
| * | | | | | | am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and ↵Mike Lockwood2011-02-261-0/+8
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isKeyguardSecure() * commit '6aea1154bae3a0935fdb9b09b2d91d9548232eb0': DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
| | * | | | | | DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()Mike Lockwood2011-02-261-0/+8
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 3402847 Change-Id: I7cb199763e8d5386914b4c2173c9e1579b08674c Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | | | | am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into ↵Irfan Sheriff2011-02-231-0/+12
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb * commit '5107eea64e46b0fffbbbcefa469a88044f309de6': DO NOT MERGE Add support for background scanning