Jeff Brown
96ba76fbde
Merge "Refactor SQLiteOpenHelper."
2012-02-29 17:06:08 -08:00
Jeff Brown
958cbbab6a
Don't throw if sqlite3_finalize returns an error.
...
Change-Id: Ibcc772ad5343dd241ed9dc492e4d838e1ab962d4
2012-02-29 17:02:04 -08:00
Jeff Brown
559d0645ac
Refactor SQLiteOpenHelper.
...
Combine the code for opening readable and writable databases.
This improves the handling of the case where a database cannot
be opened because it cannot be upgraded. Previously we would
open the database twice: first read-write, then read-only, each
time failing due to the version check. Now only open it once.
Removed the goofy locking logic related to upgrading a read-only
database to read-write. We now do it in place by reopening the
necessary connections in the connection pool.
Change-Id: I6deca3fb90e43f4ccb944d4715307fd6fc3e1383
2012-02-29 17:02:04 -08:00
Michael Jurka
4eaa983f25
Fix alpha when swiping recents on tablets
...
When you swipe to dismiss a recent item on a
tablet, fade the item to 0 alpha
Also, create common interface for Recents-specific
methods for Recents[Horizontal/Vertical]ScrollView
Bug: 5953654
Change-Id: I0a72b49b3cfae0607b42dbf8f6d4da9898d7e491
2012-02-29 16:49:01 -08:00
Alex Sakhartchouk
96804ad6bc
Allocation sampling api prototypes.
...
Change-Id: Ia11c6a107ea49ad6f40cfd220c537376a18c3b62
2012-02-29 16:43:24 -08:00
Andrew Hsieh
502695d528
Merge "Fixed several 64-bit porting issues"
2012-02-29 16:41:55 -08:00
James Dong
71dea373f4
Merge "Added permission check for all sensitive drm API calls"
2012-02-29 16:32:10 -08:00
Fabrice Di Meglio
fe35a46f56
Merge "Fix bug #5616520 When the device is set to Arabic, and the email application is launched, the guided text is not displayed"
2012-02-29 16:20:24 -08:00
Fabrice Di Meglio
b863419b75
Fix bug #5616520 When the device is set to Arabic, and the email application is launched, the guided text is not displayed
...
- do correct scrolling when hint is shown
Change-Id: If17a1ffbd4d83bfa601e5ee97d3e73932eb4143c
2012-02-29 16:00:47 -08:00
Yu Shan Emily Lau
eb4f3256b7
Set the video encoding bit rate for the media
...
recorder stress test.
Change-Id: I1fa5965d2ba0e17be97ff3b9bd8df3df4e438087
2012-02-29 15:57:21 -08:00
Jean-Baptiste Queru
f73222a39e
am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
...
* commit '964955e0bd98166c16f705811ce46d0151924cc8':
DRM framwork bug fix: add an API to release resources
2012-02-29 15:51:30 -08:00
Jean-Baptiste Queru
f09c0c7f31
am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
...
* commit '93920d79b7fa57ad941f5dbf33cf15ead6cd7318':
Set width of spinner's dropdown to fit on device
2012-02-29 15:51:28 -08:00
Jean-Baptiste Queru
dbc591e276
am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
...
* commit 'c69d61343913848b467022ef63f2c84cbc5ec34b':
Adds documentation for ContentResolver notifyChange()
2012-02-29 15:51:25 -08:00
Jean-Baptiste Queru
9de7793b42
am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
...
* commit '4f9063622415ea083bbd639af06e98065ce7176d':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
2012-02-29 15:51:23 -08:00
Jean-Baptiste Queru
715c78b933
am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
...
* commit '225eec8d2a1b63dfb57bcdcf3a72ab755f0e5525':
stagefright aacenc: Safeguard against overwriting bits
2012-02-29 15:51:19 -08:00
Jean-Baptiste Queru
964955e0bd
am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
...
* commit '8a9b14d80530eccf801fa794bacf287813b5978f':
DRM framwork bug fix: add an API to release resources
2012-02-29 15:47:45 -08:00
Jean-Baptiste Queru
93920d79b7
am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
...
* commit 'a66be970999c5eec1c8efb46e196f19ae563fc9b':
Set width of spinner's dropdown to fit on device
2012-02-29 15:47:42 -08:00
Jean-Baptiste Queru
c69d613439
am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
...
* commit '6ae4fe945b41d4bcb3ba7d931e34d6ef184b8b45':
Adds documentation for ContentResolver notifyChange()
2012-02-29 15:47:38 -08:00
Jean-Baptiste Queru
4f90636224
am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
...
* commit '9734843102c074c56ac72e221db0f51ae2fa79ec':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
2012-02-29 15:47:35 -08:00
Jean-Baptiste Queru
225eec8d2a
am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
...
* commit 'f9d4ba77f45d8f0efe97abb28247cbca12836dca':
stagefright aacenc: Safeguard against overwriting bits
2012-02-29 15:47:32 -08:00
Jean-Baptiste Queru
8a9b14d805
am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
...
* commit '5aeb85877a95cc12c0784757a9842983b04e8600':
DRM framwork bug fix: add an API to release resources
2012-02-29 15:44:41 -08:00
Jean-Baptiste Queru
a66be97099
am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
...
* commit '11aa4cc38b646f62eb22842d7510415b61c2ef84':
Set width of spinner's dropdown to fit on device
2012-02-29 15:44:38 -08:00
Jean-Baptiste Queru
6ae4fe945b
am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
...
* commit '9303919d7d837dedf16f09ace0013e62670568e7':
Adds documentation for ContentResolver notifyChange()
2012-02-29 15:44:34 -08:00
Jean-Baptiste Queru
9734843102
am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
...
* commit '704131cb7e4f9cc682ea57ed569375f9f289368e':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
2012-02-29 15:44:31 -08:00
Jean-Baptiste Queru
f9d4ba77f4
am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
...
* commit '69aae36e900cf7114c5895618747906951a11730':
stagefright aacenc: Safeguard against overwriting bits
2012-02-29 15:44:28 -08:00
Gilles Debunne
6382ade0c7
Invalidate text display list on scroll
...
This is a problem only when using TextView's internal scroll.
Since there was no bug report about this obvious problem, it
looks like most EditText are single ine or located inside of
a ScrollView.
Change-Id: I699ad0078c9df64c70d10c64f0293b404485e05f
2012-02-29 15:22:34 -08:00
Jean-Baptiste Queru
5aeb85877a
Merge "DRM framwork bug fix: add an API to release resources"
2012-02-29 15:12:48 -08:00
Jean-Baptiste Queru
11aa4cc38b
Merge "Set width of spinner's dropdown to fit on device"
2012-02-29 15:09:17 -08:00
Glenn Kasten
f79760b4aa
Merge "Shorten thread names"
2012-02-29 14:59:08 -08:00
Glenn Kasten
def33d23bc
Merge "Prepare for threadLoop merge - active tracks"
2012-02-29 14:56:30 -08:00
Glenn Kasten
d9cccfa19d
Prepare for threadLoop merge - active tracks
...
Continued work on making the copies of threadLoop more similar:
- Remove alias for mActiveTracks in MixerThread and DuplicatingThread.
- Pull in declaration of activeTrack in DirectOutputThread.
- Remove redundant parameter of prepareTracks_l().
- Comment prepareTracks_l().
Change-Id: If1087c1902b454acec01ddfdd9f055f0ca7abf04
2012-02-29 14:52:54 -08:00
Glenn Kasten
d67f2cf943
Merge "AudioRecord const methods"
2012-02-29 14:45:25 -08:00
Glenn Kasten
d555d70fd4
Merge "Update AudioFlinger comments"
2012-02-29 14:44:39 -08:00
Glenn Kasten
fa52678fbe
Merge "Pull in declaration of effectChains to inner block"
2012-02-29 14:43:19 -08:00
Jean-Baptiste Queru
9303919d7d
Merge "Adds documentation for ContentResolver notifyChange()"
2012-02-29 14:38:59 -08:00
Adam Powell
b5d3dd2cd5
Merge "Fix simple_list_item_multiple_choice to use correct size and spacing."
2012-02-29 14:26:24 -08:00
Jean-Baptiste Queru
704131cb7e
Merge changes I46c81dba,If1f40e9c,I652eaaa5
...
* changes:
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
2012-02-29 14:24:52 -08:00
Jean-Baptiste Queru
69aae36e90
Merge "stagefright aacenc: Safeguard against overwriting bits"
2012-02-29 14:23:38 -08:00
Adam Powell
f7dbb510e6
Fix simple_list_item_multiple_choice to use correct size and spacing.
...
Change-Id: Ie9e3dd7ec10980a4411e60b93f778bb4863cbd3c
2012-02-29 14:21:19 -08:00
Christopher Tate
a6816ee727
Merge "Merge: Introduce UpdateLocks"
2012-02-29 14:08:46 -08:00
Svetoslav Ganov
67d2c09d89
Merge "Update to allow passing empty string in a binding."
2012-02-29 14:08:13 -08:00
Svetoslav Ganov
8486bc11ba
Update to allow passing empty string in a binding.
...
Change-Id: Ia16bd5dc78da1f5c8e52070d9c0e8431744224e8
2012-02-29 14:06:36 -08:00
Christopher Tate
8662cab5c6
Merge: Introduce UpdateLocks
...
An "UpdateLock" works similarly to a wake lock in API: the caller is
providing a hint to the OS that now is not a good time to interrupt
the user/device in order to do intrusive work like applying OTAs.
This is particularly important for headless or kiosk-like products
where ordinarily the update process will be automatically scheduled
and proceed without user or administrator intervention.
UpdateLocks require that the caller hold the new signatureOrSystem
permission android.permission.UPDATE_LOCK. acquire() and release()
will throw security exceptions if this is not the case.
The "is now convenient?" state is expressed to interested parties
by way of a sticky broadcast sent only to registered listeners. The
broadcast is protected; only the system can send it, so listeners
can trust it to be accurate. The broadcast intent also includes a
timestamp (System.currentTimeMillis()) to help inform listeners that
wish to implement scheduling policies based on when the device became
idle.
The API change here is a tiny one: a dump(PrintWriter) method has been
added to the TokenWatcher class to facilitate getting information out
of it for dumpsys purposes. UpdateLock itself is still @hide.
Bug 5543442
Change-Id: I3709c831fc1883d7cb753cd2d3ee8e10a61e7e48
2012-02-29 14:05:24 -08:00
Jake Hamby
b303b42816
Merge "Revert "Add support for CMAS warning notifications over CDMA." I'll submit again when the app change is ready."
2012-02-29 14:04:48 -08:00
Robert Greenwalt
c9dac1185d
Don't forget to turn off mobile_dun
...
When we find a higher priority match for tethering traffic we should turn off
whatever we were trying before.
bug:6083611
Change-Id: I06ee41336df107353bf1a979150345e461574a48
2012-02-29 14:02:55 -08:00
Jake Hamby
efba344b5a
Revert "Add support for CMAS warning notifications over CDMA." I'll submit again when the app change is ready.
...
This reverts commit 0c49f03a0429b5c0c4a619256f7bca86a4997ae8
2012-02-29 14:00:12 -08:00
Eric Fischer
4917bc104d
am d31da0a6: am fb393f8b: Mark configuration strings as not translatable.
...
* commit 'd31da0a670a60722339faa18e1147adb9c14532d':
2012-02-29 13:30:51 -08:00
Eric Fischer
b145e363ff
am ba62da99: am fb393f8b: Mark configuration strings as not translatable.
...
* commit 'ba62da99666c9ca590cde49ff00c06d3d50ca0a7':
Mark configuration strings as not translatable.
2012-02-29 13:28:52 -08:00
Eric Fischer
ba62da9966
am fb393f8b: Mark configuration strings as not translatable.
...
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
Mark configuration strings as not translatable.
2012-02-29 13:26:13 -08:00
Eric Fischer
d31da0a670
am fb393f8b: Mark configuration strings as not translatable.
...
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
Mark configuration strings as not translatable.
2012-02-29 13:26:08 -08:00