Commit Graph

3653 Commits

Author SHA1 Message Date
Dianne Hackborn
8267404b11 resolved conflicts for merge of 4431a065 to master 2009-08-12 21:58:34 -07:00
Android (Google) Code Review
86e9d9d426 Merge change 21044
* changes:
  Add new API to compare certs of two UIDs.
2009-08-12 21:53:24 -07:00
Android (Google) Code Review
33932415a3 Merge change 21055 into donut
* changes:
  Lock in final resource identifiers.
2009-08-12 21:36:22 -07:00
Mike LeBeau
7e322de186 am c41dca14: Merge change 21045 into donut
Merge commit 'c41dca14ee9a9513e547a54a6356b4dab41d781c'

* commit 'c41dca14ee9a9513e547a54a6356b4dab41d781c':
  Last minute change: Replace default app icon with a prettier one - droid on a software box sort of thing. :)
2009-08-12 21:36:16 -07:00
Mike LeBeau
f545ce2b11 am 370e1f74: Merge change 21038 into donut
Merge commit '370e1f7439fd2688220bfc9615ea70fa3d397cea'

* commit '370e1f7439fd2688220bfc9615ea70fa3d397cea':
  Propagate info about whether a "call" command was issued in RecognitionResult.
2009-08-12 21:36:09 -07:00
Android (Google) Code Review
0256b71d85 Merge change 21060
* changes:
  resolved conflicts for merge of 6550076f to master
2009-08-12 21:35:04 -07:00
Dianne Hackborn
cb60907a5a resolved conflicts for merge of 6550076f to master 2009-08-12 21:32:10 -07:00
Android (Google) Code Review
5eb77d68b3 Merge change 21059
* changes:
  make sure EGL_ANDROID_swap_rectangle is actually supported before using it
2009-08-12 21:25:15 -07:00
Mathias Agopian
8458a3140f make sure EGL_ANDROID_swap_rectangle is actually supported before using it 2009-08-12 21:24:53 -07:00
Android (Google) Code Review
153e4a4c2a Merge change 21057
* changes:
  Better error handling in EGL extensions
2009-08-12 21:18:35 -07:00
Mathias Agopian
24e5f52901 Better error handling in EGL extensions 2009-08-12 21:18:15 -07:00
Android (Google) Code Review
15fb629841 Merge change 21047
* changes:
  Fix build break.
2009-08-12 18:51:46 -07:00
Android (Google) Code Review
9d1e1f0f78 Merge change 21045 into donut
* changes:
  Last minute change: Replace default app icon with a prettier one - droid on a software box sort of thing. :)
2009-08-12 18:40:22 -07:00
Android (Google) Code Review
b5ce9bc907 Merge change 21038 into donut
* changes:
  Propagate info about whether a "call" command was issued in RecognitionResult.
2009-08-12 18:05:50 -07:00
Android (Google) Code Review
0339181e48 Merge change 21025 into donut
* changes:
  The DONUT constant also needs to be updated to the official SDK version.
2009-08-12 18:00:16 -07:00
Android (Google) Code Review
372ccb1a80 Merge change 21035
* changes:
  Implement reflecting Java objects into the ACC enviroment.
2009-08-12 17:57:16 -07:00
Android (Google) Code Review
46f7f07976 Merge change 21032
* changes:
  Default mBaselineAlignedChildIndex to -1 so it will still be valid when a LinearLayout is created programatically.
2009-08-12 17:23:22 -07:00
Android (Google) Code Review
32ee2db819 Merge change 21031
* changes:
  Should clear background.
2009-08-12 17:19:54 -07:00
Android (Google) Code Review
e2f030d889 Merge change 21030
* changes:
  Fix issue #2045895: Finger IDs are not tracked properly.
2009-08-12 17:17:01 -07:00
Android (Google) Code Review
c309a13359 Merge change 20419
* changes:
  new s2d ids table for rmq2; plus Gservices setting for using rmq2 protocol.
2009-08-12 16:56:58 -07:00
Android (Google) Code Review
a247b312d0 Merge change 21010
* changes:
  Grass has graduated from an RS experiment to a real live wallpaper.
2009-08-12 15:56:13 -07:00
Android (Google) Code Review
ee5bca2806 Merge change 20913
* changes:
  Report wallpaper offset to the wallpaper, use this in the image wallpaper.
2009-08-12 15:55:03 -07:00
Android (Google) Code Review
9170c95cd8 Merge change 21006
* changes:
  Fix the issue of incorrect conversion of the plus sign in a dial string.
2009-08-12 15:48:31 -07:00
Android (Google) Code Review
04063099d7 Merge change 20998
* changes:
  Add norm() and map() to MathUtils.
2009-08-12 15:24:23 -07:00
Android (Google) Code Review
d6dae5ccc9 Merge change 20982
* changes:
  SystemProperties: eliminate unnecessary string allocation.
2009-08-12 14:32:34 -07:00
Dianne Hackborn
5d69526adf am fe6e733a: Merge change 20960 into donut
Merge commit 'fe6e733a01b1ab8a6c7b651c65bf7abeb97f9525'

* commit 'fe6e733a01b1ab8a6c7b651c65bf7abeb97f9525':
  Fix issue #2049588: App widget can crash causing system to be unable to boot
2009-08-12 12:36:47 -07:00
jsh
491a902581 am 4cc16a7b: Merge change 20859 into donut
Merge commit '4cc16a7b9f146c4a324202db6b1777d2e0150fc3'

* commit '4cc16a7b9f146c4a324202db6b1777d2e0150fc3':
  Fix for sending 16-bit SMS message with header.
2009-08-12 12:36:35 -07:00
Karl Rosaen
8d005b8719 am 4c85f133: Merge change 20869 into donut
Merge commit '4c85f133e10ceaeb2553adb397d4828a7091e7e6'

* commit '4c85f133e10ceaeb2553adb397d4828a7091e7e6':
  If no interpolator is specified for a progress bar in the theme, default to a LinearInterpolator.
2009-08-12 12:36:29 -07:00
Dianne Hackborn
878d647b5b am b8546001: Merge change 20878 into donut
Merge commit 'b8546001701405a76dad7e6235046e592296fac2'

* commit 'b8546001701405a76dad7e6235046e592296fac2':
  Fix issue #2048263: More debugging information
2009-08-12 12:36:12 -07:00
Chia-chi Yeh
fac3004620 am 188f5a71: (-s ours) DO NOT MERGE: cherry-pick: libdrm1: Use libcrypto instead of libaes.
Merge commit '188f5a71061791906572de375c5efe26cadddbae'

* commit '188f5a71061791906572de375c5efe26cadddbae':
  DO NOT MERGE: cherry-pick: libdrm1: Use libcrypto instead of libaes.
2009-08-12 12:05:09 -07:00
Jean-Michel Trivi
497cb8ee6a am eccd6fdd: Merge change 20673 into donut
Merge commit 'eccd6fdd0d86b8610b738fc15c707eedc00ec9dc'

* commit 'eccd6fdd0d86b8610b738fc15c707eedc00ec9dc':
  Fix bug 2043140.
2009-08-12 12:04:40 -07:00
Brett Chabot
12b381ea5e am 3b5f4a84: Merge change 20806 into donut
Merge commit '3b5f4a841e9e87442eeacd7773bd2a6ca8710019'

* commit '3b5f4a841e9e87442eeacd7773bd2a6ca8710019':
  Remove flaky auto complete tests from continuous.
2009-08-12 12:04:34 -07:00
Karl Rosaen
0a5b31cbb5 am b3fa1084: Merge change 20768 into donut
Merge commit 'b3fa1084ba31698fa5c58150a713d7abbadb1cd2'

* commit 'b3fa1084ba31698fa5c58150a713d7abbadb1cd2':
  Docs only change: finish documentation of Android Quick Search Box related information in SearchManager.
2009-08-12 12:04:22 -07:00
Jean-Baptiste Queru
f223e1b548 am b23896da: Merge snapshot version of donut back into main tree
Merge commit 'b23896da46a9290b9e8c7b1e540d4d4a6cebcfab'

* commit 'b23896da46a9290b9e8c7b1e540d4d4a6cebcfab':
  donut snapshot
2009-08-12 12:04:14 -07:00
android-build SharedAccount
dcdf74f19d resolved conflicts for merge of 802527c6 to master skipping preloaded-classes as pre Bob 2009-08-12 12:01:35 -07:00
Android (Google) Code Review
8b43eb2cf7 Merge change 20965
* changes:
  readData should read the data, not write the data.
2009-08-12 11:48:14 -07:00
Android (Google) Code Review
786f3b3690 Merge change 20960 into donut
* changes:
  Fix issue #2049588: App widget can crash causing system to be unable to boot
2009-08-12 11:29:59 -07:00
Android (Google) Code Review
068e61e045 Merge change 20859 into donut
* changes:
  Fix for sending 16-bit SMS message with header.
2009-08-12 10:21:36 -07:00
Android (Google) Code Review
326f846e67 Merge change 20945
* changes:
  contrary to popular belief ContentResolver.query can return null. so check.
2009-08-12 10:10:47 -07:00
Android (Google) Code Review
cf4ef29c33 Merge change 20930
* changes:
  BatteryService: Fix problems shutting down when the battery is dead:
2009-08-12 09:57:05 -07:00
Android (Google) Code Review
86264369ed Merge change 20943
* changes:
  Fix the simulator build by removing librs_jni and libRS from it. Since libacc isn't 64-bit clean (it casts pointers to integers), and so can't be built for the gHardy simulator, everything that depends on it can't be built for the simulator either, which means removing libRS and librs_jni.
2009-08-12 09:51:56 -07:00
Android (Google) Code Review
834d968557 Merge change 20706
* changes:
  Improve Browser performance by 1-2%. To address domain sanity bug, http://b/issue?id=1022797, we decoded/encoded the url for each request. As the url can be long, getBytes() and String.init are taking 1.5% in nytimes.com and 2.4% in cnn.com. By doing a simple URL encoding test, we can shave 1-2 secs thread time during loading.
2009-08-12 09:27:01 -07:00
Android (Google) Code Review
2cd84514ea Merge change 20869 into donut
* changes:
  If no interpolator is specified for a progress bar in the theme, default to a LinearInterpolator.
2009-08-12 09:24:05 -07:00
Android (Google) Code Review
991ac9e1d9 Merge change 20937
* changes:
  libdrm: "==" should be an assignment.
2009-08-12 08:33:25 -07:00
Android (Google) Code Review
05d81d4f77 Merge change 20927
* changes:
  Workaround for issue 2046783.
2009-08-12 08:26:17 -07:00
Android (Google) Code Review
4bad4e2ea9 Merge change 20787
* changes:
  Removing primary/default phone number and email on contact from the API.
2009-08-12 07:46:53 -07:00
Android (Google) Code Review
2c15c469d9 Merge change 20744
* changes:
  Adds Java side of browser GeolocationService.
2009-08-12 07:26:48 -07:00
Eric Laurent
11c04c984a Workaround for issue 2046783.
Apparently the problem is caused by the fact that A2dpAudioStreamOut::standby() calls a2dp_stop() after the headset has been powered down.
The workaround consists in indicating to A2DP audio hardware that a close request is pending and that stanby() must be bypassed.
2009-08-12 05:49:58 -07:00
Mathias Agopian
cf70e3301b second take, hopefully this time it doesn't break one of the builds: "SurfaceFlinger will now allocate buffers based on the usage specified by the clients. This allows to allocate the right kind of buffer automatically, without having the user to specify anything." 2009-08-11 23:44:13 -07:00
Mathias Agopian
5221271375 second take, hopefully this time it doesn't break one of the builds: "SurfaceFlinger will now allocate buffers based on the usage specified by the clients. This allows to allocate the right kind of buffer automatically, without having the user to specify anything." 2009-08-11 23:32:29 -07:00