drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,488 Commits 1 Branch 0 Tags
Commit Graph

26488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
8744f87985 SipPhone: switch to its own phone type PHONE_TYPE_SIP. 
Change-Id: Ie33cfe92e59665864dbebbb38895e8e85f6db2e6
 2010-09-07 20:01:24 +08:00
Brad Fitzpatrick
6f9d58ac62 Make SharedPreferencesBackupHelper wait for async SharedPreference writes 
Fixes a potential race with backups.

Change-Id: I73492c0384091cedd7802109257312387fcd43f9
 2010-09-06 22:18:39 -07:00
Hung-ying Tyan
b6432ca4a0 am 960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread 
Merge commit '960b31e3b3b40f92665be4b7a79da7f05ea19751' into gingerbread-plus-aosp

* commit '960b31e3b3b40f92665be4b7a79da7f05ea19751':
  SipService: unset session listener if listener is gone.
 2010-09-06 20:16:51 -07:00
Hung-ying Tyan
960b31e3b3 Merge "SipService: unset session listener if listener is gone." into gingerbread 2010-09-06 20:13:32 -07:00
Brad Fitzpatrick
32e298511a am 612ff274: Quell annoying Java ascii/unicode warning. 
Merge commit '612ff27425cf2976396d992f32b58ab900c7d708' into gingerbread-plus-aosp

* commit '612ff27425cf2976396d992f32b58ab900c7d708':
  Quell annoying Java ascii/unicode warning.
 2010-09-06 19:34:43 -07:00
Brad Fitzpatrick
612ff27425 Quell annoying Java ascii/unicode warning. 
This fix is already in master, so just cherry-picking it here too.

Change-Id: I28c57171aa3e55933c3e98555575a074b25b2b2a
 2010-09-06 19:22:09 -07:00
Chung-yih Wang
b65fd4726c am b6264a87: Fix the build. 
Merge commit 'b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp

* commit 'b6264a8795ed9469c80727123e3cafda1b07eda3':
  Fix the build.
 2010-09-05 22:01:38 -07:00
Chung-yih Wang
b6264a8795 Fix the build. 
Change-Id: Icfeec3372dcde30723c49565649be03a4dd33c06
 2010-09-06 12:58:18 +08:00
Chung-yih Wang
2143ade803 am b12baad9: Add equals() funcation for SipPhone. 
Merge commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407' into gingerbread-plus-aosp

* commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407':
  Add equals() funcation for SipPhone.
 2010-09-05 21:12:57 -07:00
Chung-yih Wang
b12baad935 Add equals() funcation for SipPhone. 
Since we will use sipuri to match the same phone object.

Change-Id: I582779e51e447bb8d822c105cf0d682651c138d2
 2010-09-06 12:05:46 +08:00
Hung-ying Tyan
1b1601d740 SipService: unset session listener if listener is gone. 
Change-Id: I0b85ee7bcb32c24cf64dfc3edc40c0cad9717562
 2010-09-05 00:26:11 +08:00
Kenny Root
a060b5f738 am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread 
Merge commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032' into gingerbread-plus-aosp

* commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032':
  Reduce footprint of Signature from ~7000 to ~1448
 2010-09-03 17:07:15 -07:00
Kenny Root
6dc003a73f Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread 2010-09-03 16:59:42 -07:00
Jesse Wilson
783f14ddc9 am 3326f804: Fix the last remaining gaps in our Java 6 API. 
Merge commit '3326f8043858152ea2a407a9a4c20fdcdc859e73' into gingerbread-plus-aosp

* commit '3326f8043858152ea2a407a9a4c20fdcdc859e73':
  Fix the last remaining gaps in our Java 6 API.
 2010-09-03 16:42:51 -07:00
Eric Laurent
ef9e508c2c am 7e427934: Merge "LVM release 1.08 delivery." into gingerbread 
Merge commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b' into gingerbread-plus-aosp

* commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b':
  LVM release 1.08 delivery.
 2010-09-03 16:39:59 -07:00
Jesse Wilson
3326f80438 Fix the last remaining gaps in our Java 6 API. 
See http://b/issue?id=2497395
See https://android-git.corp.google.com/g/64647

Change-Id: I0886e06163a3853bff69480b01e6e9f9f54fea4e
 2010-09-03 16:37:27 -07:00
Eric Laurent
7e427934e6 Merge "LVM release 1.08 delivery." into gingerbread 2010-09-03 16:35:54 -07:00
Adam Powell
0354f0cad5 am 7627c221: DO NOT MERGE Tweak overscroll 
Merge commit '7627c221c6ce8bf433bf207b002eabe7236c4757' into gingerbread-plus-aosp

* commit '7627c221c6ce8bf433bf207b002eabe7236c4757':
  DO NOT MERGE Tweak overscroll
 2010-09-03 16:33:37 -07:00
Adam Powell
7627c221c6 DO NOT MERGE Tweak overscroll 
Change-Id: I5ba00fc87ba7b286978acf577ba6461f79066437
 2010-09-03 16:09:03 -07:00
Kenny Root
de0ff63700 Reduce footprint of Signature from ~7000 to ~1448 
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
 2010-09-03 16:02:27 -07:00
James Dong
d6fd133d18 am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread 
Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp

* commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62':
  Not all audio source has the drift time information
 2010-09-03 15:45:01 -07:00
James Dong
9077f8ec93 Merge "Not all audio source has the drift time information" into gingerbread 2010-09-03 15:42:09 -07:00
Dianne Hackborn
acc4e041d2 am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready. 
Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp

* commit '69717ccd13bb5568b912701ab39d603cfa7091cc':
  DO NOT MERGE.  Some stuff that is Not Ready.
 2010-09-03 15:23:46 -07:00
Eric Laurent
5fa6df6ebf LVM release 1.08 delivery. 
- Changed bundle SamplesToExit to 0.1 secs
- Added SamplesToExit to Revreb
- Removed mixer from Core reverb

Change-Id: I675ec22889f20ef35a0ac427600c2654111c397e
 2010-09-03 15:22:18 -07:00
Dianne Hackborn
69717ccd13 DO NOT MERGE. Some stuff that is Not Ready. 
Change-Id: I8fdba32722d86b92c791dbf7c6c0166bcdb02852
 2010-09-03 15:20:06 -07:00
Dianne Hackborn
6a3ffb5bee am df3a0f50: Merge "Improve doc." into gingerbread 
Merge commit 'df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp

* commit 'df3a0f50c3480911e366c8c0781b0463fe063e82':
  Improve doc.
 2010-09-03 15:18:39 -07:00
Dianne Hackborn
df3a0f50c3 Merge "Improve doc." into gingerbread 2010-09-03 15:15:50 -07:00
Dianne Hackborn
170bae7d83 Improve doc. 
Change-Id: I841b04e1e455b6236fb8b65b965f2fc25c4461f0
 2010-09-03 15:14:28 -07:00
Dianne Hackborn
fd3f44b388 am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread 
Merge commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp

* commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8':
  Adding a feature denoting support for 5 or more fully
 2010-09-03 15:10:24 -07:00
Dianne Hackborn
e1aa82a422 Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread 2010-09-03 15:07:17 -07:00
Eric Fischer
3a94b7c121 Preserve old translations for changed strings. DO NOT MERGE 
Change-Id: I64023ad34cba22133fd355ed4d885b3f831c5aa1
 2010-09-03 14:55:45 -07:00
Andreas Huber
8e11c82247 am 9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting. 
Merge commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba' into gingerbread-plus-aosp

* commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba':
  Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
 2010-09-03 14:50:18 -07:00
Dan Morrill
6993d3d136 Adding a feature denoting support for 5 or more fully 
independent multitouch pointers.

Change-Id: I9997ed9c481dbd507e9eff70d8beb9e1140cca3f
 2010-09-03 14:41:36 -07:00
Andreas Huber
9fee0b2a02 Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting. 
Change-Id: Ifb564c6cdf6137eac14869f9ca7d471f05a5556a
related-to-bug: 2974691
 2010-09-03 14:31:50 -07:00
John Wang
419126a696 am dc243482: Merge "Add API to get all foreground calls." into gingerbread 
Merge commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20' into gingerbread-plus-aosp

* commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20':
  Add API to get all foreground calls.
 2010-09-03 14:08:32 -07:00
John Wang
dc243482d6 Merge "Add API to get all foreground calls." into gingerbread 2010-09-03 14:06:20 -07:00
Adam Powell
f9a1ff4173 am e7c02ef4: Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread 
Merge commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f' into gingerbread-plus-aosp

* commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f':
  Fix bug 2973252 - Make overscroll glow respect ifContentScrolls
 2010-09-03 14:00:41 -07:00
Adam Powell
e7c02ef40a Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread 2010-09-03 13:58:37 -07:00
Andreas Huber
af7a7c34e0 am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread 
Merge commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5' into gingerbread-plus-aosp

* commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5':
  Properly buffer a certain amount of data on streaming sources before finishing prepare().
 2010-09-03 13:48:43 -07:00
Andreas Huber
cc4a38c60f Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread 2010-09-03 13:46:02 -07:00
Andreas Huber
87ab9cdd0f Properly buffer a certain amount of data on streaming sources before finishing prepare(). 
Change-Id: I39bf3c6dafcbe003b51dea4795742dcd8548f207
related-to-bug: 2875110
 2010-09-03 13:44:42 -07:00
Dianne Hackborn
3d7d3690de am e25b4bc7: Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread 
Merge commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp

* commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99':
  These are not ready to be exposed.  Also rename them to be better.
 2010-09-03 13:26:30 -07:00
Dianne Hackborn
e25b4bc76f Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread 2010-09-03 13:24:33 -07:00
Scott Main
bfbf84b726 am 2b136832: am c4367e54: fix code snippet error 
Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp

* commit '2b136832be7326caed0c79bae418c2dd54372bea':
  fix code snippet error
 2010-09-03 13:18:28 -07:00
Scott Main
2b136832be am c4367e54: fix code snippet error 
Merge commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread

* commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3':
  fix code snippet error
 2010-09-03 13:15:11 -07:00
Dianne Hackborn
482566ed5c These are not ready to be exposed. Also rename them to be better. 
Change-Id: I7c234144497084b7769f8c46761b7d74d1c583d5
 2010-09-03 12:51:28 -07:00
Brad Fitzpatrick
9eb32c96c8 am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread 
Merge commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp

* commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8':
  More SharedPreferences commit() -> apply() changes.
 2010-09-03 12:49:44 -07:00
Brad Fitzpatrick
a2f2141c84 Merge "More SharedPreferences commit() -> apply() changes." into gingerbread 2010-09-03 12:46:25 -07:00
Adam Powell
e6ffce9f65 Fix bug 2973252 - Make overscroll glow respect ifContentScrolls 
Change-Id: I0e4bf09c0cbc660c9b8d26a3526b09568c05e93d
 2010-09-03 12:06:51 -07:00
James Dong
3caa71483f Not all audio source has the drift time information 
Change-Id: I74e502376348ca4a6ffaa7492bed35c1355e7e62
 2010-09-03 12:01:55 -07:00