Chih-Chung Chang
025e274432
am e25cc656: Support multiple cameras in framework.
2010-05-09 20:42:41 -07:00
Chih-Chung Chang
5997faf931
Support multiple cameras in framework.
...
Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
2010-05-10 11:21:14 +08:00
Brian Carlstrom
18f4b74474
am a0a126a0: am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
2010-05-07 10:26:46 -07:00
Brian Carlstrom
81b3d23bd0
am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
...
Merge commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc' into kraken
* commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc':
Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
2010-05-07 10:25:41 -07:00
Brian Carlstrom
bd08c07d9d
am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
...
Merge commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe' into froyo-plus-aosp
* commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe':
Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
2010-05-07 10:23:34 -07:00
Joe Malin
a5bf2bd611
am 4405a0fe: am 9609cdc8: am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
2010-05-07 09:00:20 -07:00
Joe Malin
b1ad26bc8d
am 9609cdc8: am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
...
Merge commit '9609cdc8522414b61ffb7d31b4ceb2007f205129' into kraken
* commit '9609cdc8522414b61ffb7d31b4ceb2007f205129':
Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
2010-05-07 08:58:42 -07:00
Joe Malin
bb52cb2555
am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
...
Merge commit 'e50b940f153070a631a6c0d426cb7f3207042659' into froyo-plus-aosp
* commit 'e50b940f153070a631a6c0d426cb7f3207042659':
Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
2010-05-07 08:54:53 -07:00
Bjorn Bringert
08287ac2d9
am 74612539: am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
2010-05-07 03:45:24 -07:00
Bjorn Bringert
e349c382b8
am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
...
Merge commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb' into kraken
* commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb':
Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:43:48 -07:00
Bjorn Bringert
453193cf4a
am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
...
Merge commit '75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp
* commit '75370e74629b4938c4472d6001eebf5e305dbc55':
Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:40:31 -07:00
Bjorn Bringert
cea4d290c0
Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
2010-05-07 03:37:48 -07:00
Dan Egnor
b9bb0696bd
am a269d195: am ca48c88c: am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
2010-05-06 17:36:42 -07:00
Dan Egnor
7dd2bb8412
am ca48c88c: am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
...
Merge commit 'ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f' into kraken
* commit 'ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f':
Make static versions of libutils and libbinder.
2010-05-06 17:35:06 -07:00
Dan Egnor
e3c233d1a9
am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
...
Merge commit '8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp
* commit '8a8658a5de261c2da72d431940877bd054bc9837':
Make static versions of libutils and libbinder.
2010-05-06 17:33:45 -07:00
Daniel Sandler
e0c5b61d2d
am 94886d97: am ad2f9ff7: (-s ours) am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
2010-05-06 17:31:49 -07:00
Dan Egnor
359b3fd8d8
Merge "Make static versions of libutils and libbinder." into froyo
2010-05-06 17:31:48 -07:00
Daniel Sandler
a1abd2133d
am ad2f9ff7: (-s ours) am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
...
Merge commit 'ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd' into kraken
* commit 'ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd':
Fix "p.m." in lockscreen (locale: es).
2010-05-06 17:29:53 -07:00
Daniel Sandler
1a5b93a2d9
am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
...
Merge commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp
* commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
Fix "p.m." in lockscreen (locale: es).
2010-05-06 17:24:22 -07:00
Daniel Sandler
e854180f4f
Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
2010-05-06 17:23:03 -07:00
Robert Greenwalt
47f8bc92da
am caa63341: am d6d11517: am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
2010-05-06 17:19:03 -07:00
Robert Greenwalt
62dbe1accf
am d6d11517: am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
...
Merge commit 'd6d115173a856fe28cf5a3087f6d7b0de77495c5' into kraken
* commit 'd6d115173a856fe28cf5a3087f6d7b0de77495c5':
Fix ThrottleService wifi interaction
2010-05-06 17:17:51 -07:00
Robert Greenwalt
66686441cd
am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
...
Merge commit 'f9dc24de53890e0a8289a4349562ed4bd9611974' into froyo-plus-aosp
* commit 'f9dc24de53890e0a8289a4349562ed4bd9611974':
Fix ThrottleService wifi interaction
2010-05-06 17:16:04 -07:00
Robert Greenwalt
3bc8dc86a1
Merge "Fix ThrottleService wifi interaction" into froyo
2010-05-06 17:14:23 -07:00
Kenny Root
569e15b64d
am b658cc42: Merge "Prevent local reference table overflows" into kraken
2010-05-06 17:14:13 -07:00
Kenny Root
4979e78ba0
Merge "Prevent local reference table overflows" into kraken
2010-05-06 17:12:13 -07:00
Christopher Tate
a121791123
am fa9e7c05: Sketch of Native input for MessageQueue / Looper / ViewRoot
2010-05-06 17:08:21 -07:00
Jim Miller
321cc6c247
am ab4f3c60: Merge "Manual integration of I32a7b5 from froyo" into kraken
2010-05-06 16:37:17 -07:00
Jim Miller
178a722585
Merge "Manual integration of I32a7b5 from froyo" into kraken
2010-05-06 16:36:23 -07:00
Xia Wang
db070c4d35
am 0bfc3973: am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
2010-05-06 16:35:06 -07:00
Dan Morrill
790960ee5b
am 9fd3a6be: am 60b02cab: am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
2010-05-06 16:35:01 -07:00
Neal Nguyen
b2f551e4c1
am bda001aa: am ad0830a1: am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
2010-05-06 16:34:57 -07:00
Xia Wang
aea38f076c
am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
...
Merge commit '3e6c1696135f267cc59d050747839c56ce868ef9' into kraken
* commit '3e6c1696135f267cc59d050747839c56ce868ef9':
Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
2010-05-06 16:31:36 -07:00
Dan Morrill
64c83cfb6a
am 60b02cab: am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
...
Merge commit '60b02cab9cba74e4fe1fcbe64af85ed867d20cf9' into kraken
* commit '60b02cab9cba74e4fe1fcbe64af85ed867d20cf9':
Adding PacketVideo attribution in NOTICE.
2010-05-06 16:31:31 -07:00
Neal Nguyen
6dcfe1413a
am ad0830a1: am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
...
Merge commit 'ad0830a136e1a205be42f18c4b779e50c9ac1985' into kraken
* commit 'ad0830a136e1a205be42f18c4b779e50c9ac1985':
Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
2010-05-06 16:31:27 -07:00
Xia Wang
363809c71d
am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
...
Merge commit '11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp
* commit '11505b474b16457fb65952aadba0609cb33de8e7':
Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
2010-05-06 16:12:38 -07:00
Dan Morrill
126a6eab49
am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
...
Merge commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57' into froyo-plus-aosp
* commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57':
Adding PacketVideo attribution in NOTICE.
2010-05-06 16:12:33 -07:00
Neal Nguyen
649f6f64b4
am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
...
Merge commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4' into froyo-plus-aosp
* commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4':
Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
2010-05-06 16:12:22 -07:00
The Android Open Source Project
01f0504764
am 9d164dc5: am f4dffd8a: merge from open-source master
2010-05-06 15:32:57 -07:00
Xia Wang
a62ab7c22a
Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
2010-05-06 15:24:08 -07:00
The Android Open Source Project
d37aff7dff
am f4dffd8a: merge from open-source master
...
Merge commit 'f4dffd8a45386b5a5f0e6de4f30facc9eaac4001' into kraken
* commit 'f4dffd8a45386b5a5f0e6de4f30facc9eaac4001':
GpsLocationProvider: Store new Location before onGpsStatusChanged is sent
Telephony: Add PUK MMI code support for CDMA RUIM phones
Type Zero Sms should not be displayed/stored/notified.
2010-05-06 15:22:17 -07:00
The Android Open Source Project
3877d301aa
merge from open-source master
...
Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
2010-05-06 15:18:59 -07:00
Dan Morrill
2e55d964ca
Merge "Adding PacketVideo attribution in NOTICE." into froyo
2010-05-06 15:11:02 -07:00
Dan Morrill
869aba8aaf
Adding PacketVideo attribution in NOTICE.
...
Change-Id: Id2fe398d4deed6ebd8cba8516ffc6c0334a961b0
2010-05-06 14:15:47 -07:00
Neal Nguyen
ad8507cfdc
Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
2010-05-06 13:45:18 -07:00
Andreas Huber
1fa16b6a8a
am 8a1c0934: am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
2010-05-06 12:46:39 -07:00
Dirk Dougherty
96658757f7
am 799bc84d: am 8b6ac78e: am 5305627d: Doc change: New doc that describes how market filters work
2010-05-06 12:46:35 -07:00
Dan Bornstein
51a7d6ff3e
am ea5477c8: am 89ad07b0: am 42ee86e6: Merge "For issue #2651381 , allow library prelinking." into froyo
2010-05-06 12:46:31 -07:00
Neal Nguyen
44271f887c
am 73bbcc4d: am e96e2358: am f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo
2010-05-06 12:46:27 -07:00
Andreas Huber
5934c599f5
am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
...
Merge commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c' into kraken
* commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c':
Disable vorbis seek when streaming from localhost.
2010-05-06 12:43:59 -07:00