summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Fix setting audio group mode in SipPhone.Hung-ying Tyan2010-12-291-21/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3119690 Change-Id: I495d3c031ee4c272d360fe19553ef9726a3f8771
* | | | | | RTP: Send silence packets on idle streams for every second.Chia-chi Yeh2011-01-041-32/+48
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally a stream does not send packets when it is receive-only or there is nothing to mix. However, this causes some problems with certain firewalls and proxies. A firewall might remove a port mapping when there is no outgoing packet for a preiod of time, and a proxy might wait for incoming packets from both sides before start forwarding. To solve these problems, we send out a silence packet on the stream for every second. It should be good enough to keep the stream alive with relatively low resources. Bug: 3119690 Change-Id: Ib9c55e5dddfba28928bd9b376832b68bda24c0e4
* | | | | Merge "Added response flags and DSFID extras for NfcV technology (API ↵Nick Pelly2011-01-032-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | part)." into gingerbread
| * | | | | Added response flags and DSFID extras for NfcV technology (API part).Martijn Coenen2011-01-042-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed a missing assignment in NfcB technology. Change-Id: Ic564a0a17a9638c11fa528056da40f74ed37e9e6
* | | | | | Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into ↵Nick Pelly2011-01-031-7/+20
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | gingerbread
| * | | | | Tweak Ndef.getType() API. Rename constants, expand javadoc.Nick Pelly2011-01-041-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d2c83411411fea4ef46bb7c30ebdbcd9ee3e7d8
* | | | | | Merge "Added getType() to NDEF technology class (API part)." into gingerbreadNick Pelly2011-01-031-0/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Added getType() to NDEF technology class (API part).Martijn Coenen2011-01-041-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idfa391dd9d4a401e1daa3dc90ca57e4a3d9e0fa3
* | | | | | Merge "Removed selectAid() from IsoDep." into gingerbreadNick Pelly2011-01-031-15/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Removed selectAid() from IsoDep.Martijn Coenen2011-01-041-15/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a convenience method that can be implemented with transceive(); not really needed for now. Change-Id: Idd855c85b15d97ae679d11d908834be3cb2741d8
* | | | | Merge "Added transfer/restore convience cmds to MF Classic tech." into ↵Nick Pelly2011-01-031-2/+29
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | gingerbread
| * | | | Added transfer/restore convience cmds to MF Classic tech.Martijn Coenen2011-01-041-2/+29
| |/ / / | | | | | | | | | | | | Change-Id: I675993bc3aae6a741d63be458a0dfea240dd5316
* | | | Merge "Clear request list while timeout." into gingerbreadJohn Wang2011-01-031-24/+47
|\ \ \ \ | |/ / / |/| | |
| * | | Clear request list while timeout.John Wang2010-12-281-24/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wakelock will be kept held if there is outstanding requests in request list. When WAKE_LOCK_TIMEOUT occurs, all requests in mRequestList already waited at least DEFAULT_WAKE_LOCK_TIMEOUT but no response. Those lost requests return GENERIC_FAILURE and request list is cleared. bug:3292426 Change-Id: I369c6ba4d6836d65ef616140e48c7304faf888f0
* | | | Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff ↵Alon Albert2010-12-282-27/+131
|\ \ \ \ | |/ / / |/| | | | | | | op to pass through an expidited backed off op." into gingerbread
| * | | Improved ignore-backoff handlingAlon Albert2010-12-222-27/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a non-epidited ignore-backoff op to pass through an expidited backed off op. To do this, I first refactored the complicated if statement: if (best == null || ((bestSyncableIsUnknownAndNotARetry == syncableIsUnknownAndNotARetry) ? (best.expedited == op.expedited ? opRunTime < bestRunTime : op.expedited) : syncableIsUnknownAndNotARetry)) { best = op; bestSyncableIsUnknownAndNotARetry = syncableIsUnknownAndNotARetry; bestRunTime = opRunTime; } Into a more readable: boolean setBest = false; if (best == null) { setBest = true; } else if (bestSyncableIsUnknownAndNotARetry == syncableIsUnknownAndNotARetry) { if (best.expedited == op.expedited) { if (opRunTime < bestRunTime) { // if both have same level, earlier time wins setBest = true; } } else { if (op.expedited) { setBest = true; } } } else { if (syncableIsUnknownAndNotARetry) { setBest = true; } } if (setBest) { best = op; bestSyncableIsUnknownAndNotARetry = syncableIsUnknownAndNotARetry; bestRunTime = opRunTime; } The refactoring was all done automatically with IntelliJ to avoid human error in the conversion. After verifying this code still behaved as expected including the error condition in the bug, I added handling for the cases when a non-expidited op may override an expedited op if certain conditions occur, specificaly, if the expidited op is backed off and the non-expidited op is not. Finally, refactored to make it testable and added tests and logging. Bug: 3128963 Change-Id: I131cbcec6073ea5fe425f6b5aa88ca56c02b6598
* | | | Merge "frameworks/base: Fix to release references in ActivityManagerService" ↵Dianne Hackborn2010-12-231-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | into gingerbread
| * | | | frameworks/base: Fix to release references in ActivityManagerServiceVairavan Srinivasan2010-12-231-0/+8
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ServiceRecord's bindings is a hashmap to keep track of all active bindings to the service. This is not cleared when the service is brought down by activity manager. This adds up the references to IntentBindRecords and its references to ServiceRecord. Fix is to clear the bindings. ServiceRecord's restarter is a reference to the service and is not cleared when the service is brought down by activity manager. This adds up the references to ServiceRecord. Fix is to set the reference to null when the service is brought down by activity manager. Change-Id: Ica448cd5f60192c8adb23209b5d0e2cf0c04e446
* | | | Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbreadJeff Brown2010-12-238-257/+256
|\ \ \ \
| * | | | Fix policy issues when screen is off. (DO NOT MERGE)Jeff Brown2010-12-228-257/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote interceptKeyBeforeQueueing to make the handling more systematic. Behavior should be identical except: - We never pass keys to applications when the screen is off and the keyguard is not showing (the proximity sensor turned off the screen). Previously we passed all non-wake keys through in this case which caused a bug on Crespo where the screen would come back on if a soft key was held at the time of power off because the resulting key up event would sneak in just before the keyguard was shown. It would then be passed through to the dispatcher which would poke user activity and wake up the screen. - We propagate the key flags when broadcasting media keys which ensures that recipients can tell when the key is canceled. - We ignore endcall or power if canceled (shouldn't happen anyways). Changed the input dispatcher to not poke user activity for canceled events since they are synthetic and should not wake the device. Changed the lock screen so that it does not poke the wake lock when the grab handle is released. This fixes a bug where the screen would come back on immediately if the power went off while the user was holding one of the grab handles because the sliding tab would receive an up event after screen turned off and release the grab handles. Bug: 3144874 Change-Id: Iebb91e10592b4ef2de4b1dd3a2e1e4254aacb697
* | | | | Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." ↵Dianne Hackborn2010-12-221-2/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into gingerbread
| * | | | Another stab at fixing issue #3149290 java.lang.RuntimeException:...Dianne Hackborn2010-12-221-2/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | ...Unable to pause activity {com.android.settings/com.android.settings.applications.StorageUse} Change-Id: Ibfa28a1c5af50dd150dfcafe71e905426d312643
* | | | Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do ↵James Dong2010-12-222-6/+51
|\ \ \ \ | | | | | | | | | | | | | | | not merge" into gingerbread
| * | | | Expose AMRNB/WB and AAC encoder and related file output formats - do not mergeJames Dong2010-12-222-6/+51
| |/ / / | | | | | | | | | | | | | | | | | | | | bug - 3305667 Change-Id: I8f137af7f87cb010f75cae1777b9ec6b6af8214f
* | | | Improve performance of WindowState.toString()Mattias Petersson2010-12-221-3/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix improves the performance by caching the string that should be returned, and reuse it next time if possible. This will make it faster to switch between activities, approximately half the time to create the new view when changing from landscape to portrait. Also, the time for starting a new application is be reduced as WindowState.toString is being called thousands of times in this case. Change-Id: I2b8b9bc1e251d1af43b6c85f049c01452f2573a2
* | | Remove canBeFormatted().Jeff Hamilton2010-12-222-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's not easy to determine if this is possible, so instead apps should attempt a format and handle errors in the format request. Change-Id: I078a208b849e71ef3fb6b5970a9111ece4a2d201
* | | Merge "Check if VoIP API is supported in SipManager." into gingerbreadHung-ying Tyan2010-12-212-5/+31
|\ \ \
| * | | Check if VoIP API is supported in SipManager.Hung-ying Tyan2010-12-212-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to make SipManager.isVoipSupported() effective. Also add NPE check now that we may return null SipAudioCall when VOIP is not supported. Bug: 3251016 Change-Id: Icd551123499f55eef190743b90980922893c4a13
* | | | Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbreadRobert Greenwalt2010-12-211-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Be sure and report NO_CONNECTIVITY when needed.Robert Greenwalt2010-12-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reports that we sometimes didn't report NO_CONNECTIVITY led to this suggested change. Could not repro the problem, but the change looks ok anyway. Better safe than sorry. bug:3276408 Change-Id: I0cdb48a05a5c9dfcf3a0b468a6eae43d461023b1
* | | | Merge "Fix issue #3224616: TimeUtils.formatDuration() can drop 0s." into ↵Dianne Hackborn2010-12-212-3/+20
|\ \ \ \ | |_|_|/ |/| | | | | | | gingerbread
| * | | Fix issue #3224616: TimeUtils.formatDuration() can drop 0s.Bjorn Bringert2010-12-202-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | Integrated from master. Change-Id: Ie12dd25cce03c06fafb7df1335266322df43b038
* | | | Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbreadSimon Wilson2010-12-203-1/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | fix [3127755] Launcher is missing anti-aliasingMathias Agopian2010-12-153-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Enable limited forms of mipmaping when possible. Change-Id: I39ad90becaa4048844fdbbbcb187333e7d59fc6a
* | | | Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but ↵Mike LeBeau2010-12-202-17/+89
|\ \ \ \ | | | | | | | | | | | | | | | we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread
| * | | | Unhide RecognizerResultsIntent. This API wasMike LeBeau2010-12-202-17/+89
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app. http://b/3135351 Change-Id: I49053717cac08e3976c22e3a105139b6755aadb8
* | | | cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954Scott Main2010-12-201-4/+3
|/ / / | | | | | | | | | | | | | | | docs: fix typos Change-Id: Ic31053b1a17b8b2e0842ba6077ad635e642dc705
* | | disable the bypass mode. DO NOT MERGE.Mathias Agopian2010-12-181-1/+0
| | | | | | | | | | | | | | | | | | | | | SF bypass mode triggers a bug in the display controller that case cause the device to freeze. Change-Id: If29b4d5132f463d13831b082b904c235f15a19fb
* | | Clean up and polish Mifare Classic tech.Martijn Coenen2010-12-171-17/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It's useful to have accessors at block level, so apps don't really have to know about the sector structure (and how many blocks there are in a sector). - There's no way to tell whether a read/write/ didn't work because of auth failure. The documentation should be changed to make this point clear. - Added increment/decrement commands, for atomic increment/decrement of value blocks. Change-Id: I590feacbcd1443f1be7a86ab046a5b1f33e2e04c
* | | Merge "Fix issue #3289835: NullPointerException in..." into gingerbreadDianne Hackborn2010-12-171-1/+4
|\ \ \
| * | | Fix issue #3289835: NullPointerException in...Dianne Hackborn2010-12-161-1/+4
| | |/ | |/| | | | | | | | | | | | | ..PackageManagerService.grantPermissionsLP when updating system app Change-Id: I36c1b96d2fe9a8737843d30f3a2669935fc281bb
* | | Remove SIP realm/domain checkHung-ying Tyan2010-12-171-6/+8
| | | | | | | | | | | | | | | | | | | | | as the realm may be different from the domain. Bug: 3283834 Change-Id: I64c9f0d6d626afdb397c5d378d30afa9d6a64ca9
* | | Merge "Check port in create peer's SIP profile." into gingerbreadHung-ying Tyan2010-12-162-5/+7
|\ \ \
| * | | Check port in create peer's SIP profile.Hung-ying Tyan2010-12-162-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SipURI returns port -1 when port is not present in the URI. Don't call SipProfile.Builder.setPort() when that happens. Bug: 3291248 Change-Id: I8e608cbc56ea82862df55fdba885f6a864db83ab
* | | | Merge "Need to check ndef before writing ndef." into gingerbreadNick Pelly2010-12-161-11/+17
|\ \ \ \
| * | | | Need to check ndef before writing ndef.Martijn Coenen2010-12-161-11/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | Regression due to all the (re)connect changes. Change-Id: I637618f63518965e893a5a59db61002271666fa4
* | | | cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308cScott Main2010-12-161-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | docs: misc fixes to the drawable reference Change-Id: I8b867234250ca18d5b6ee78a22b6150e1ba3e588
* | | | Merge "Fix issue 2712130: Sholes: problem when playing audio while recording ↵Eric Laurent2010-12-161-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | over bluetooth SCO." into gingerbread
| * | | | Fix issue 2712130: Sholes: problem when playing audio while recording over ↵Eric Laurent2010-12-151-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bluetooth SCO. The problem is that when an input stream is opened for record over bluetooth SCO, the kernel mono audio device should be opened in RW mode to allow further use of this same device by an output stream also routed to bluetooth SCO. This does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true when the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO). Change-Id: Ic78bf324b4a68e65721d763dc7682ce7a8f14f75
* | | | cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5Scott Main2010-12-165-9/+12
| |/ / |/| | | | | | | | | | | | | | docs: misc fixes for the adb move Change-Id: Ie7701d9c1656c6cb5ae6063562efeabd9eb737a3
generated by cgit v1.1 at 2025-03-15 16:14:00 +0000