ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,972 Commits 2 Branches 0 Tags 54 MiB
913ae44953
Commit Graph

13972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
651e63c4f7 am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo 
Merge commit '4e7cacd3e44bd222a7892113336caff571a9983a' into froyo-plus-aosp

* commit '4e7cacd3e44bd222a7892113336caff571a9983a':
  Maybe fix issue #2568615: System server crashed in SyncStorageEngine
 2010-04-07 11:52:21 -07:00
Dianne Hackborn
3d47856532 am 8258fda1: Fix issue #2576268: There is no uiMode config change constant for the manifest 
Merge commit '8258fda17741b4969b93ffbe8796c76e427a9f27' into froyo-plus-aosp

* commit '8258fda17741b4969b93ffbe8796c76e427a9f27':
  Fix issue #2576268: There is no uiMode config change constant for the manifest
 2010-04-07 11:52:17 -07:00
Dianne Hackborn
e098fb12b8 Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo 2010-04-07 11:49:37 -07:00
Andreas Huber
ddb4ab191d am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo 
Merge commit '567b57b68884c68e3c95834589e5f7921f380a45' into froyo-plus-aosp

* commit '567b57b68884c68e3c95834589e5f7921f380a45':
  Report the requested seek time while seek is in progress.
 2010-04-07 11:02:11 -07:00
Andreas Huber
5bf9232cf2 Merge "Report the requested seek time while seek is in progress." into froyo 2010-04-07 10:58:05 -07:00
Xia Wang
f8f27eeccc am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo 
Merge commit 'c93386cece18b8467c69004561e8f22b6b053d24' into froyo-plus-aosp

* commit 'c93386cece18b8467c69004561e8f22b6b053d24':
  Fix bug2537659
 2010-04-07 10:32:38 -07:00
Romain Guy
31c09444e5 am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564 
Merge commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8' into froyo-plus-aosp

* commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8':
  Search for focusable views only after layout has happened when the window is first created.
 2010-04-07 10:32:34 -07:00
Xia Wang
9a3965f1f8 Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo 2010-04-07 10:30:19 -07:00
Leon Scroggins
3858f94f45 am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo 
Merge commit '083c715d06a99951429b38c62484f8c3caf43cd1' into froyo-plus-aosp

* commit '083c715d06a99951429b38c62484f8c3caf43cd1':
  Show the microphone when the search box is opened from browser
 2010-04-07 10:09:06 -07:00
Leon Scroggins
e5794f17df Merge "Show the microphone when the search box is opened from browser" into froyo 2010-04-07 10:04:50 -07:00
Adam Powell
310968f0dd am eb3d47e4: Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo 
Merge commit 'eb3d47e43ac971b7d965db9a53ca92db2ce47d77' into froyo-plus-aosp

* commit 'eb3d47e43ac971b7d965db9a53ca92db2ce47d77':
  Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection
 2010-04-07 09:51:48 -07:00
Adam Powell
6d1f97872e Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo 2010-04-07 09:48:48 -07:00
Scott Main
e26beedb95 am f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo 
Merge commit 'f61eade258d5274b8447c0ea936ee578b7dc063a' into froyo-plus-aosp

* commit 'f61eade258d5274b8447c0ea936ee578b7dc063a':
  docs: add a screenLayout and uiMode values for configChanges attribute
 2010-04-07 09:06:51 -07:00
Scott Main
befda9c6ad Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo 2010-04-07 09:02:59 -07:00
Daniel Sandler
282a96c3ef am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo 
Merge commit 'c957ebef9755d15f92c27d690641995587c0ba2f' into froyo-plus-aosp

* commit 'c957ebef9755d15f92c27d690641995587c0ba2f':
  Add more WindowManager flags to ViewDebug.
 2010-04-07 06:44:04 -07:00
Daniel Sandler
b033f112e5 Merge "Add more WindowManager flags to ViewDebug." into froyo 2010-04-07 06:40:26 -07:00
Wu-cheng Li
b30575d4eb am cae57d62: Fix SDK build. 
Merge commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8' into froyo-plus-aosp

* commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8':
  Fix SDK build.
 2010-04-06 23:08:51 -07:00
Dan Egnor
bd28a683b1 am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo 
Merge commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8' into froyo-plus-aosp

* commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8':
  Comment-only change to clarify the role and use of IntentService
 2010-04-06 22:03:04 -07:00
Dan Egnor
86acf64c14 Merge "Comment-only change to clarify the role and use of IntentService" into froyo 2010-04-06 20:50:25 -07:00
Brett Chabot
68095b935d am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo 
Merge commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6' into froyo-plus-aosp

* commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6':
  Add makefile so package manager test apks can get buitl from root.
 2010-04-06 17:36:49 -07:00
Brett Chabot
34bff4887a Merge "Add makefile so package manager test apks can get buitl from root." into froyo 2010-04-06 16:31:14 -07:00
Andreas Huber
89dedf2668 am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo 
Merge commit '2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7' into froyo-plus-aosp

* commit '2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
 2010-04-06 14:46:14 -07:00
Andreas Huber
dfbd07c3a4 Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo 2010-04-06 14:43:05 -07:00
Kenny Root
b2b3b0512c am f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo 
Merge commit 'f1b256f5198d12952302ef2b6214a79927918866' into froyo-plus-aosp

* commit 'f1b256f5198d12952302ef2b6214a79927918866':
  Fix last character of password field being visible after rotation
 2010-04-06 14:36:36 -07:00
Kenny Root
eb21758490 Merge "Fix last character of password field being visible after rotation" into froyo 2010-04-06 14:33:24 -07:00
Daniel Lehmann
d327d0d213 am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo 
Merge commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp

* commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678':
  Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
 2010-04-06 14:14:21 -07:00
Daniel Lehmann
d8172858f3 Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo 2010-04-06 14:10:04 -07:00
Christopher Tate
c92f523d3a am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo 
Merge commit '1bfcaa592cb10059d185d8408935571d16727f54' into froyo-plus-aosp

* commit '1bfcaa592cb10059d185d8408935571d16727f54':
  Fix 'bmgr restore'
 2010-04-06 12:38:50 -07:00
Grace Kloba
124e405385 am 54fccf8a: Merge "Update the Webkit version." into froyo 
Merge commit '54fccf8a074f1b743df5b270c4f85e0e602d7f46' into froyo-plus-aosp

* commit '54fccf8a074f1b743df5b270c4f85e0e602d7f46':
  Update the Webkit version.
 2010-04-06 12:38:47 -07:00
Romain Guy
ad01b202a6 am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo 
Merge commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp

* commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
  Correctly resize dialogs when measured in WRAP_CONTENT
 2010-04-06 12:38:33 -07:00
Dianne Hackborn
475a487185 am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo 
Merge commit '48bce4515d948971a122a1e17fd1919f81297d77' into froyo-plus-aosp

* commit '48bce4515d948971a122a1e17fd1919f81297d77':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
 2010-04-06 12:38:22 -07:00
Christopher Tate
baf3790f49 Merge "Fix 'bmgr restore'" into froyo 2010-04-06 12:19:11 -07:00
Grace Kloba
a4a76d55d7 Merge "Update the Webkit version." into froyo 2010-04-06 11:50:32 -07:00
Romain Guy
59527c4cf0 Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo 2010-04-06 11:25:43 -07:00
Dianne Hackborn
eb00f8f722 Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo 2010-04-06 11:18:01 -07:00
Suchi Amalapurapu
bed12215d0 am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo 
Merge commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c' into froyo-plus-aosp

* commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c':
  Forcibly unmount the sdcard after N retries.
 2010-04-06 10:55:43 -07:00
Suchi Amalapurapu
0a97468698 Merge "Forcibly unmount the sdcard after N retries." into froyo 2010-04-06 10:50:56 -07:00
Irfan Sheriff
9a2a50bed3 am b2e6c01f: Disable tethering when airplane mode is enabled 
Merge commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6' into froyo-plus-aosp

* commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6':
  Disable tethering when airplane mode is enabled
 2010-04-06 10:48:46 -07:00
Bjorn Bringert
caefc0739c am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo 
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp

* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
  Guard against NPE in SearchManagerService
 2010-04-06 08:57:01 -07:00
Bjorn Bringert
660557de27 Merge "Guard against NPE in SearchManagerService" into froyo 2010-04-06 08:53:12 -07:00
Joe Onorato
28b00ca814 am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo 
Merge commit 'fa588fc37420a1a4d287e6307700ca310897308a' into froyo-plus-aosp

* commit 'fa588fc37420a1a4d287e6307700ca310897308a':
  Redo the look of the recent apps switcher
 2010-04-06 08:36:05 -07:00
Joe Onorato
07c0f3cebe Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 08:32:07 -07:00
Dianne Hackborn
3abb362c29 am 6e52b5d7: 2568467 System crash when installing corrupt APK 
Merge commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8' into froyo-plus-aosp

* commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8':
  2568467 System crash when installing corrupt APK
 2010-04-05 18:45:50 -07:00
Dianne Hackborn
6b007324e9 am 01f6b75b: Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo 
Merge commit '01f6b75baa3b9144240fa8c9772859ab4ac948bd' into froyo-plus-aosp

* commit '01f6b75baa3b9144240fa8c9772859ab4ac948bd':
  Fix issue #2564479: Favorite Recipes App Installation Fail
 2010-04-05 18:39:04 -07:00
Dianne Hackborn
a388fe0a27 Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo 2010-04-05 18:35:11 -07:00
Jim Miller
5047c0841d am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo 
Merge commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1' into froyo-plus-aosp

* commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1':
  Fix 2325549: Allow up to 4 lines of summary text in Settings
 2010-04-05 17:21:20 -07:00
Jim Miller
3abdeafc34 Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo 2010-04-05 17:16:00 -07:00
Dirk Dougherty
73b2cd72c4 am bcbb7b27: Merge "docs: add manifest documentation for installLocation" into froyo 
Merge commit 'bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1' into froyo-plus-aosp

* commit 'bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1':
  docs: add manifest documentation for installLocation
 2010-04-05 16:44:58 -07:00
Dirk Dougherty
95d321284e Merge "docs: add manifest documentation for installLocation" into froyo 2010-04-05 16:37:07 -07:00
Wei Huang
9d2687587d am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo 
Merge commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f' into froyo-plus-aosp

* commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f':
  bug 2542580: fix bad icon.
 2010-04-05 15:42:30 -07:00