Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp
* commit '478747181e0414d703076d4786b201718cd93d5b':
Support new URI structure for download provider.
Merge commit '4198cececf70bf034e12f19bb87f29cc29931c39' into gingerbread-plus-aosp
* commit '4198cececf70bf034e12f19bb87f29cc29931c39':
Fix the rest of the javadoc warnings.
Merge commit '7747795af508354b3792e497e6a7b4bc749b4007' into gingerbread-plus-aosp
* commit '7747795af508354b3792e497e6a7b4bc749b4007':
These are not javadoc tags, they are annotations in sample code. Escape them properly.
Merge commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777' into gingerbread-plus-aosp
* commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777':
Adding new assets for designers
Merge commit '747c61535281b4d2958e293e83245a19ba58f6a0' into gingerbread-plus-aosp
* commit '747c61535281b4d2958e293e83245a19ba58f6a0':
ContactsContract: update SipAddress to be multi-valued
This is step (1) of the device-side changes to deal with SIP addresses
becoming first-class objects in focus.
It'll be multi-valued in focus, so make it multi-valued on the device
(just like Phone, Email, Im, etc.)
Possible types are CUSTOM, HOME, WORK, and OTHER.
Also while I was in there, fixed the typo in "TYPE_MAINDEN_NAME" in the
Nickname class. (I can't remove it, since it's public API, so I added a
new constant with the correct spelling and deprecated the misspelled
one.)
Bug: 3004838
TESTED: on passion:
- Flashed this change onto a device that already had a contact with a
SipAddress, verified that it still shows up fine in the UI.
- Wiped data, rerean SetupWizard and logged in, made sure that SIP
addresses got synced down properly.
- Edited SIP address on the device, made sure it got correctly synced
up to the SIP user-defined field.
Change-Id: I6ecf551b64f87de03a7807e6212297d91f9e3981
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 '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
Merge commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp
* commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57':
Update camera API and javadoc for API review comments.
I'm changing the URI structure for the download provider a bit. The
download provider will now support two views into its data:
* content://downloads/my_downloads... will basically be the current
view, which is limited to downloads owned by the calling UID
* content://downloads/all_downloads... will include all downloads in
the system, but will require special permission
In addition to making things more clear, this change will allow for
granting URI permissions to individual downloads via the
/all_downloads/... URI.
This change includes the framework changes necessary to support the
new structure. The bulk of the work will be in the DownloadProvider
code itself.
In addition, this change makes DownloadManager return a content URI
rather than a file URI for /cache downloads. This avoids any
confusion in clients, which wouldn't be able to open the file
directly, and better supports granting permissions to viewers.
Change-Id: Ie548b927817ac774111990dd0c9d26aaf979d1ea
Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp
* commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed':
Mark MODIFY_PHONE_STATE permission as signatureOrSystem
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp
* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
This permission isn't needed right now, since there aren't actually any
public APIs that require it. (There are a few calls in the ITelephony
interface that do, but they're all hidden.)
Since there's no good reason for 3rd party apps to declare it, let's
mark it signatureOrSystem for now. We can bring it back -- and probably
split it apart into multiple finer-grained permissions -- once we
finally expose full telephony APIs to 3rd party apps (see bug 1043005).
Bug: 2989096
Change-Id: Idf898d5e12d648a959f622cd815e75597195aa82
Merge commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487' into gingerbread-plus-aosp
* commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487':
Fixes some bugs in TimeZoneUtils
TimeZoneUtils was updating the db and modifying the selection. This
creates a static selection for each update type and creates new
values for each update. Also adds a method for apps to force the
local tz cache to refresh if they think another app has modified
the db.
Change-Id: Iaaade635ac8ff11bb116005a0f6b44efcd4c4056
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp
* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
Replace epoll() with poll() and rename PollLoop to Looper.
Merge commit 'b92788aa040d0971b4e54589aef7675f34d96e5d' into gingerbread-plus-aosp
* commit 'b92788aa040d0971b4e54589aef7675f34d96e5d':
Adds time zone functionality into fw as a hidden api
