summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into ↵Makoto Onuki2010-09-071-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp * commit '1cc86da61a361c84ef81e893440c500e33fae312': Don't fall through from TOKEN_EMAIL_LOOKUP
| * | | | | | | | | | Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbreadMakoto Onuki2010-09-071-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Don't fall through from TOKEN_EMAIL_LOOKUPMakoto Onuki2010-09-071-0/+3
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc08f26ba93496cfa53cd83c7df0e986ea4ece4b
* | | | | | | | | | am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbreadDianne Hackborn2010-09-073-84/+158
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp * commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026': Fixes to battery stats debug output.
| * | | | | | | | | Merge "Fixes to battery stats debug output." into gingerbreadDianne Hackborn2010-09-073-84/+158
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Fixes to battery stats debug output.Dianne Hackborn2010-09-073-84/+158
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32e7cad9633b8c517a74573069e426d9f835a83d
* | | | | | | | | am 11bbe200: Hopefully fix the build.Dianne Hackborn2010-09-071-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp * commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5': Hopefully fix the build.
| * | | | | | | | Hopefully fix the build.Dianne Hackborn2010-09-071-0/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8cd92c0895c9939e1386ef488bd1309a3be3568
* | | | | | | | am f703b77c: Merge "Add system property to turn off scheduling groups." into ↵Dianne Hackborn2010-09-072-10/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp * commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7': Add system property to turn off scheduling groups.
| * | | | | | | Merge "Add system property to turn off scheduling groups." into gingerbreadDianne Hackborn2010-09-072-10/+30
| |\ \ \ \ \ \ \
| | * | | | | | | Add system property to turn off scheduling groups.Dianne Hackborn2010-09-072-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do this: adb shell setprop debug.sys.noschedgroups 1 Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
* | | | | | | | | am 1f689f7e: Merge "When notifications are updated, don\'t re-show the ↵Joe Onorato2010-09-071-1/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticker unless the text has changed." into gingerbread Merge commit '1f689f7e35464b1ccd3ce3307b6d92283ee1290d' into gingerbread-plus-aosp * commit '1f689f7e35464b1ccd3ce3307b6d92283ee1290d': When notifications are updated, don't re-show the ticker unless the text has changed.
| * | | | | | | | Merge "When notifications are updated, don't re-show the ticker unless the ↵Joe Onorato2010-09-071-1/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text has changed." into gingerbread
| | * | | | | | | | When notifications are updated, don't re-show the ticker unless the text has ↵Joe Onorato2010-09-071-1/+6
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed. Bug: 2963867 Change-Id: I24b5bc958fb6eb0d753c88178a385232c75ea438
* | | | | | | | | am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async ↵Brad Fitzpatrick2010-09-071-2/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SharedPreference writes" into gingerbread Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp * commit 'b1104b3713febb75164938a465c3022e1879245f': Make SharedPreferencesBackupHelper wait for async SharedPreference writes
| * | | | | | | | Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference ↵Brad Fitzpatrick2010-09-071-2/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | writes" into gingerbread
| | * | | | | | | | Make SharedPreferencesBackupHelper wait for async SharedPreference writesBrad Fitzpatrick2010-09-061-2/+6
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a potential race with backups. Change-Id: I73492c0384091cedd7802109257312387fcd43f9
* | | | | | | | | am 745e751b: Merge "Preserve old translations for changed strings. DO NOT ↵Eric Fischer2010-09-0720-40/+20
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into gingerbread Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp * commit '745e751b251baa38e94dfce1fe264574d0204cc2': Preserve old translations for changed strings. DO NOT MERGE
| * | | | | | | | Merge "Preserve old translations for changed strings. DO NOT MERGE" into ↵Eric Fischer2010-09-0720-40/+20
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | gingerbread
| | * | | | | | | Preserve old translations for changed strings. DO NOT MERGEEric Fischer2010-09-0320-40/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64023ad34cba22133fd355ed4d885b3f831c5aa1
* | | | | | | | | am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into ↵Kenny Root2010-09-071-9/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp * commit '2cb3e83654c99e202c170d9d0237d8d1f4054354': Use new nativeLibraryPath field for NativeActivity
| * | | | | | | | Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbreadKenny Root2010-09-071-9/+4
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Use new nativeLibraryPath field for NativeActivityKenny Root2010-09-071-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of being naughty and guessing the native library path from dataDir, use the new nativeLibraryPath field because it can be on SD card now. Change-Id: I284bde42e0b0114366e412eb7212af22b47208d8
* | | | | | | | | am 960b31e3: Merge "SipService: unset session listener if listener is gone." ↵Hung-ying Tyan2010-09-061-12/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '960b31e3b3b40f92665be4b7a79da7f05ea19751' into gingerbread-plus-aosp * commit '960b31e3b3b40f92665be4b7a79da7f05ea19751': SipService: unset session listener if listener is gone.
| * | | | | | | | Merge "SipService: unset session listener if listener is gone." into gingerbreadHung-ying Tyan2010-09-061-12/+23
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | SipService: unset session listener if listener is gone.Hung-ying Tyan2010-09-051-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b85ee7bcb32c24cf64dfc3edc40c0cad9717562
* | | | | | | | | am 612ff274: Quell annoying Java ascii/unicode warning.Brad Fitzpatrick2010-09-061-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '612ff27425cf2976396d992f32b58ab900c7d708' into gingerbread-plus-aosp * commit '612ff27425cf2976396d992f32b58ab900c7d708': Quell annoying Java ascii/unicode warning.
| * | | | | | | | Quell annoying Java ascii/unicode warning.Brad Fitzpatrick2010-09-061-2/+2
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is already in master, so just cherry-picking it here too. Change-Id: I28c57171aa3e55933c3e98555575a074b25b2b2a
* | | | | | | | am b6264a87: Fix the build.Chung-yih Wang2010-09-051-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp * commit 'b6264a8795ed9469c80727123e3cafda1b07eda3': Fix the build.
| * | | | | | | Fix the build.Chung-yih Wang2010-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icfeec3372dcde30723c49565649be03a4dd33c06
* | | | | | | | am b12baad9: Add equals() funcation for SipPhone.Chung-yih Wang2010-09-051-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407' into gingerbread-plus-aosp * commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407': Add equals() funcation for SipPhone.
| * | | | | | | Add equals() funcation for SipPhone.Chung-yih Wang2010-09-061-0/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we will use sipuri to match the same phone object. Change-Id: I582779e51e447bb8d822c105cf0d682651c138d2
* | | | | | | am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into ↵Kenny Root2010-09-031-5/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032' into gingerbread-plus-aosp * commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032': Reduce footprint of Signature from ~7000 to ~1448
| * | | | | | Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbreadKenny Root2010-09-031-5/+9
| |\ \ \ \ \ \
| | * | | | | | Reduce footprint of Signature from ~7000 to ~1448Kenny Root2010-09-031-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signature had lazy initialization of the mString member when needed, but it would stick around forever when initialized. Each package had one or more Signatures that would be ~7000 bytes each. At a couple hundred packages, that's over 1.3MB just for signatures. Whenever packages.xml was written out, it would write the Signature for each program as well which happens at boot thereby initializing the mString member pretty much immediately. Change-Id: Idb882ffeca2861b3e87437fc83f001710d6c0441
* | | | | | | | am 3326f804: Fix the last remaining gaps in our Java 6 API.Jesse Wilson2010-09-031-47/+179
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3326f8043858152ea2a407a9a4c20fdcdc859e73' into gingerbread-plus-aosp * commit '3326f8043858152ea2a407a9a4c20fdcdc859e73': Fix the last remaining gaps in our Java 6 API.
| * | | | | | | Fix the last remaining gaps in our Java 6 API.Jesse Wilson2010-09-031-47/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://b/issue?id=2497395 See https://android-git.corp.google.com/g/64647 Change-Id: I0886e06163a3853bff69480b01e6e9f9f54fea4e
* | | | | | | | am 7e427934: Merge "LVM release 1.08 delivery." into gingerbreadEric Laurent2010-09-035-41/+69
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b' into gingerbread-plus-aosp * commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b': LVM release 1.08 delivery.
| * | | | | | | Merge "LVM release 1.08 delivery." into gingerbreadEric Laurent2010-09-035-41/+69
| |\ \ \ \ \ \ \
| | * | | | | | | LVM release 1.08 delivery.Eric Laurent2010-09-035-41/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed bundle SamplesToExit to 0.1 secs - Added SamplesToExit to Revreb - Removed mixer from Core reverb Change-Id: I675ec22889f20ef35a0ac427600c2654111c397e
* | | | | | | | | am 7627c221: DO NOT MERGE Tweak overscrollAdam Powell2010-09-031-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7627c221c6ce8bf433bf207b002eabe7236c4757' into gingerbread-plus-aosp * commit '7627c221c6ce8bf433bf207b002eabe7236c4757': DO NOT MERGE Tweak overscroll
| * | | | | | | | DO NOT MERGE Tweak overscrollAdam Powell2010-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ba00fc87ba7b286978acf577ba6461f79066437
* | | | | | | | | am 9077f8ec: Merge "Not all audio source has the drift time information" ↵James Dong2010-09-033-12/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp * commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62': Not all audio source has the drift time information
| * | | | | | | | Merge "Not all audio source has the drift time information" into gingerbreadJames Dong2010-09-033-12/+15
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Not all audio source has the drift time informationJames Dong2010-09-033-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74e502376348ca4a6ffaa7492bed35c1355e7e62
* | | | | | | | | am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.Dianne Hackborn2010-09-033-24/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp * commit '69717ccd13bb5568b912701ab39d603cfa7091cc': DO NOT MERGE. Some stuff that is Not Ready.
| * | | | | | | | DO NOT MERGE. Some stuff that is Not Ready.Dianne Hackborn2010-09-033-24/+4
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I8fdba32722d86b92c791dbf7c6c0166bcdb02852
* | | | | | | | am df3a0f50: Merge "Improve doc." into gingerbreadDianne Hackborn2010-09-031-2/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp * commit 'df3a0f50c3480911e366c8c0781b0463fe063e82': Improve doc.
| * | | | | | | Merge "Improve doc." into gingerbreadDianne Hackborn2010-09-031-2/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Improve doc.Dianne Hackborn2010-09-031-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I841b04e1e455b6236fb8b65b965f2fc25c4461f0
generated by cgit v1.1 at 2025-02-04 21:55:11 +0000