ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
14,371 Commits 2 Branches 0 Tags 54 MiB
e7e4dd436b
Commit Graph

14371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
69b790c543 am 14111d14: am cae57d62: Fix SDK build. 
Merge commit '14111d1444ad5f5f5beb914e51eed32cfaab75cf' into kraken

* commit '14111d1444ad5f5f5beb914e51eed32cfaab75cf':
  Fix SDK build.
 2010-04-06 23:12:29 -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
7d3a3e932d am aa94842c: am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo 
Merge commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51' into kraken

* commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51':
  Comment-only change to clarify the role and use of IntentService
 2010-04-06 22:06:48 -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
Joe Onorato
685c7696b7 Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken 2010-04-06 18:26:39 -07:00
Brett Chabot
679d87e022 am f6d41580: am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo 
Merge commit 'f6d415805511bb938a2b6ce2b1ee22a184b3f2bb' into kraken

* commit 'f6d415805511bb938a2b6ce2b1ee22a184b3f2bb':
  Add makefile so package manager test apks can get buitl from root.
 2010-04-06 17:44:33 -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
Jean-Baptiste Queru
c2eae9fdeb Merge policy from frameworks/policies/base 
Change-Id: I3ad6925b8a9f0ee14e4180e798519c23b6bf6662
 2010-04-06 15:44:22 -07:00
Andreas Huber
5c05b72081 am 3e8b89bd: 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 '3e8b89bd8d35525019080205e7221063748a3f0a' into kraken

* commit '3e8b89bd8d35525019080205e7221063748a3f0a':
  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:50:05 -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
851c0d8332 am 266bb3c5: am f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo 
Merge commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3' into kraken

* commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3':
  Fix last character of password field being visible after rotation
 2010-04-06 14:38:59 -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
a6fe972d81 am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo 
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken

* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
  Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
 2010-04-06 14:17:57 -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
f4ac912912 am ccb2c6cf: am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo 
Merge commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7' into kraken

* commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7':
  Fix 'bmgr restore'
 2010-04-06 12:43:23 -07:00
Grace Kloba
c035cf3b55 am 8dbf5105: am 54fccf8a: Merge "Update the Webkit version." into froyo 
Merge commit '8dbf5105739db2354057be445483a63ec96376f0' into kraken

* commit '8dbf5105739db2354057be445483a63ec96376f0':
  Update the Webkit version.
 2010-04-06 12:43:19 -07:00
Romain Guy
b02ddf7b8a am 92b46ffb: am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo 
Merge commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae' into kraken

* commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae':
  Correctly resize dialogs when measured in WRAP_CONTENT
 2010-04-06 12:43:16 -07:00
Dianne Hackborn
5cca32c9a0 am 710312b3: am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo 
Merge commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532' into kraken

* commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
 2010-04-06 12:43:00 -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
5a0bcbafcb am e6fdab7f: am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo 
Merge commit 'e6fdab7f005cc06df989c97907c3cc3060692121' into kraken

* commit 'e6fdab7f005cc06df989c97907c3cc3060692121':
  Forcibly unmount the sdcard after N retries.
 2010-04-06 11:00:08 -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
Irfan Sheriff
93392191d5 am 7eeb44f2: am b2e6c01f: Disable tethering when airplane mode is enabled 
Merge commit '7eeb44f20527caaad618e28ba511e7661f5904cb' into kraken

* commit '7eeb44f20527caaad618e28ba511e7661f5904cb':
  Disable tethering when airplane mode is enabled
 2010-04-06 10:52:52 -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
acf50fa966 am 16419aca: am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo 
Merge commit '16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken

* commit '16419aca40e9d570eef4f51133ba1b734d3012c0':
  Guard against NPE in SearchManagerService
 2010-04-06 09:00:51 -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
3689034a24 am 703cb724: am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo 
Merge commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65' into kraken

* commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65':
  Redo the look of the recent apps switcher
 2010-04-06 08:41:50 -07:00
Joe Onorato
01181e1b5d am 7d8866f9: Redo the look of the recent apps switcher. 
Merge commit '7d8866f9ef026870d4735d6f2ede49525150e53e' into kraken

* commit '7d8866f9ef026870d4735d6f2ede49525150e53e':
  Redo the look of the recent apps switcher.
 2010-04-06 08:41:42 -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
db88a5899b am c94dad83: am 6e52b5d7: 2568467 System crash when installing corrupt APK 
Merge commit 'c94dad83be792928206363cb43524a68b6a62ffe' into kraken

* commit 'c94dad83be792928206363cb43524a68b6a62ffe':
  2568467 System crash when installing corrupt APK
 2010-04-05 18:52:39 -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
81ecbe32de am eab92d7b: am 01f6b75b: Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo 
Merge commit 'eab92d7bec5ff0d12ee68047bba4ade3afb718a7' into kraken

* commit 'eab92d7bec5ff0d12ee68047bba4ade3afb718a7':
  Fix issue #2564479: Favorite Recipes App Installation Fail
 2010-04-05 18:42:27 -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