Commit Graph

12285 Commits

Author SHA1 Message Date
Mathias Agopian
fda42f318a fix [2397853] glCopyTexImage2D crashes emulator
Fixed a typo which would cause a buffer overflow
2010-02-01 13:45:08 -08:00
Mathias Agopian
51ee7eb55b Merge "Don't use MemoryDealer in MetadataRetrieverClient as it's not necessary." 2010-02-01 12:08:11 -08:00
Mathias Agopian
4a14dd5fe8 Merge "Don't use the MemoryDealer in CursorWindow, it's not necessary." 2010-02-01 12:07:56 -08:00
Mike Lockwood
e48e234dc0 Merge "Remove ILocationProvider.isEnabled() binder call and use cached value instead." 2010-02-01 11:03:09 -08:00
Maryam Garrett
adc6d09816 Merge "Remove 2 unused imports." 2010-02-01 10:09:42 -08:00
Maryam Garrett
4efd5c1e67 Remove 2 unused imports.
Change-Id: I4ada5f3dccdbb2e7ede29693f7211068808f2d75
2010-02-01 11:47:45 -05:00
Mike Lockwood
6eb975c180 Merge "Add resources to specify package name for network location and geocode providers." 2010-02-01 02:45:19 -08:00
Wu-cheng Li
fdef2fb051 Merge "Add float support for set and get in CameraParameters." 2010-01-31 06:09:14 -08:00
Wu-cheng Li
391f3f8b5e Add float support for set and get in CameraParameters.
bug:2375989
bug:2375987
2010-01-31 17:03:10 +08:00
Wu-cheng Li
077c40fee3 Add focal length and view angle API.
bug:2375989,2375987
2010-01-30 20:36:04 +08:00
Dianne Hackborn
b0b1eff2bc Merge "Fix sample code insertion." 2010-01-29 19:13:11 -08:00
Jim Miller
853f6957dd am 3a8a2818: am d8a3a895: Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Merge commit '3a8a28185bc26ccfdf847016d5a40af35436ca97'

* commit '3a8a28185bc26ccfdf847016d5a40af35436ca97':
  Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
2010-01-29 18:12:47 -08:00
Jim Miller
8fee03b1f0 am d8a3a895: Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Merge commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c' into eclair-plus-aosp

* commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c':
  Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
2010-01-29 18:06:48 -08:00
Dianne Hackborn
a6f4f9e5f2 Merge "Fix SDK build." 2010-01-29 17:39:06 -08:00
Dmitri Plotnikov
032cc4fcc5 Merge "Adding system preferences for contacts: sort order and display order." 2010-01-29 17:37:05 -08:00
Oscar Montemayor
a92ee47866 Merge "Apps on SD card project. Refactored recommendAppInstallLocation(..) method in PackageManager by making it an instance method. Since PackageManager has only abstarct instance methods, moved implementation to ApplicationContext.ApplicationPackageManager class, in line with the rest of the method implementations. Tah way, chage is consistent with best coding practices. Also MockPackageManager received the additional method." 2010-01-29 16:50:21 -08:00
Neal Nguyen
82cc4fd2ff Merge "Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources." 2010-01-29 16:38:53 -08:00
Andy McFadden
cceeb6d6bb Merge "Added dumpHprofDataDdms() call." 2010-01-29 16:33:19 -08:00
Chris Tate
71957626ea Merge "Don't crash on transport unregistration if there is no current transport" 2010-01-29 16:28:19 -08:00
Chris Tate
ee4910e4f9 Merge "Fix build: javadoc @link pointers need HTML-style #refname" 2010-01-29 16:21:01 -08:00
Mathias Agopian
1f6d66aec8 Merge "Simplify the MemoryDealer implementation" 2010-01-29 15:07:05 -08:00
Andreas Huber
5e2b2f6971 Merge "Apparently the generic mpeg4 file header does not describe the actual samplerate and channel count of the content in the case of mpeg4 audio, instead the 'ESDS' atom must be consulted." 2010-01-29 15:05:09 -08:00
Chris Tate
02dad2f620 Merge "Make backup/restore asynchronous and enforce timeouts" 2010-01-29 15:02:03 -08:00
Andreas Huber
55090f4728 Merge "Support 24-bit LE PCM wave files in stagefright." 2010-01-29 14:54:15 -08:00
Mathias Agopian
0dd0d2944a Simplify the MemoryDealer implementation
At some point the implementation became complicated because of
SurfaceFlinger's special needs, since we are now relying on gralloc
we can go back to much simpler MemoryDealer.

Removed HeapInterface and AllocatorInterface, since those don't need
to be paramterized anymore. Merged SimpleMemory and Allocation.
Made SimplisticAllocator non virtual.

Removed MemoryDealer flags (READ_ONLY, PAGE_ALIGNED)

Removed a lot of unneeded code.
2010-01-29 14:51:06 -08:00
Jack Palevich
10e6d20fb3 Merge "Implement the GL11ExtensionPack APIs." 2010-01-29 14:28:36 -08:00
Mike Lockwood
9a4539e91e Merge "Support for triggering the lockscreen while the screen is on:" 2010-01-29 14:21:38 -08:00
Chris Tate
ed8113d9d6 Merge "Add a method to IBackupTransport to get the current backup set token" 2010-01-29 14:15:14 -08:00
Andreas Huber
8d0d8f15b4 Merge "Properly forward errors returned by AudioTrack up to the player." 2010-01-29 14:08:56 -08:00
Scott Main
bad3761c8c am 1076ea0a: am 9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Merge commit '1076ea0abe3cace6629063d63ee1242a5a7588a2'

* commit '1076ea0abe3cace6629063d63ee1242a5a7588a2':
  docs: update web page debugging with info about page and line
2010-01-29 13:52:30 -08:00
Dirk Dougherty
4274d9fd68 am aa86da9d: am 196ec566: Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Merge commit 'aa86da9d14d08ee39ca3e3fcabba01560c64f37d'

* commit 'aa86da9d14d08ee39ca3e3fcabba01560c64f37d':
  SDK doc change: Increment the platform version var used in doc footer and elsewhere.
2010-01-29 13:52:20 -08:00
Andreas Huber
ebb7ed4bd8 Merge "The AVC software decoder always aligns the decoded dimensions to 16 pixel boundaries, report this properly to callers." 2010-01-29 13:51:33 -08:00
Scott Main
89f164ff7c am 9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Merge commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8' into eclair-plus-aosp

* commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8':
  docs: update web page debugging with info about page and line
2010-01-29 13:47:40 -08:00
Dirk Dougherty
329df1b5b0 am 196ec566: Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Merge commit '196ec566b39340942f146ce4a9af775f4c648d2d' into eclair-plus-aosp

* commit '196ec566b39340942f146ce4a9af775f4c648d2d':
  SDK doc change: Increment the platform version var used in doc footer and elsewhere.
2010-01-29 13:47:28 -08:00
Scott Main
f2d703adf0 Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair 2010-01-29 13:40:53 -08:00
Neal Nguyen
033b5a2fa5 Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.
Most of these are file moves; a couple notable exceptions are the changes due to the move, and fixing up test code:
- database/DatabaseCursorTest.java
- database/DatabaseStatementTest.java
- net/UriTest.java
2010-01-29 13:35:51 -08:00
Oscar Montemayor
0d9eaf035c Merge "Apps on SD card project. This class implements heuristics to determine best app install location, without looking at the package flags (pre-parsing stage)." 2010-01-29 13:28:46 -08:00
Maryam Garrett
9337e9ea1a Merge "Move LoggingEvents.java to android-common & add UserHappiness" 2010-01-29 11:33:24 -08:00
Maryam Garrett
c36bd07eae Move LoggingEvents.java to android-common & add UserHappiness
The LoggingEvents move will allow Gmail, Voice Search and other apps to
access the LoggingEvents needed. This file will replace
packages/inputmethods/LatinIMEsrc/com/android/inputmethod/voice/LoggingEvents.java
vendor/google/apps/VoiceSearch/apps/VoiceSearch/src/com/google/android/voicesearch/logging/LoggingEvents.java

In addition to moving the file, I have added 3 new fields:
TIMESTAMP, IME_TEXT_ACCEPTED, CALLING_APP_NAME. I needed to
create CALLING_APP_NAME b/c I can't re-use EXTRA_APP_NAME
because that is reserved for one of two values: voice
search or voice IME.

I added another file to android-common: UserHappinessSignals
This can be imported by different applications to broadcast
various user happiness metrics. It is currently used by Gmail's
CompseActivity.java to indicate that a user "accepted" the IME
text when they pressed the send button.

Change-Id: Ia859140facb7fb66a12706735d5132ba9eaa5ea0
2010-01-29 13:27:56 -05:00
Andreas Huber
b9c156fd3b Merge "Make sure the OMX component is synchronously shutdown before we try to instantiate another one. Also properly cleanup the software AVC decoder to avoid leaking memory." 2010-01-29 10:25:01 -08:00
Andreas Huber
22d17cd619 Merge "For mpeg4 files streamed through HTTP, cache the entire sampletable metadata chunk in memory if possible." 2010-01-29 10:04:01 -08:00
Bjorn Bringert
5896e90dd9 Merge "Update search source selector assets" 2010-01-29 09:23:05 -08:00
Suchi Amalapurapu
ed9306d9c8 Merge "Fix StringIndexOutOfBoundsException in PackageManagerService" 2010-01-29 08:45:39 -08:00
Daniel Sandler
e4ef8b5fdd Merge "New full-screen activity for USB mass storage interaction." 2010-01-29 06:22:33 -08:00
Adam Powell
cbda0e4773 Merge "Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView." 2010-01-28 21:24:10 -08:00
Irfan Sheriff
ff22ba3c87 Merge "Blacklist APs instead of disable" 2010-01-28 20:46:25 -08:00
Dirk Dougherty
aa51f1a242 Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair 2010-01-28 17:59:24 -08:00
Tom Taylor
c3b9f0e63c Remove MMS from the framework
The MMS code has been moved into the mms-common library.
Move SqliteWrapper (and make it hidden) into the database
directory because Telephony.java depends on it. Create a mmscommon
library similar to androidcommon for a number of files used both
by the telephony layer, by mms, and by myfaves.

Change-Id: I2e23e87c4961b87c42a4c8a63f812fa9e0e44dec
2010-01-28 16:59:27 -08:00
Dirk Dougherty
1862bb262b am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Merge commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a'

* commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
2010-01-28 16:52:43 -08:00
Dirk Dougherty
f1e2b83c0a am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Merge commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp

* commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
2010-01-28 16:46:54 -08:00