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.
Cellular signal strength should also be green - these assets aren't, but
the art guys are working on that.
Also using a new intent so we don't overload the CONNECTIVITY_ACTION and
confuse the apps.
bug:2994024
Change-Id: I6fe8f65dd6e9869d9724064c4fae45340491a4d8
Merge commit '310da64d78750cdba4349d7cc0a268c07155569d'
* commit '310da64d78750cdba4349d7cc0a268c07155569d':
fix a typo where the eventtags code were wrong
Merge commit '7ff945775210c60e6f113fb00903449cbb05c68a'
* commit '7ff945775210c60e6f113fb00903449cbb05c68a':
Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
Merge commit 'b8dbdc293a8495a873a9c36353d6a9408c698256' into gingerbread-plus-aosp
* commit 'b8dbdc293a8495a873a9c36353d6a9408c698256':
Clarify the danger of READ_LOGS and DUMP permissions.
Merge commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d' into gingerbread-plus-aosp
* commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d':
Upgrade to the latest .webm project code.
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 '8d9e8de2c920e8c9dc2da33410780ec739076bb9'
* commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9':
SipService: send SERVER_ERROR if server doesn't provide nonce
Merge commit 'd2de99e377408dc28dca5e4c61a816879595fbf3'
* commit 'd2de99e377408dc28dca5e4c61a816879595fbf3':
Fix name shadowing bug with revoking URI permissions.
Merge commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051'
* commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051':
DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
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.
