summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 108a06c9: Merge "CallManager: remove unused Phone argument from ↵Hung-ying Tyan2010-08-251-3/+3
|\ | | | | | | | | | | | | | | | | stopDtmf() and sendBurstDtmf()" into gingerbread Merge commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf' into gingerbread-plus-aosp * commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf': CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
| * Merge "CallManager: remove unused Phone argument from stopDtmf() and ↵Hung-ying Tyan2010-08-251-3/+3
| |\ | | | | | | | | | sendBurstDtmf()" into gingerbread
| | * CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()Hung-ying Tyan2010-08-251-3/+3
| | | | | | | | | | | | Change-Id: Ib0c83c373580f7be9cb1ee262cd0098c70db9c64
* | | am ea52d35e: Merge "Add dynamic uid info for tracking the sip service ↵Chung-yih Wang2010-08-252-10/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | usage." into gingerbread Merge commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe' into gingerbread-plus-aosp * commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe': Add dynamic uid info for tracking the sip service usage.
| * | Merge "Add dynamic uid info for tracking the sip service usage." into ↵Chung-yih Wang2010-08-252-10/+24
| |\ \ | | | | | | | | | | | | gingerbread
| | * | Add dynamic uid info for tracking the sip service usage.Chung-yih Wang2010-08-262-10/+24
| | |/ | | | | | | | | | Change-Id: Ibc340401b63799326b08aee6eba602a3e753b13f
* | | am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once ↵Konstantin Lopyrev2010-08-252-15/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp * commit '6947cc594276df899a0c4662224455f40846bd0a': Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
| * | Merge "Preventing the hierarchy viewer from getting stuck, once when trying ↵Konstantin Lopyrev2010-08-252-15/+32
| |\ \ | | | | | | | | | | | | to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread
| | * | Preventing the hierarchy viewer from getting stuck, once when trying to load ↵Konstantin Lopyrev2010-08-252-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared. Change-Id: Iaff6bd501a2bb3faa7a394fff740479f6a95e899
* | | | am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for ↵Romain Guy2010-08-251-0/+25
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | future use" into gingerbread Merge commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb' into gingerbread-plus-aosp * commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb': reserve android.opengl.GLWallpaperService name for future use
| * | | Merge "reserve android.opengl.GLWallpaperService name for future use" into ↵Romain Guy2010-08-251-0/+25
| |\ \ \ | | | | | | | | | | | | | | | gingerbread
| | * | | reserve android.opengl.GLWallpaperService name for future useMathias Agopian2010-08-251-0/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: I7a217593a1ca39214dda26ddb3af3ddc30a8a95a
* | | | | am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbreadKenny Root2010-08-252-8/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2e7427f39ec15dcb43cc1247372b53980be11d38' into gingerbread-plus-aosp * commit '2e7427f39ec15dcb43cc1247372b53980be11d38': Add LFH offset to verbose list of APK
| * | | | Merge "Add LFH offset to verbose list of APK" into gingerbreadKenny Root2010-08-252-8/+9
| |\ \ \ \
| | * | | | Add LFH offset to verbose list of APKKenny Root2010-08-252-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Local File Header (LFH) offset is printed in debugging cases when the platform is inspecting APKs. This adds the LFH offset field to the list of contents of an APK, so that it can be checked easily against the Central Directory (CD). Change-Id: I08f9a13256bfe6563c1a963c4f0289789b2e7857
* | | | | | am 50395e80: Merge "Fix a fun bug with multiple service bindings from an ↵Dianne Hackborn2010-08-252-143/+198
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity." into gingerbread Merge commit '50395e80718e77d27ec5e2d474b255e05de68d82' into gingerbread-plus-aosp * commit '50395e80718e77d27ec5e2d474b255e05de68d82': Fix a fun bug with multiple service bindings from an activity.
| * | | | | Merge "Fix a fun bug with multiple service bindings from an activity." into ↵Dianne Hackborn2010-08-252-143/+198
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gingerbread
| | * | | | | Fix a fun bug with multiple service bindings from an activity.Dianne Hackborn2010-08-252-143/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a flaw in the service management, when the same activity is doing a bindService() for the same service IBinder. In this case the activity would correctly keep a list of all generated connections, however some other data structures would assume there is only one connection per IBinder, and thus only remember the last. When that last connection was unbound, the service would be destroyed since it thought there were no more connections. Then when the activity was finished, it would try to destroy the service again and end up with an ANR because the service was already gone and would not respond. Change-Id: I59bde38bc24e78147b90b0a7cd525c2a1d20489f
* | | | | | | am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbreadMathias Agopian2010-08-251-1/+18
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3' into gingerbread-plus-aosp * commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3': Improve Sensors documentation a bit
| * | | | | | Merge "Improve Sensors documentation a bit" into gingerbreadMathias Agopian2010-08-251-1/+18
| |\ \ \ \ \ \
| | * | | | | | Improve Sensors documentation a bitMathias Agopian2010-08-251-1/+18
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f4f9ebfaf1e7f461a795f717b9913e3a021e9d4
* | | | | | | am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 ↵Andreas Huber2010-08-252-4/+85
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tags." into gingerbread Merge commit '8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp * commit '8ac0983edafa064126c4480dd31047d1bb4ce111': Fix support for per-frame unsynchronization in ID3V2.4 tags.
| * | | | | | Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into ↵Andreas Huber2010-08-252-4/+85
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | * | | | | | Fix support for per-frame unsynchronization in ID3V2.4 tags.Andreas Huber2010-08-252-4/+85
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6874b596f88817347756a375d9fb1c9bff418eca related-to-bug: 2949149
* | | | | | | am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting ↵Mathias Agopian2010-08-251-11/+21
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in camcorder." into gingerbread Merge commit '4cffbb47a28faa594c2217d1e84f9382e0b57cc4' into gingerbread-plus-aosp * commit '4cffbb47a28faa594c2217d1e84f9382e0b57cc4': fix [2946787] Screen flicker on low resolution setting in camcorder.
| * | | | | | Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." ↵Mathias Agopian2010-08-251-11/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | * | | | | | fix [2946787] Screen flicker on low resolution setting in camcorder.Mathias Agopian2010-08-251-11/+21
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Change-Id: I7e86f2b6d85dcae8dd212890b978fa6ac7de6893
* | | | | | | am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbreadBrad Fitzpatrick2010-08-253-2/+51
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4' into gingerbread-plus-aosp * commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4': Start of SharedPreferences$Editor.startCommit()
| * | | | | | Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbreadBrad Fitzpatrick2010-08-253-3/+52
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Start of SharedPreferences$Editor.startCommit()Brad Fitzpatrick2010-08-253-3/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No implementation yet, just the interface. Change-Id: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
* | | | | | | am c14f9ca6: Merge "Added preset reverb." into gingerbreadEric Laurent2010-08-253-55/+201
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c14f9ca6e5e795b641e7809786b4e51e13493907' into gingerbread-plus-aosp * commit 'c14f9ca6e5e795b641e7809786b4e51e13493907': Added preset reverb.
| * | | | | | Merge "Added preset reverb." into gingerbreadEric Laurent2010-08-253-55/+201
| |\ \ \ \ \ \
| | * | | | | | Added preset reverb.Eric Laurent2010-08-243-55/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified lvm reverb wrapper code to expose a preset reverb interface. Also removed debug log from bundle and reverb wrapper. Change-Id: If9b95d91e25a6ff834decdfdda34b17df9b46967
* | | | | | | | am 23584022: Merge "Ensure that buffering updates eventually hit 100% after ↵Andreas Huber2010-08-251-12/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we download everything." into gingerbread Merge commit '235840228b0692b66d854ff499b5c4060f883e03' into gingerbread-plus-aosp * commit '235840228b0692b66d854ff499b5c4060f883e03': Ensure that buffering updates eventually hit 100% after we download everything.
| * | | | | | | Merge "Ensure that buffering updates eventually hit 100% after we download ↵Andreas Huber2010-08-251-12/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | everything." into gingerbread
| | * | | | | | | Ensure that buffering updates eventually hit 100% after we download everything.Andreas Huber2010-08-251-12/+19
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I43bb85b1128fa9c1bc8632970d7101006393bcc8 related-to-bug: 2844095
* | | | | | | | am d64f4a98: DO NOT MERGE fix null checkCary Clark2010-08-251-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp * commit 'd64f4a983df4fd11795e04896d8c48852f6b1777': DO NOT MERGE fix null check
| * | | | | | | DO NOT MERGE fix null checkCary Clark2010-08-251-2/+4
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check to see if the WebChromeClient is null. Checked into master in change 63008 Change-Id: If2ef1889ce3633c0b35c078a46bde84982dd1eb3 http://b/2945171
* | | | | | | am b8814dce: Merge "Allow sniffers to return a packet of opaque data that ↵Andreas Huber2010-08-2517-32/+87
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread Merge commit 'b8814dce287552c1bdf13fa999296ebc7387776d' into gingerbread-plus-aosp * commit 'b8814dce287552c1bdf13fa999296ebc7387776d': Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
| * | | | | | Merge "Allow sniffers to return a packet of opaque data that the ↵Andreas Huber2010-08-2517-32/+87
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread
| | * | | | | Allow sniffers to return a packet of opaque data that the corresponding ↵Andreas Huber2010-08-2517-32/+87
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now. Change-Id: Icb77ae3ee95a69c7da25b4d3b8696c0a2d33028a related-to-bug: 2948754
* | | | | | am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with ↵Mathias Agopian2010-08-251-6/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SW usage bits" into gingerbread Merge commit '8eb16af29303cda190133a1d220b9ecd9341e261' into gingerbread-plus-aosp * commit '8eb16af29303cda190133a1d220b9ecd9341e261': don't try to lock a buffer that wasn't allocated with SW usage bits
| * | | | | Merge "don't try to lock a buffer that wasn't allocated with SW usage bits" ↵Mathias Agopian2010-08-251-6/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | * | | | | don't try to lock a buffer that wasn't allocated with SW usage bitsMathias Agopian2010-08-251-6/+10
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Change-Id: Iabbcec1bfa30dc47d45ece699dd178653f1b675b
* | | | | | am 4d672988: Merge "Remove "StringTest.java"." into gingerbreadBrian Carlstrom2010-08-252-952/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4d672988fed7fbdd887fe78603fa2eaf713031ad' into gingerbread-plus-aosp * commit '4d672988fed7fbdd887fe78603fa2eaf713031ad': Remove "StringTest.java".
| * | | | | Merge "Remove "StringTest.java"." into gingerbreadBrian Carlstrom2010-08-252-952/+0
| |\ \ \ \ \
| | * | | | | Remove "StringTest.java".Brian Carlstrom2010-08-242-952/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only tests stuff that's already better tested in dalvik/libcore, plus private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this is the only caller of. Conflicts: tests/CoreTests/android/core/StringTest.java git cherry-pick -e 935022a99dac5454fc478e221b6392f3ba467009 Change-Id: I0bd172f2703bbcd6381920d40244165234fef4a1
* | | | | | | am 24bf70ca: Merge "Update AndroidRuntime with dalvik-dev changes" into ↵Brian Carlstrom2010-08-251-52/+28
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a' into gingerbread-plus-aosp * commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a': Update AndroidRuntime with dalvik-dev changes
| * | | | | | Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbreadBrian Carlstrom2010-08-251-52/+28
| |\ \ \ \ \ \
| | * | | | | | Update AndroidRuntime with dalvik-dev changesBrian Carlstrom2010-08-241-52/+28
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is the result of three cherry-picks: - Add dalvik.vm.gc.preverify dalvik.vm.gc.postverify properties. git cherry-pick --no-commit 0ef82fcf - Add the property dalvik.vm.gc.verifycardtable to set the -Xgc:-Xgc:verifycardtable option for the vm. git cherry-pick --no-commit 8b4faf54 - Eliminate short JIT debugging properties git cherry-pick --no-commit 57a673fc3db9d84908467ae6d245fd60d4637b2f Change-Id: I5f8002ed1e431344570add02f58e2641c8fae549
generated by cgit v1.1 at 2025-11-26 17:01:37 +0000