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

9448 Commits

Author SHA1 Message Date
Makoto Onuki
3f6e4d56bb am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 
Merge commit '1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp

* commit '1cc86da61a361c84ef81e893440c500e33fae312':
  Don't fall through from TOKEN_EMAIL_LOOKUP
 2010-09-07 14:34:19 -07:00
Makoto Onuki
1cc86da61a Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 2010-09-07 14:31:34 -07:00
Dianne Hackborn
75f0024cf4 am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread 
Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp

* commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
  Fixes to battery stats debug output.
 2010-09-07 14:15:17 -07:00
Dianne Hackborn
b5e3165129 Fixes to battery stats debug output. 
Change-Id: I32e7cad9633b8c517a74573069e426d9f835a83d
 2010-09-07 14:09:36 -07:00
Brad Fitzpatrick
c19c9e4ee2 am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread 
Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp

* commit 'b1104b3713febb75164938a465c3022e1879245f':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
 2010-09-07 11:15:01 -07:00
Brad Fitzpatrick
b1104b3713 Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread 2010-09-07 11:12:51 -07:00
Kenny Root
f17bd19acb am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread 
Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp

* commit '2cb3e83654c99e202c170d9d0237d8d1f4054354':
  Use new nativeLibraryPath field for NativeActivity
 2010-09-07 10:49:22 -07:00
Makoto Onuki
a362e1d794 Don't fall through from TOKEN_EMAIL_LOOKUP 
Change-Id: Ifc08f26ba93496cfa53cd83c7df0e986ea4ece4b
 2010-09-07 10:46:59 -07:00
Kenny Root
2cb3e83654 Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread 2010-09-07 10:46:14 -07:00
Kenny Root
6798b62e92 Use new nativeLibraryPath field for NativeActivity 
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
 2010-09-07 10:44:21 -07: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
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
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
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
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
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
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
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
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
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
Adam Powell
e6ffce9f65 Fix bug 2973252 - Make overscroll glow respect ifContentScrolls 
Change-Id: I0e4bf09c0cbc660c9b8d26a3526b09568c05e93d
 2010-09-03 12:06:51 -07:00
Brad Fitzpatrick
fa8e271636 More SharedPreferences commit() -> apply() changes. 
Change-Id: Ibc844d72d463434722a349f5bbc02889a9feb0ee
 2010-09-03 11:18:28 -07:00
Gilles Debunne
ece9e19478 am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread 
Merge commit 'd180232e92b78067beb7f84d7f3d1d21865f0594' into gingerbread-plus-aosp

* commit 'd180232e92b78067beb7f84d7f3d1d21865f0594':
  Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
 2010-09-02 15:34:24 -07:00
Gilles Debunne
d4723bb415 Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread" 
This reverts commit 26d708d93624d2d060529b7e33e0a20172e85efd, reversing
changes made to 3ac85d31de6cab5a468b7728b3340cf1b57bc8fe.

Change-Id: Ifc19f837bee7437707ddddf0b19cb6bce53dd2c5
 2010-09-02 15:27:47 -07:00
Gilles Debunne
5402c34b27 am 26d708d9: Merge "InputMethodManager showSoftInput return documentation." into gingerbread 
Merge commit '26d708d93624d2d060529b7e33e0a20172e85efd' into gingerbread-plus-aosp

* commit '26d708d93624d2d060529b7e33e0a20172e85efd':
  InputMethodManager showSoftInput return documentation.
 2010-09-02 14:55:51 -07:00
Gilles Debunne
26d708d936 Merge "InputMethodManager showSoftInput return documentation." into gingerbread 2010-09-02 14:50:25 -07:00
Daisuke Miyakawa
fa5a46a08e am 3010713f: Fix again. 
Merge commit '3010713f50aa6ac189b1990421cfab1d426bc601' into gingerbread-plus-aosp

* commit '3010713f50aa6ac189b1990421cfab1d426bc601':
  Fix again.
 2010-09-02 13:54:48 -07:00
Daisuke Miyakawa
3010713f50 Fix again. 
Change-Id: I7393e1e9e9aa3f8612d143840109f1c5193f692f
 2010-09-02 13:48:09 -07:00
Daisuke Miyakawa
22a17ce60b am b1f5a54a: Merge "VCard refactoring backport." into gingerbread 
Merge commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7' into gingerbread-plus-aosp

* commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7':
  VCard refactoring backport.
 2010-09-02 12:59:36 -07:00
Daisuke Miyakawa
69831d9dc1 VCard refactoring backport. 
Change-Id: Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34
 2010-09-02 10:39:00 -07:00
Adam Powell
0358def776 am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp

* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.
 2010-09-02 00:31:03 -07:00
Adam Powell
79492a0d75 Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 2010-09-02 00:28:14 -07:00
Adam Powell
5916882c3f DO NOT MERGE Overscroll continues; asset and behavior tweaks. 
Change-Id: I367643877a397e7b4fa9bd8c40639ff69436e7f0
 2010-09-02 00:14:53 -07:00
Dianne Hackborn
840f0fecd8 am d3efa392: Clean up some permissions. 
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp

* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
  Clean up some permissions.
 2010-09-01 22:51:35 -07:00
Dianne Hackborn
d3efa39244 Clean up some permissions. 
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.

Also deprecate the activity API to go in the foreground.  I didn't
realize that was released in the SDK.  It needs to go away.

Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
 2010-09-01 21:19:40 -07:00
Jason Chen
9fadca71e4 am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml 
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp

* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
  DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
 2010-09-01 19:16:41 -07:00
Jason Chen
b766ab830a DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml 
Previous changes only added javadoc annotation, but didn't apply
annotation to the source. Fixing this and updating current.xml.

Change-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab
 2010-09-01 19:04:18 -07:00
Hung-ying Tyan
3e4975a52c am 3424c02e: Add software features for SIP and VOIP 
Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp

* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
  Add software features for SIP and VOIP
 2010-09-01 18:01:31 -07:00
Hung-ying Tyan
3424c02e6b Add software features for SIP and VOIP 
and block SipService creation and SIP API if the feature is not available.

Change-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc
 2010-09-02 08:10:13 +08:00