Commit Graph

981 Commits

Author SHA1 Message Date
Dave Sparks
83a857f5d0 am 7283fb18: Merge commit \'7b7225c8fdbead25235c74811b30ff4ee690dc58\' into manual_merge
Merge commit '7283fb18022674daee4dcdc3a218190791f8cd0e'

* commit '7283fb18022674daee4dcdc3a218190791f8cd0e':
  AI 149133: Enable the camera permission check.
2009-05-21 10:27:18 -07:00
Dave Sparks
7118052e31 Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge
Conflicts:
	camera/libcameraservice/CameraService.cpp
2009-05-21 10:17:23 -07:00
Android (Google) Code Review
1e6ecc52c0 Merge change 1940
* changes:
  handle OTR messages by storing them in an in-memory table; remove groupchat message urls since we can get to messages by thread ids.
2009-05-21 10:08:09 -07:00
Android (Google) Code Review
07b5273adf am 8c690ea9: Merge change 2182 into donut
Merge commit '8c690ea9976d644db3c96eddbbbd2d50eac56913'

* commit '8c690ea9976d644db3c96eddbbbd2d50eac56913':
  location: Replace ILocationCollector interface with new ILocationProvider method
2009-05-21 09:42:38 -07:00
Android (Google) Code Review
cfae00675e am db79edc5: Merge change 2168 into donut
Merge commit 'db79edc5dc39e103356cad8781148a8794520bc5'

* commit 'db79edc5dc39e103356cad8781148a8794520bc5':
  Fix permission hole in camera service. Some debugging code was added
2009-05-21 09:42:24 -07:00
Android (Google) Code Review
2385ce2aa4 am 3343af5f: Merge change 1863 into donut
Merge commit '3343af5fdb10ace9e593d042fedcd9b42e322a95'

* commit '3343af5fdb10ace9e593d042fedcd9b42e322a95':
  Center the progress message for GoogleWebContentHelper (bug #1548858).
2009-05-21 09:42:17 -07:00
Dave Sparks
fec880df27 AI 149133: Enable the camera permission check.
Some debugging code was added to camera service. Later it was #ifdef'd
  out, but this change also removed the camera permission check. This
  change puts the permission check back in.
  BUG=1869264

Automated import of CL 149133
2009-05-21 09:18:18 -07:00
Android (Google) Code Review
1c4b60c2f2 Merge change 2182 into donut
* changes:
  location: Replace ILocationCollector interface with new ILocationProvider method
2009-05-21 08:52:25 -07:00
Android (Google) Code Review
f3b2684ecf Merge change 2168 into donut
* changes:
  Fix permission hole in camera service. Some debugging code was added to CameraService::onTransact() method during development. Later on the entire onTransact() method was #ifdef'd out, which inadvertently omitted the permissions check code. This change restores the code.
2009-05-21 07:55:39 -07:00
Android (Google) Code Review
b95c594a4e Merge change 1863 into donut
* changes:
  Center the progress message for GoogleWebContentHelper (bug #1548858).
2009-05-21 04:43:31 -07:00
Android (Google) Code Review
a0a0cd6779 am f9c7d9a7: Merge change 2147 into donut
Merge commit 'f9c7d9a75b2355d8ad8282d9b4cf817c77ea8b10'

* commit 'f9c7d9a75b2355d8ad8282d9b4cf817c77ea8b10':
  Add support to SuggestionsAdapter to query the 'working' status
2009-05-20 22:44:21 -07:00
Android (Google) Code Review
60069f642c am c1c82509: Merge change 2163 into donut
Merge commit 'c1c82509fb78403a969040cf057a66cbe3bfa538'

* commit 'c1c82509fb78403a969040cf057a66cbe3bfa538':
  Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
2009-05-20 22:44:17 -07:00
Android (Google) Code Review
e6b922ab30 am bb7b7b31: Merge change 2152 into donut
Merge commit 'bb7b7b316a6a15f4df6af3c62a293920c68c7b00'

* commit 'bb7b7b316a6a15f4df6af3c62a293920c68c7b00':
  make sure to fail to software when the h/w renderer cannot be initialized
2009-05-20 22:44:06 -07:00
The Android Open Source Project
2b9ddad325 Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'
Conflicts:
	api/current.xml
	core/res/res/values/public.xml
2009-05-20 22:41:10 -07:00
Android (Google) Code Review
599e8c1470 Merge change 2147 into donut
* changes:
  Add support to SuggestionsAdapter to query the 'working' status of its underlying cursor and update a spinner in the search dialog accordingly.
2009-05-20 20:34:49 -07:00
Dave Sparks
998b329525 Fix permission hole in camera service. Some debugging code was added
to CameraService::onTransact() method during development. Later on
the entire onTransact() method was #ifdef'd out, which inadvertently
omitted the permissions check code. This change restores the code.
2009-05-20 20:02:59 -07:00
Android (Google) Code Review
68117f2b7f Merge change 2163 into donut
* changes:
  Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder implementation to the mediaserver process. The permission check was previously enforced only at the AudioRecord binder interface for clients not in the same process. This change adds an additional check when the client tries to set the audio source. Bug 1868334
2009-05-20 19:57:12 -07:00
Android (Google) Code Review
7d6b741b3f Merge change 2152 into donut
* changes:
  make sure to fail to software when the h/w renderer cannot be initialized
2009-05-20 18:00:01 -07:00
Mathias Agopian
5c846bd6cf make sure to fail to software when the h/w renderer cannot be initialized 2009-05-20 17:58:36 -07:00
Romain Guy
89fe6cee91 am 7269d9ac: Tweak the Gestures Overlay demo. This shortens the fade duration to make it more usable and also adds a longer pause before the fade. This change also introduce a new compile-time setting to decide whether or not the overlay should steal the events from the underlying ListView. It is now off by default, per discussion with hackbod. It feel a little bit better but it may vary from user to user so studies will be necessary.
Merge commit '7269d9ac10d4c6ed5086b9f5677821e8d4382390'

* commit '7269d9ac10d4c6ed5086b9f5677821e8d4382390':
  Tweak the Gestures Overlay demo. This shortens the fade duration to make it more usable and also adds a longer pause before the fade. This change also introduce a new compile-time setting to decide whether or not the overlay should steal the events from the underlying ListView. It is now off by default, per discussion with hackbod. It feel a little bit better but it may vary from user to user so studies will be necessary.
2009-05-20 17:36:03 -07:00
The Android Open Source Project
a94b714e2d Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-05-20 17:34:17 -07:00
Android (Google) Code Review
b3271c82ee Merge change 2138 into donut
* changes:
  Add padding to public.xml to avoid breaking from auto-merges.
2009-05-20 17:06:48 -07:00
Android (Google) Code Review
d52b5e3f2e am b204d4f1: Merge change 2136 into donut
Merge commit 'b204d4f12773ec67c7f0ded41cb111018f154476'

* commit 'b204d4f12773ec67c7f0ded41cb111018f154476':
  First pass at cleaning up the gestures code.
2009-05-20 16:14:18 -07:00
Android (Google) Code Review
f210c1a78f am aa983388: Merge change 1932 into donut
Merge commit 'aa9833885d89d42a0cd0b4202485e67b63d51412'

* commit 'aa9833885d89d42a0cd0b4202485e67b63d51412':
  Qualify a type and add some explanatory comments.
2009-05-20 16:14:16 -07:00
Android (Google) Code Review
1cafd5e8d0 am 009b32dc: Merge change 2109 into donut
Merge commit '009b32dc8b9c32160e02a63b60636854f0ceb86f'

* commit '009b32dc8b9c32160e02a63b60636854f0ceb86f':
  Add option for gtalk stream compression
2009-05-20 16:14:13 -07:00
Romain Guy
6c2180aba2 am a6cd4e03: Fix NPE at boot.
Merge commit 'a6cd4e03e6bde0c4b76ad7290eb2c527398478d1'

* commit 'a6cd4e03e6bde0c4b76ad7290eb2c527398478d1':
  Fix NPE at boot.
2009-05-20 16:14:08 -07:00
The Android Open Source Project
a6a7c37f8e Merge commit 'fe0daa7da8608fd83c580ee62240463b5b84afde' 2009-05-20 16:12:27 -07:00
Android (Google) Code Review
e6af9624ea Merge change 2136 into donut
* changes:
  First pass at cleaning up the gestures code.
2009-05-20 15:37:45 -07:00
Android (Google) Code Review
c6fc6fec6e Merge change 1932 into donut
* changes:
  Qualify a type and add some explanatory comments.
2009-05-20 15:28:36 -07:00
Android (Google) Code Review
cc5f23cb2b Merge change 2109 into donut
* changes:
  Add option for gtalk stream compression
2009-05-20 15:22:02 -07:00
Android (Google) Code Review
e5cdb7afdb Merge change 2115 into donut
* changes:
  bring the native_handle stuff back from master_gl
2009-05-20 15:00:24 -07:00
Mathias Agopian
53f6f3c799 bring the native_handle stuff back from master_gl 2009-05-20 14:33:23 -07:00
Joe Onorato
7ade036ca9 am 5595a937: this might fix the build
Merge commit '5595a93722cc440cee712a73b268c9f61399d876'

* commit '5595a93722cc440cee712a73b268c9f61399d876':
  this might fix the build
2009-05-20 14:21:14 -07:00
Android (Google) Code Review
3f5906aa20 am 2d10ba33: Merge change 2111 into donut
Merge commit '2d10ba33190c2ff1b24d6c48dd621c55a25bf2cc'

* commit '2d10ba33190c2ff1b24d6c48dd621c55a25bf2cc':
  GPS: Add support for forcing NTP time and XTRA data injection.
2009-05-20 14:11:34 -07:00
Android (Google) Code Review
e55a957bdf Merge change 2111 into donut
* changes:
  GPS: Add support for forcing NTP time and XTRA data injection.
2009-05-20 14:00:24 -07:00
Dianne Hackborn
ba490d8ed7 am d62ad4f1: Fix issue #1859814: Add android.os.Build.MANUFACTURER
Merge commit 'd62ad4f120e92fd597f44caf125ac853ac0ea11c'

* commit 'd62ad4f120e92fd597f44caf125ac853ac0ea11c':
  Fix issue #1859814: Add android.os.Build.MANUFACTURER
2009-05-20 13:26:02 -07:00
Android (Google) Code Review
2736ab855c am 4174e268: Merge change 2094 into donut
Merge commit '4174e2682f4eb6ea35c84e35810312967ea7e233'

* commit '4174e2682f4eb6ea35c84e35810312967ea7e233':
  Fixes #1866819.\nTextView sets the bounds of its compound drawables to contain only the width and the height of the drawables. This causes View.invalidateDrawable() to invalidate the compound drawables at location (0, 0) within the view, thus invalidating the wrong part of the View. This prevents animation from running correctly when using animated drawable. This change overrides invalidateDrawable() in TextView to take into account the real position of the compound drawable.
2009-05-20 13:15:11 -07:00
Android (Google) Code Review
5c8b59b811 Merge change 2094 into donut
* changes:
  Fixes #1866819.\nTextView sets the bounds of its compound drawables to contain only the width and the height of the drawables. This causes View.invalidateDrawable() to invalidate the compound drawables at location (0, 0) within the view, thus invalidating the wrong part of the View. This prevents animation from running correctly when using animated drawable. This change overrides invalidateDrawable() in TextView to take into account the real position of the compound drawable.
2009-05-20 13:13:42 -07:00
Android (Google) Code Review
0697f2d337 am f209b46c: Merge change 2092 into donut
Merge commit 'f209b46c52dc25fbd2c08b14824de9845cc64b07'

* commit 'f209b46c52dc25fbd2c08b14824de9845cc64b07':
  Make sure smsHeader != null before using it.
2009-05-20 13:02:17 -07:00
Android (Google) Code Review
47602e77d5 Merge change 2092 into donut
* changes:
  Make sure smsHeader != null before using it.
2009-05-20 13:00:22 -07:00
Mathias Agopian
c5b2c0bf80 move libbinder's header files under includes/binder 2009-05-20 12:55:03 -07:00
Mathias Agopian
208059f67e checkpoint: split libutils into libutils + libbinder 2009-05-20 12:55:02 -07:00
Android (Google) Code Review
501c6179e1 Merge change 2090
* changes:
  Fix bug #1863517: use the new signature for data message token in SubscribedFeedsIntentService.
2009-05-20 12:18:29 -07:00
Android (Google) Code Review
416acf8b32 am e2914615: Merge change 2099 into donut
Merge commit 'e29146158b6048936671decc060d398a68333fc0'

* commit 'e29146158b6048936671decc060d398a68333fc0':
  Hook up the backup data writer, and add a utility to read the backup data files.
2009-05-20 11:58:08 -07:00
Android (Google) Code Review
2d3ff5b0cf Merge change 2099 into donut
* changes:
  Hook up the backup data writer, and add a utility to read the backup data files.
2009-05-20 11:53:08 -07:00
Jean-Baptiste Queru
ebb31d0089 am d3f14a62: reconcile donut snapshot
Merge commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9'

* commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9':
  donut snapshot
2009-05-20 11:49:58 -07:00
Android (Google) Code Review
a0f3a6a689 am 40f5a4ea: Merge change 2089 into donut
Merge commit '40f5a4ea3bc90e43a442ab336f2342020bba86b3'

* commit '40f5a4ea3bc90e43a442ab336f2342020bba86b3':
  Update searchables list in getSearchablesInGlobalSearch().
2009-05-20 11:49:54 -07:00
Android (Google) Code Review
f687a0615e am a5ca3425: Merge change 2017 into donut
Merge commit 'a5ca3425f9cbb930dc62559893590432ed29c961'

* commit 'a5ca3425f9cbb930dc62559893590432ed29c961':
  Increment BatteryStatsImpl's VERSION.
2009-05-20 11:49:34 -07:00
Jean-Baptiste Queru
a34678b7df reconcile donut snapshot
Merge branch 'donut-snapshot' into HEAD
2009-05-20 11:28:11 -07:00
Jean-Baptiste Queru
9660d304ae donut snapshot 2009-05-20 11:28:04 -07:00