Commit Graph

1908 Commits

Author SHA1 Message Date
Android (Google) Code Review
e193f7cd9e am 3d7b8d1a: Merge change 5158 into donut
Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282'

* commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282':
  Use a ref-counted callback interface for Camera.
2009-06-24 13:54:09 -07:00
Bjorn Bringert
994c7d1fe2 am 544450b4: Fix NPE in SuggestionsAdapter when cursor is null.
Merge commit '544450b4eee175c78a1ca8647a3bfaca4aecf47a'

* commit '544450b4eee175c78a1ca8647a3bfaca4aecf47a':
  Fix NPE in SuggestionsAdapter when cursor is null.
2009-06-24 13:54:05 -07:00
Bjorn Bringert
db4643f358 am 5f80605a: Include user query in search intents
Merge commit '5f80605a0b866f34c74955e190909bd6ab5d992e'

* commit '5f80605a0b866f34c74955e190909bd6ab5d992e':
  Include user query in search intents
2009-06-24 13:53:55 -07:00
Android (Google) Code Review
327adb8fec am 82a32714: Merge change 5190 into donut
Merge commit '82a32714f07d25259b91163d383ccdb74a166d2d'

* commit '82a32714f07d25259b91163d383ccdb74a166d2d':
  Fix 1933269: startPreview failed.
2009-06-24 13:53:24 -07:00
Romain Guy
e786b1e9a2 resolved conflicts for merge of 5a42b083 to master 2009-06-24 13:51:26 -07:00
Android (Google) Code Review
4d812d92db am 9efba9d2: Merge change 5176 into donut
Merge commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9'

* commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9':
  Export the output to a text file and save to sdcard
2009-06-24 13:12:37 -07:00
Android (Google) Code Review
e1a75447f5 Merge change 5158 into donut
* changes:
  Use a ref-counted callback interface for Camera. This allows the camera service to hang onto the callback interface until all callbacks have been processed. This prevents problems where pending callbacks in binder worker threads are processed after the Java camera object and its associated native resources have been released. Bug 1884362
2009-06-24 08:34:34 -07:00
Dave Sparks
bbbc7cb77e Use a ref-counted callback interface for Camera.
This allows the camera service to hang onto the callback interface
until all callbacks have been processed. This prevents problems
where pending callbacks in binder worker threads are processed
after the Java camera object and its associated native resources
have been released.
Bug 1884362
2009-06-24 07:58:27 -07:00
Android (Google) Code Review
c8be159ba6 Merge change 5190 into donut
* changes:
  Fix 1933269: startPreview failed.
2009-06-24 01:02:46 -07:00
Chih-Chung Chang
fa89f9f897 Fix 1933269: startPreview failed.
The reason we need this count is a new CameraService::connect() request may
come in while the previous Client's destructor has not been run or is still
running. If the last strong reference of the previous Client is gone but
destructor has not been run, we should not allow the new Client to be created
because we need to wait for the previous Client to tear down the hardware
first.
2009-06-24 15:50:57 +08:00
Android (Google) Code Review
fae6a84c56 Merge change 5188 into donut
* changes:
  Fixes #1905761. Updates the height of ACTV's drop down whenever the IME changes.
2009-06-23 22:46:29 -07:00
Android (Google) Code Review
95795ac48a am 4133751d: Merge change 5129 into donut
Merge commit '4133751d51a04172aa65e24658b4207ef764de91'

* commit '4133751d51a04172aa65e24658b4207ef764de91':
  Improve RelativeLayout by allowing dependencies to be declared in a random
2009-06-23 21:39:28 -07:00
Android (Google) Code Review
dc1bcbf178 Merge change 5176 into donut
* changes:
  Export the output to a text file and save to sdcard
2009-06-23 19:51:00 -07:00
Android (Google) Code Review
afc52f99e1 Merge change 5129 into donut
* changes:
  Improve RelativeLayout by allowing dependencies to be declared in a random order.
2009-06-23 17:48:11 -07:00
Roy West
a02bc970f0 am 3fbd946b: Edits to SD card notification strings to shorten them.
Merge commit '3fbd946bacdc202dc23c84887d2ad47402b5015b'

* commit '3fbd946bacdc202dc23c84887d2ad47402b5015b':
  Edits to SD card notification strings to shorten them.
2009-06-23 16:35:27 -07:00
Android (Google) Code Review
24d3f99bce Merge change 5102
* changes:
  - clean up the sync settings names to:    (get|set)SyncAutomatically    (get|set)MasterSyncAutomatically - change SYNC_EXTRAS_FORCE to SYNC_EXTRAS_MANUAL to mace clear that   this overrides the .*SyncAutomatically settings - make ContentResolver methods that call the sync controls methods   in IContentService so that SDK users can use them - rename startSync to requestSync to reinforce the fact that a sync   is not immediately or always started when this method is called - add an Account parameter to all the sync settings and control methods - change the sync control methods to take a String authority rather than a Uri uri
2009-06-23 15:54:43 -07:00
Android (Google) Code Review
6989070d95 am 2a3cd364: Merge change 5119 into donut
Merge commit '2a3cd3643fcfa40fc447485a2db4b4333e10c652'

* commit '2a3cd3643fcfa40fc447485a2db4b4333e10c652':
  Adding support for pitch changes of the synthesized text in Text-To-Speech.
2009-06-23 15:52:29 -07:00
Android (Google) Code Review
4b1af26754 Merge change 5119 into donut
* changes:
  Adding support for pitch changes of the synthesized text in Text-To-Speech.
2009-06-23 15:50:43 -07:00
Satish Sampath
29af697221 am 41282a35: EnhancedGoogleSearch overrides GoogleSearch if present.
Merge commit '41282a35568b51270440450c46bb31aa00e52caa'

* commit '41282a35568b51270440450c46bb31aa00e52caa':
  EnhancedGoogleSearch overrides GoogleSearch if present.
2009-06-23 14:18:21 -07:00
Android (Google) Code Review
7da1fe4633 am 1bee98af: Merge change 5100 into donut
Merge commit '1bee98af6532eba3c6cda636eee890530c95a2a7'

* commit '1bee98af6532eba3c6cda636eee890530c95a2a7':
  Fill in CDMA gaps and clean up ToneGenerator code
2009-06-23 13:42:41 -07:00
Android (Google) Code Review
612a7bdd47 Merge change 5100 into donut
* changes:
  Fill in CDMA gaps and clean up ToneGenerator code
2009-06-23 13:38:34 -07:00
Christopher Tate
2d1db86e45 am 11b15779: Add file mode to the file-backup saved state blobs
Merge commit '11b157790234d3d2f116ce4c7ed1d3d00fb78bc3'

* commit '11b157790234d3d2f116ce4c7ed1d3d00fb78bc3':
  Add file mode to the file-backup saved state blobs
2009-06-23 13:28:41 -07:00
Dianne Hackborn
a69409d45f am 2e418428: Possibly fix an issue where we thought an app was always using GPS.
Merge commit '2e418428987132ea66533cbc05f9c526eb59519a'

* commit '2e418428987132ea66533cbc05f9c526eb59519a':
  Possibly fix an issue where we thought an app was always using GPS.
2009-06-23 13:08:40 -07:00
Karl Rosaen
0266aa6d97 am 61ab270c: Add missing \'break\'s in switch statement, fixing bug 1876430
Merge commit '61ab270c17094ef1373f54d8fb9ade6d287c3a60'

* commit '61ab270c17094ef1373f54d8fb9ade6d287c3a60':
  Add missing 'break's in switch statement, fixing bug 1876430
2009-06-23 13:08:34 -07:00
Android (Google) Code Review
635b72322d am 843f5eb3: Merge change 5054 into donut
Merge commit '843f5eb36a67367ae76800f74e184f00af50ef54'

* commit '843f5eb36a67367ae76800f74e184f00af50ef54':
  Rollback the number of loop in the memory stress test
2009-06-23 13:08:18 -07:00
Android (Google) Code Review
7067d28365 am 864ef233: Merge change 4878 into donut
Merge commit '864ef2337554cd0ca4166873bc8145d21ccf2286'

* commit '864ef2337554cd0ca4166873bc8145d21ccf2286':
  Add smalltest annotation to HardwareServicePermissionTest.
2009-06-23 13:08:15 -07:00
Bjorn Bringert
7120fc022c am b0ae27f4: Store correct state in SearchDialog.onSaveInstanceState()
Merge commit 'b0ae27f4e10a9e5fe56b9ca549718051fe342bba'

* commit 'b0ae27f4e10a9e5fe56b9ca549718051fe342bba':
  Store correct state in SearchDialog.onSaveInstanceState()
2009-06-23 13:08:01 -07:00
Christopher Tate
ab2e9e81e1 Add file mode to the file-backup saved state blobs
This change puts the file's access mode into the saved-state blob used by the
file backup helpers.  The tests have been updated for the new blob content
format.

What this change *doesn't* do is actually backup/restore the file mode.  This
change is a prerequisite for that, but mode preservation in backup/restore will
require adding metadata to the backup data stream itself, so will be approached
a bit more carefully.

(Also fixed one outright bug in the test program: ReadEntityData() had been
changed to return a ssize_t union of either a byte-count or a negative number
indicating error, but the test program was still assuming that nonzero == error,
and was spuriously failing.)
2009-06-23 13:07:47 -07:00
Android (Google) Code Review
fbd848796d Merge change 5097
* changes:
  Cleanup logging and fix a startup race condition that manifested on Firestone.
2009-06-23 12:23:19 -07:00
Android (Google) Code Review
e9107fd745 Merge change 5054 into donut
* changes:
  Rollback the number of loop in the memory stress test
2009-06-23 10:09:03 -07:00
Android (Google) Code Review
8dfb911278 Merge change 4939
* changes:
  mods so that we can search mms messages
2009-06-23 10:04:38 -07:00
Android (Google) Code Review
85845dcded Merge change 4878 into donut
* changes:
  Add smalltest annotation to HardwareServicePermissionTest.
2009-06-23 09:52:21 -07:00
Android (Google) Code Review
35f807f2de Merge change 5045
* changes:
  remove deprecated use of porterduff
2009-06-23 06:48:32 -07:00
Android (Google) Code Review
60491bc2bf am 4fb69770: Merge change 5024 into donut
Merge commit '4fb69770e70352c987cc79414db7a03b52296ca7'

* commit '4fb69770e70352c987cc79414db7a03b52296ca7':
  Remove opengl tests from tests build
2009-06-22 22:04:57 -07:00
Android (Google) Code Review
e05e739e71 am 722baf5e: Merge change 5014 into donut
Merge commit '722baf5ec47b57020ac39ec3e2b6cd1a02c3c4db'

* commit '722baf5ec47b57020ac39ec3e2b6cd1a02c3c4db':
  Fix issue #1933587.  Perform dexopt of instrumentation .apks.
2009-06-22 22:04:53 -07:00
Android (Google) Code Review
952663ef57 am 5277103d: Merge change 5035 into donut
Merge commit '5277103db9033226814edc8fcba6f4ba4e846678'

* commit '5277103db9033226814edc8fcba6f4ba4e846678':
  add glTexParameteri() and fix glTexParameteriv()
2009-06-22 22:04:12 -07:00
Android (Google) Code Review
8e3b0f15df am 11348cff: Merge change 4885 into donut
Merge commit '11348cffef46585027ba3035357370177a554826'

* commit '11348cffef46585027ba3035357370177a554826':
  Merge the output file into one.
2009-06-22 19:47:35 -07:00
Android (Google) Code Review
642875a97c am 54f156c7: Merge change 5006 into donut
Merge commit '54f156c7c47bd5b5f2c9675f56bddaaa43ad162e'

* commit '54f156c7c47bd5b5f2c9675f56bddaaa43ad162e':
  Pass the originating app's versionCode along with a restore set
2009-06-22 19:47:24 -07:00
Android (Google) Code Review
5e89f2f9de am 58ee0371: Merge change 4990 into donut
Merge commit '58ee037191b5d9c2b149870868f9646bd428af2a'

* commit '58ee037191b5d9c2b149870868f9646bd428af2a':
  Fix a few more blatantly wrong date formats.
2009-06-22 19:47:21 -07:00
Android (Google) Code Review
610f4dbe21 Merge change 5024 into donut
* changes:
  Remove opengl tests from tests build
2009-06-22 18:30:40 -07:00
Android (Google) Code Review
da4e89dc31 Merge change 5014 into donut
* changes:
  Fix issue #1933587.  Perform dexopt of instrumentation .apks.
2009-06-22 18:30:05 -07:00
Android (Google) Code Review
70140c52ce Merge change 5039
* changes:
  Fix 3 bugs in fountain test.  Correctly generate the last mip level of a non-square mip chain.  Default the background to not blended and disable dither/depth.
2009-06-22 18:20:00 -07:00
Android (Google) Code Review
185a9c19b4 Merge change 5015
* changes:
  Cleanup includes so Log.h can use the tag.  rsUtils.h is the file that should be included everywhere and contain rs global defines.
2009-06-22 18:19:46 -07:00
Android (Google) Code Review
86a518e626 Merge change 4984
* changes:
  All light source objects.
2009-06-22 18:19:22 -07:00
Android (Google) Code Review
6bca3daec9 Merge change 5035 into donut
* changes:
  add glTexParameteri() and fix glTexParameteriv()
2009-06-22 18:18:39 -07:00
Mathias Agopian
b12f99b315 add glTexParameteri() and fix glTexParameteriv() 2009-06-22 18:09:09 -07:00
Sriram Raman
8c1127fbe3 Remove opengl tests from tests build 2009-06-22 17:22:12 -07:00
Android (Google) Code Review
8ae84423fd Merge change 4885 into donut
* changes:
  Merge the output file into one.
2009-06-22 17:14:59 -07:00
Android (Google) Code Review
7c4fa86d2f Merge change 5006 into donut
* changes:
  Pass the originating app's versionCode along with a restore set
2009-06-22 16:47:06 -07:00
Android (Google) Code Review
94116aeb6b Merge change 4990 into donut
* changes:
  Fix a few more blatantly wrong date formats.
2009-06-22 16:45:20 -07:00