17720 Commits

Author SHA1 Message Date
Mathias Agopian
6faf7893b6 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
Ray Chen
bf124e7e41 Unhide ThumbnailUtils to support Camera unbundling.
http://b/2375978
2010-01-29 14:30:05 -08:00
Jack Palevich
c88ed5dc5d Merge "Implement the GL11ExtensionPack APIs." 2010-01-29 14:28:36 -08:00
Mike Lockwood
98af636abb Merge "Support for triggering the lockscreen while the screen is on:" 2010-01-29 14:21:38 -08:00
Chris Tate
391e62690e Merge "Add a method to IBackupTransport to get the current backup set token" 2010-01-29 14:15:14 -08:00
Andreas Huber
8b6c541097 Merge "Properly forward errors returned by AudioTrack up to the player." 2010-01-29 14:08:56 -08:00
Christopher Tate
50c6df04cf Add a method to IBackupTransport to get the current backup set token
This will be used to specifically manage restores of last-known-good data
generated from the current device during its normal provisioned lifetime.
2010-01-29 14:06:15 -08:00
Mike Lockwood
ef73162887 Support for triggering the lockscreen while the screen is on:
Add new ALLOW_LOCK_WHILE_SCREEN_ON window manager flag, which when set
causes the window manager to put up the lockscreen after the
normal screen timeout has elapsed.

Add plumbing to pass PowerManager.userActivity() to the window manager policy.

Change-Id: I05adc52bad39c56031a08e8ec3cbcf5c2d9b9827
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-29 17:05:04 -05:00
Scott Main
3b889f5219 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
604b871402 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
6580a1449f 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
1076ea0abe 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
aa86da9d14 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
9800adf2a4 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
Andreas Huber
7ff292c852 The AVC software decoder always aligns the decoded dimensions to 16 pixel boundaries, report this properly to callers. 2010-01-29 13:28:48 -08:00
Oscar Montemayor
7bfa1f3a72 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
Andreas Huber
62eac00850 Properly forward errors returned by AudioTrack up to the player.
related-to-bug: 2300197
2010-01-29 13:24:58 -08:00
Vasu Nori
6eb7c45a8f make SqliteDatabase ConflictAlgorithm and associated methods public.
SQLiteDatabase.java has ConflictAlgorithm which allows callers to specify
actions to take when insert or update causes constraint violations.
These actions are documented at http://www.sqlite.org/lang_conflict.html.

why make these public? usecase is the following:
Gmail has a table with a column "_id" being the integer primary key and
they let sqlite assign key values to the column.
but there is another UNIQUE key column (message_id) in the table.
so an insert could fail due to constraint violation on the message_id column
(i.e., not on the primary key). and when that happens, they would like to
get the value of _id that caused constraint violation.

currently hidden method insertOnConflict() already provides the above
functionality. that means exposing ConflictAlgorithm also.
2010-01-29 12:24:28 -08:00
Scott Main
7b02e924b0 docs: update web page debugging with info about page and line
numbering in the log.
2010-01-29 12:17:32 -08:00
Maryam Garrett
35ec7863e1 Merge "Move LoggingEvents.java to android-common & add UserHappiness" 2010-01-29 11:33:24 -08:00
Maryam Garrett
1fd8c98fba 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
85fb658b4b 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
98b48dee32 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.
related-to-bug: 2404786
2010-01-29 10:11:11 -08:00
Andreas Huber
752b4a3785 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
60f1b95ef3 Merge "Update search source selector assets" 2010-01-29 09:23:05 -08:00
Suchi Amalapurapu
bd2f531a28 Merge "Fix StringIndexOutOfBoundsException in PackageManagerService" 2010-01-29 08:45:39 -08:00
Bjorn Bringert
aa0cfa7b6b Update search source selector assets
Change-Id: Id56e2ac195e1d1f8dcfe2fbe07025f3527396bba
2010-01-29 16:15:36 +00:00
Daniel Sandler
d425a45f8d Fix build.
(Broken in change Ib94f795c.)
2010-01-29 10:09:04 -05:00
San Mehat
b4a162e50a framework: os: Introduce IMountServiceObserver
Signed-off-by: San Mehat <san@google.com>
2010-01-29 06:30:03 -08:00
Daniel Sandler
77c292d83e Merge "New full-screen activity for USB mass storage interaction." 2010-01-29 06:22:33 -08:00
Bjorn Bringert
5fd5bfe942 Fix StringIndexOutOfBoundsException in PackageManagerService
The method packageManagerService.getNextCodePath(String oldCodePath,
String prefix, String suffix) threw StringIndexOutOfBoundsException if
oldCodePath does not contain prefix, and prefix is longer than
oldCodePath, or if the preix and suffix overlap.

Fixes http://b/issue?id=2404232

Change-Id: Ib8abb16f8bfd08f607476d9289f46d170c43a076
2010-01-29 12:29:41 +00:00
Chia-chi Yeh
784d53e79b WifiService: allow EAP variables to be unset using empty strings. 2010-01-29 16:26:28 +08:00
Adam Powell
a9938c4bf4 Merge "Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView." 2010-01-28 21:24:10 -08:00
Oscar Montemayor
1228d0a1dd 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-28 21:03:16 -08:00
Irfan Sheriff
05d72117f9 Handle error strings from monitor connection
Bug: 2399119
Change-Id: I481cfbfb11fb453659134004aafa3df236ba050b
2010-01-28 20:54:12 -08:00
Irfan Sheriff
c4a0c2744a Merge "Blacklist APs instead of disable" 2010-01-28 20:46:25 -08:00
Dirk Dougherty
196ec566b3 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
Dirk Dougherty
ab2c0a4fab SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Bug: 2160782
Change-Id: I6e7721bca95cdc6565f3200d7609a4ea9b45cf9b
2010-01-28 17:50:10 -08:00
Adam Powell
f54460576e Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView. 2010-01-28 17:25:29 -08:00
Tom Taylor
5e342fa326 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
1f40f174e7 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
b574cf876e 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
Dirk Dougherty
7b00a8ae71 Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 2010-01-28 16:40:56 -08:00
Dirk Dougherty
95b528eab5 SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Bug: 2160782
Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
2010-01-28 16:26:50 -08:00
Jean-Baptiste Queru
d09f4aaba2 resolved conflicts for merge of bb074ef9 to master
Change-Id: I2d78d1280b56928f65517203348ddbd403fa9eae
2010-01-28 15:21:25 -08:00
Dirk Dougherty
59e8fc5f53 am 67a65856: am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Merge commit '67a658567a6bad898c097e615f8efcb3c91fa50d'

* commit '67a658567a6bad898c097e615f8efcb3c91fa50d':
  doc change only: Update announcement and mwc redirect to point to microsite.
2010-01-28 15:10:19 -08:00
Eric Laurent
3869986d68 Merge "Remove verbose log from AudioPolicyManagerBase." 2010-01-28 15:01:42 -08:00
Jim Miller
2e9dea1dbe am fbf977be: am 9985867a: Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Merge commit 'fbf977be5471a81b664bfc0a048497f268688a17'

* commit 'fbf977be5471a81b664bfc0a048497f268688a17':
  Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
2010-01-28 14:57:03 -08:00
Robert Greenwalt
fbf56dc719 am 3e229076: am cc4b4016: Fix the reporting of NO_CONNECTIVITY.
Merge commit '3e229076203cd8cfee0adac44cd3c930dfa0e59c'

* commit '3e229076203cd8cfee0adac44cd3c930dfa0e59c':
  Fix the reporting of NO_CONNECTIVITY.
2010-01-28 14:46:55 -08:00
Andreas Huber
affa99c529 For mpeg4 files streamed through HTTP, cache the entire sampletable metadata chunk in memory if possible.
related-to-bug: 2295438
2010-01-28 14:27:37 -08:00