Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,787 Commits 3 Branches 0 Tags
4924ea490f759335f347d2fcc615703912be9d2d
Commit Graph

22787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brett Chabot
4924ea490f am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo 
Merge commit 'c8e84e12beb876f904d0090fe021beae73722786' into kraken

* commit 'c8e84e12beb876f904d0090fe021beae73722786':
  Fix imf tests.
 2010-05-12 07:56:54 -07:00
Scott Main
9809015b48 am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list 
Merge commit '21f18e9633967e69ebe7a172b902420fec485bba' into kraken

* commit '21f18e9633967e69ebe7a172b902420fec485bba':
  docs: make Notifying the User an expandable list
 2010-05-12 07:56:49 -07:00
Scott Main
5b46aa36b6 am d522b270: am a225e3b1: docs: add quickview box with "see also" links for some articles 
Merge commit 'd522b270a90cdd5f9bdedeb402b4738cfa294ee5' into kraken

* commit 'd522b270a90cdd5f9bdedeb402b4738cfa294ee5':
  docs: add quickview box with "see also" links for some articles
 2010-05-12 07:56:45 -07:00
Scott Main
1dc7c4ab66 am 0130e383: am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo 
Merge commit '0130e3837638b998ff28786618bc6a7fc6417711' into kraken

* commit '0130e3837638b998ff28786618bc6a7fc6417711':
  docs: remove allowBackup attribute from documentation
 2010-05-12 07:56:40 -07:00
Xavier Ducrohet
08eff49f09 am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo 
Merge commit 'd9712b69ce529fbf50b3b837032c1dc40e623381' into kraken

* commit 'd9712b69ce529fbf50b3b837032c1dc40e623381':
  Hide two audio focus methods.
 2010-05-12 07:56:29 -07:00
Marco Nelissen
550884e2f3 am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo 
Merge commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b' into kraken

* commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b':
  Don't clear the _data column in the audio_meta table, since it isn't
 2010-05-12 07:56:24 -07:00
Dianne Hackborn
bf00233b88 am b6e1ec19: am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo 
Merge commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366' into kraken

* commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366':
  Fix issue #2676378: Activity Manager Crash on FRF40
 2010-05-12 07:56:19 -07:00
Scott Main
856f0bad16 am 84a30dbf: am 5cdf5fdc: docs: add document about app install location 
Merge commit '84a30dbff1d6e04fd7660983233ae5502b414b07' into kraken

* commit '84a30dbff1d6e04fd7660983233ae5502b414b07':
  docs: add document about app install location
 2010-05-12 07:56:13 -07:00
Dirk Dougherty
a38f5e705c am 712f6408: am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo 
Merge commit '712f6408140af90477bccbc64f598c5e51833c7b' into kraken

* commit '712f6408140af90477bccbc64f598c5e51833c7b':
  Doc Change: Docs for NDK r4.
 2010-05-12 07:56:07 -07:00
Scott Main
5cb0d5015a am 9c689592: am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo 
Merge commit '9c6895924053c0b732dcb2dd3ef7f419a4dab8c1' into kraken

* commit '9c6895924053c0b732dcb2dd3ef7f419a4dab8c1':
  docs: announce froyo and update IO message
 2010-05-12 07:56:01 -07:00
Mike Lockwood
c7c856fb85 am d2084bb6: am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo 
Merge commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c' into kraken

* commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c':
  LocationManagerService: Call updateNetworkState on providers that are disabled.
 2010-05-12 07:55:55 -07:00
Andreas Huber
11777d6fa2 am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo 
Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken

* commit 'b003ad17bffeba7875b9708ffeef2300ef28c916':
  Support for customizable socket-read timeouts through the HTTP response.
 2010-05-12 07:55:48 -07:00
Andreas Huber
b076e6f3e0 am 227e443a: am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo 
Merge commit '227e443a43d70b9463b2e685688f73cfb1b72096' into kraken

* commit '227e443a43d70b9463b2e685688f73cfb1b72096':
  Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
 2010-05-12 07:55:40 -07:00
Costin Manolache
8579a4d726 am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo 
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken

* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
  Bug 2673557: rename datamessaging
 2010-05-12 07:55:32 -07:00
Jean-Michel Trivi
fd5a747fc8 am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo 
Merge commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85' into kraken

* commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85':
  Update javadoc in android.media.AudioManager to not hide the
 2010-05-12 07:55:25 -07:00
Dirk Dougherty
17246c6d90 am 6d405cfc: am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo 
Merge commit '6d405cfcfe200c0b60ab6e05047db2bde12f23c3' into kraken

* commit '6d405cfcfe200c0b60ab6e05047db2bde12f23c3':
  Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
 2010-05-12 07:55:17 -07:00
Jean-Michel Trivi
9f35d39a05 am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the comp 
Merge commit 'ea37d9b489aac1a4a8de71887581fe712e26e144' into kraken

* commit 'ea37d9b489aac1a4a8de71887581fe712e26e144':
  Fix bug 2670395 and 2599698
 2010-05-12 07:55:09 -07:00
Wu-cheng Li
b339013589 am d8c33747: am 78624e41: Add remove method in CameraParameters class. 
Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken

* commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728':
  Add remove method in CameraParameters class.
 2010-05-12 07:55:00 -07:00
Brett Chabot
c8e84e12be am b4c9a8f6: Merge "Fix imf tests." into froyo 
Merge commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072' into froyo-plus-aosp

* commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072':
  Fix imf tests.
 2010-05-12 07:50:44 -07:00
Scott Main
21f18e9633 am bb129dc5: docs: make Notifying the User an expandable list 
Merge commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d' into froyo-plus-aosp

* commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d':
  docs: make Notifying the User an expandable list
 2010-05-12 07:50:41 -07:00
Scott Main
d522b270a9 am a225e3b1: docs: add quickview box with "see also" links for some articles 
Merge commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085' into froyo-plus-aosp

* commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085':
  docs: add quickview box with "see also" links for some articles
 2010-05-12 07:50:36 -07:00
Scott Main
0130e38376 am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo 
Merge commit '6bc3304b74ba41bf9fd132d48c7bb764d631d3fa' into froyo-plus-aosp

* commit '6bc3304b74ba41bf9fd132d48c7bb764d631d3fa':
  docs: remove allowBackup attribute from documentation
 2010-05-12 07:50:30 -07:00
Xavier Ducrohet
d9712b69ce am b1235a57: Merge "Hide two audio focus methods." into froyo 
Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp

* commit 'b1235a57a09174179553acecef2370354bdcbf41':
  Hide two audio focus methods.
 2010-05-12 07:50:19 -07:00
Marco Nelissen
bbafdc6403 am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo 
Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp

* commit '836b2d75ef86487ecae0ae834ecbab324fd99471':
  Don't clear the _data column in the audio_meta table, since it isn't
 2010-05-12 07:50:14 -07:00
Dianne Hackborn
b6e1ec19dd am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo 
Merge commit '037cd3413a925c6f449050096a7cd4aab3207612' into froyo-plus-aosp

* commit '037cd3413a925c6f449050096a7cd4aab3207612':
  Fix issue #2676378: Activity Manager Crash on FRF40
 2010-05-12 07:50:09 -07:00
Scott Main
84a30dbff1 am 5cdf5fdc: docs: add document about app install location 
Merge commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d' into froyo-plus-aosp

* commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d':
  docs: add document about app install location
 2010-05-12 07:50:02 -07:00
Dirk Dougherty
712f640814 am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo 
Merge commit '8acb68e9aae7f6766b88440ede6598da63db9fdd' into froyo-plus-aosp

* commit '8acb68e9aae7f6766b88440ede6598da63db9fdd':
  Doc Change: Docs for NDK r4.
 2010-05-12 07:49:57 -07:00
Scott Main
9c68959240 am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo 
Merge commit 'c80b95a85ae31eba80870cb3416fd2c25821c056' into froyo-plus-aosp

* commit 'c80b95a85ae31eba80870cb3416fd2c25821c056':
  docs: announce froyo and update IO message
 2010-05-12 07:49:51 -07:00
Mike Lockwood
d2084bb689 am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo 
Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp

* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
  LocationManagerService: Call updateNetworkState on providers that are disabled.
 2010-05-12 07:49:45 -07:00
Andreas Huber
b003ad17bf am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo 
Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp

* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
  Support for customizable socket-read timeouts through the HTTP response.
 2010-05-12 07:49:39 -07:00
Andreas Huber
227e443a43 am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo 
Merge commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp

* commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e':
  Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
 2010-05-12 07:49:31 -07:00
Costin Manolache
625de48897 am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo 
Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp

* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
  Bug 2673557: rename datamessaging
 2010-05-12 07:49:16 -07:00
Jean-Michel Trivi
0c73adb1de am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo 
Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp

* commit '3e90c76c12803cd1b116030fd124b7b870d25342':
  Update javadoc in android.media.AudioManager to not hide the
 2010-05-12 07:49:10 -07:00
Dirk Dougherty
6d405cfcfe am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo 
Merge commit 'fe08933450f4be42c9b3eac900c64f23857ecd17' into froyo-plus-aosp

* commit 'fe08933450f4be42c9b3eac900c64f23857ecd17':
  Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
 2010-05-12 07:49:00 -07:00
Jean-Michel Trivi
ea37d9b489 am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen 
Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp

* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
  Fix bug 2670395 and 2599698
 2010-05-12 07:48:50 -07:00
Wu-cheng Li
d8c33747af am 78624e41: Add remove method in CameraParameters class. 
Merge commit '78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp

* commit '78624e41da166712aaa5ae47e4d3467337ac810a':
  Add remove method in CameraParameters class.
 2010-05-12 07:48:41 -07:00
Brett Chabot
b4c9a8f664 Merge "Fix imf tests." into froyo 2010-05-11 19:17:04 -07:00
Brett Chabot
e9d0b2962d Fix imf tests. 
- fix hard keyboard detection logic
- use FLAG_ACTIVITY_MULTIPLE_TASK to force test activities to start with IME

Bugs 2677320, 2677355

Change-Id: I1b943ee17fddcae5087faefa9fa5603dd3f18ec1
 2010-05-11 18:51:16 -07:00
Scott Main
bb129dc57b docs: make Notifying the User an expandable list 
Change-Id: I287a7e15a4461defa96903c7e922b8640c0bb257
 2010-05-11 18:00:44 -07:00
Scott Main
a225e3b1cd docs: add quickview box with "see also" links for some articles 
Change-Id: I2d5e83e691e61731b30b4741d02e096d5ef76fc2
 2010-05-11 17:47:40 -07:00
Scott Main
6bc3304b74 Merge "docs: remove allowBackup attribute from documentation" into froyo 2010-05-11 15:25:38 -07:00
Xavier Ducrohet
b1235a57a0 Merge "Hide two audio focus methods." into froyo 2010-05-11 14:48:48 -07:00
Marco Nelissen
836b2d75ef Merge "Don't clear the _data column in the audio_meta table, since it isn't needed, and causes a sqlite constraint exception. Bug 2671792." into froyo 2010-05-11 14:36:16 -07:00
Xavier Ducrohet
5f53f0883a Hide two audio focus methods. 
Change-Id: I53ddf736892cde8edfaffa7d69dd9c234df52efa
 2010-05-11 14:28:38 -07:00
Dianne Hackborn
037cd3413a Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo 2010-05-11 14:26:43 -07:00
Scott Main
5cdf5fdcba docs: add document about app install location 
Change-Id: Ife7d79ce8374f3435f4850cbf97d163e69bf8d26
 2010-05-11 14:21:53 -07:00
Dianne Hackborn
6f86c0e64b Fix issue #2676378: Activity Manager Crash on FRF40 
D'oh!

Change-Id: If1b43ff5f230f9bf0de0887deb1b25dcf6aa6e66
 2010-05-11 14:20:52 -07:00
Dirk Dougherty
8acb68e9aa Merge "Doc Change: Docs for NDK r4." into froyo 2010-05-11 14:20:24 -07:00
Scott Main
c80b95a85a Merge "docs: announce froyo and update IO message" into froyo 2010-05-11 14:04:49 -07:00
Dirk Dougherty
d6a04186b6 Doc Change: Docs for NDK r4. 
Change-Id: Ib535324eb884d4be2c7bbba2d74cc9043acc3475
 2010-05-11 13:29:58 -07:00