Merge commit '1b60963c42e159aacc52d688defcac206e5ecec0'
* commit '1b60963c42e159aacc52d688defcac206e5ecec0':
Clarify the danger of READ_LOGS and DUMP permissions.
Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f'
* commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f':
Fix the runtime restart due to name change.
Merge commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548'
* commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548':
Update camera API and javadoc for API review comments.
Merge commit 'b8dbdc293a8495a873a9c36353d6a9408c698256' into gingerbread-plus-aosp
* commit 'b8dbdc293a8495a873a9c36353d6a9408c698256':
Clarify the danger of READ_LOGS and DUMP permissions.
Merge commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp
* commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
Fix the runtime restart due to name change.
The logs inevitably contain PII, so now we are making that clear in user
strings and developer docs. Moving DUMP and READ_LOGS into the PERSONAL_INFO
group.
Note that this means we need string translations.
Change-Id: I1b5bf9d2d827ab1a31dedbdb30d0906a87c26a32
Merge commit '344d96635ec40e0c541f32064f42c8ad38e4505a' into gingerbread-plus-aosp
* commit '344d96635ec40e0c541f32064f42c8ad38e4505a':
Close tz query cursor when done.
We were creating a static AsyncQueryHandler which only held a
weak reference to the content resolver. This caused db updates
to be dropped once the original context had been gc'd. This
fix creates a new handler for each update to ensure we have a
valid resolver.
Change-Id: I049d8390ac0215e12e63d57b0bae4d3f6df64b6a
Merge commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9' into gingerbread-plus-aosp
* commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9':
Add new/changed drawable assets from design team
1. when LRU cache wants to remove the eldest entry, it may be finalizing
a statement that is still in use
2. a couple of synchronization issues.
3. a bit code refactoring in SQLiteCompiledSql
4. remove a bunch of unsed debug code from SQLiteDatabase
Change-Id: I45454dc2dbadd7d8842ba77dd2b0e9ff138ec6f4
Merge commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp
* commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57':
Update camera API and javadoc for API review comments.
Merge commit '14bc6b5d0677e5c454a67775c852f90389bb4567'
* commit '14bc6b5d0677e5c454a67775c852f90389bb4567':
Replace epoll() with poll() and rename PollLoop to Looper.
Merge commit '86e1991428c2bc78354965c51b2821ae16f32a55'
* commit '86e1991428c2bc78354965c51b2821ae16f32a55':
Adds time zone functionality into fw as a hidden api
Merge commit '282315e154b63a2eec84609600c81ad9e1c72994'
* commit '282315e154b63a2eec84609600c81ad9e1c72994':
Change the keep alive time for excess idle threads.
Merge commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0'
* commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0':
Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp
* commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed':
Mark MODIFY_PHONE_STATE permission as signatureOrSystem
Use this in ListView and GridView if the top view is not checkable.
This allows PreferenceActivity to now highlight the current heading
that is being shown.
Change-Id: I0d28aded9a61a42962b4aece420ae4058712d963
It takes some time when Locale is actually switched by the system,
which looks "system halt". Previous implementation doesn't allow
developers to cope with the situation and they just had to let
users wait for a moment.
This change allows the LocalePicker users (developers) to hook
the item change and delay the actual halt. If they don't want it,
calling updateLocale() immediately works fine.
Related
- I29685118467bd2a68b80abcf234f91098839be0b
- Iba7378e51e6d5318e901045ebeda63ea954a0647
Change-Id: I4062a70e11600d87e889b40d30796387c7069e21
Merge commit '720d5985f5d31912c97b7e549230d241e58c1298'
* commit '720d5985f5d31912c97b7e549230d241e58c1298':
Add an option to hide the Voice Search icon.
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp
* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
when exceptions are thrown, they are not being handled correctly
and the end result is some random errors/exceptions.
also change LOGD to LOGD_IF(cond,...) in keeping with Android
standards
Change-Id: Ie7f5e5e4b071ca6b2a6aa899c678c81f9ccd8e71
