OSDN Git Service
Alan Viverette [Fri, 16 Aug 2013 17:56:40 +0000 (17:56 +0000)]
Merge "Update documentation for FastScroller and SectionIndexer" into klp-dev
Satoshi Kataoka [Fri, 16 Aug 2013 07:08:51 +0000 (07:08 +0000)]
Merge "Add an API supportsSwitchingToNextInput" into klp-dev
Alan Viverette [Fri, 16 Aug 2013 01:16:06 +0000 (18:16 -0700)]
Update documentation for FastScroller and SectionIndexer
BUG:
3341285
Change-Id: I0607031576eaaecaebe848437cfbacd0d1a4b161
Baligh Uddin [Fri, 16 Aug 2013 00:28:16 +0000 (00:28 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Jeff Sharkey [Fri, 16 Aug 2013 00:08:05 +0000 (00:08 +0000)]
Merge "Documents management mode; API adjustment." into klp-dev
Jeff Sharkey [Thu, 15 Aug 2013 23:17:41 +0000 (16:17 -0700)]
Documents management mode; API adjustment.
Create documents manage mode to support Downloads and transient
storage devices. Locks user into requested backend root, and forces
file sizes on and sorting by last modified.
Separate API constants for Documents versus Roots, and give concrete
MIME types for roots.
Treat null sizes as unknown. Documents are always enabled in list
so that divider is drawn. Mark external storage file as writable.
Bug:
10329983,
10332993,
10332952
Change-Id: I05f4fdf5b04041a38e1ba7fb30202a3b0c615bf6
Zhihai Xu [Thu, 15 Aug 2013 22:46:14 +0000 (22:46 +0000)]
Merge "LE: Add support for the HID-over-GATT profile (2/3)" into klp-dev
John Spurlock [Thu, 15 Aug 2013 22:13:14 +0000 (22:13 +0000)]
Merge "Maintain TRANSIENT_*_BAR flags until transient bars hidden." into klp-dev
Andre Eisenbach [Fri, 8 Mar 2013 02:07:35 +0000 (18:07 -0800)]
LE: Add support for the HID-over-GATT profile (2/3)
bug:
8330048
Change-Id: I600563d81dec1638dc35e31e19f61d6c04f09ae8
Jeff Sharkey [Thu, 15 Aug 2013 21:53:54 +0000 (21:53 +0000)]
Merge "DocumentsUI handles GET_CONTENT; hinting, errors." into klp-dev
John Spurlock [Wed, 14 Aug 2013 21:57:38 +0000 (17:57 -0400)]
Maintain TRANSIENT_*_BAR flags until transient bars hidden.
Also factor common bar-management code into a separate helper
class called BarController instead of continuing to pollute
PhoneWindowManager with duplicate logic.
Bug:
10345412
Change-Id: I880900e61daa6c2c53b169e4885e68ebc62ecb6c
Jeff Sharkey [Thu, 15 Aug 2013 18:24:03 +0000 (11:24 -0700)]
DocumentsUI handles GET_CONTENT; hinting, errors.
Document browser now takes over all GET_CONTENT requests that request
openable Uris. It shows both storage backends and includes other apps
that respond to GET_CONTENT. Only grants transient read permissions.
Better guarding against throwing storage backends. Send sort order
and local-only hinting to backends.
Require that OPEN/CREATE_DOC users include openable category.
Bug:
10330112,
10329976,
10340741,
10331689,
10329971
Change-Id: Ieb8768a6d71201816046f4a4c48832061a313c28
Romain Guy [Thu, 15 Aug 2013 19:54:53 +0000 (12:54 -0700)]
Convert 4444 bitmaps to 8888
Bug #
10206452
Change-Id: I928c9189b0d80741490b01a739959d8c2d5312a7
(cherry picked from commit
a2cdb59b186d0ee51f110c1a7d358911573d48bf)
Dmitry Shmidt [Thu, 15 Aug 2013 19:32:33 +0000 (19:32 +0000)]
Merge "wifi: Send event without prefix to p2p0" into klp-dev
Michael Wright [Thu, 15 Aug 2013 19:26:43 +0000 (19:26 +0000)]
Merge "Bound touch and tool axes lengths below at 0" into klp-dev
Jeff Sharkey [Thu, 15 Aug 2013 18:50:02 +0000 (11:50 -0700)]
Gracefully handle missing directories.
Bug:
10295932
Change-Id: I9d18682d0ba57bf7f77d043ee8dab286ee80ba2a
Dmitry Shmidt [Wed, 14 Aug 2013 22:25:22 +0000 (15:25 -0700)]
wifi: Send event without prefix to p2p0
Bug:
9298955
Change-Id: I71037dd1cd60ee4efa75e1d6fab60a07bdf0626d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Jeff Sharkey [Thu, 15 Aug 2013 16:44:15 +0000 (16:44 +0000)]
Merge "Root invalidation, write and grid flags, local." into klp-dev
John Spurlock [Thu, 15 Aug 2013 16:38:45 +0000 (16:38 +0000)]
Merge "Recover tracking pointer going up mid-gesture in shade." into klp-dev
Daniel Sandler [Thu, 15 Aug 2013 16:06:49 +0000 (16:06 +0000)]
Merge "Defend against NPE." into klp-dev
John Spurlock [Thu, 15 Aug 2013 13:29:31 +0000 (09:29 -0400)]
Recover tracking pointer going up mid-gesture in shade.
Keep track of the pointer id used in driving the gesture. If
it happens to go up mid-gesture (another pointer is still down),
continue the gesture with another down pointer, instead of
abruptly jumping on next ACTION_MOVE.
Bug:
10246050
Change-Id: Ia6e59658635fd696974fe415f37811d27da80519
Satoshi Kataoka [Thu, 15 Aug 2013 06:36:44 +0000 (15:36 +0900)]
Add an API supportsSwitchingToNextInput
To let the system know an IME supports switching to a next input method
Bug:
8364845
Change-Id: Iabf4f106893ee6a262ad0cd44dbec0c661bf0ff2
Jeff Sharkey [Thu, 15 Aug 2013 01:29:19 +0000 (18:29 -0700)]
Root invalidation, write and grid flags, local.
Flags to indicate write support, and to indicate that a grid view is
preferred. Method to inform system that any root caches should be
invalidated. Methods to mark a Uri as requesting "local only" data.
Helper method for document creation.
Bug:
10330069,
10330108,
10330210,
10329976
Change-Id: I6ce6160f6ce6621e6ea05848a31bbbcb84587671
Michael Wright [Wed, 14 Aug 2013 20:44:23 +0000 (13:44 -0700)]
Bound touch and tool axes lengths below at 0
Change-Id: I75ca196312201773cfabb74ee5b28a7d80f6ba60
Alan Viverette [Thu, 15 Aug 2013 00:01:02 +0000 (00:01 +0000)]
Merge "Prevent refocus after entering touch mode" into klp-dev
John Spurlock [Wed, 14 Aug 2013 23:50:38 +0000 (23:50 +0000)]
Merge "Ensure LOW_PROFILE is always clear when bars are transient." into klp-dev
Alan Viverette [Wed, 14 Aug 2013 23:01:56 +0000 (23:01 +0000)]
Merge "Add motion event forwarding hidden APIs to View" into klp-dev
Alan Viverette [Wed, 14 Aug 2013 22:55:55 +0000 (22:55 +0000)]
Merge "Throw exception in FragmentManager when queuing to a destroyed activity" into klp-dev
Elliott Hughes [Wed, 14 Aug 2013 22:12:43 +0000 (15:12 -0700)]
DateUtils should use the user's 12/24-hour preference, not the locale's.
Bug:
10312832
(cherry picked from commit
f0b79aeed36f0839e4effaa36893b7ca71292563)
Change-Id: I0d78725d47009553f9003ccfba06f70f178a6ec1
Alan Viverette [Wed, 14 Aug 2013 21:57:13 +0000 (14:57 -0700)]
Add motion event forwarding hidden APIs to View
Change-Id: Ia7ab5496f8064c96b34912b5f5e9af6fd0978b34
Eino-Ville Talvala [Wed, 14 Aug 2013 20:20:43 +0000 (20:20 +0000)]
Merge "Camera2: Add metadata keys and enum values" into klp-dev
John Spurlock [Wed, 14 Aug 2013 20:08:45 +0000 (16:08 -0400)]
Ensure LOW_PROFILE is always clear when bars are transient.
Bug:
10326361
Change-Id: I4d12c4973153aac72bc840840f061ec782e27a87
Jeff Sharkey [Wed, 14 Aug 2013 20:08:36 +0000 (20:08 +0000)]
Merge "Add GIDs to packages.list, update SD card perms." into klp-dev
The Android Open Source Project [Wed, 14 Aug 2013 19:16:21 +0000 (12:16 -0700)]
am
04b40ee3: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '
04b40ee33e0f1649bedc9b0b9b3e277b6b37f164':
Use hostname verifier directly instead of instance DO NOT MERGE
If in a mobile captive portal is detected enable fail fast.
Have CaptivePortalTracker use gservices updateable provisioning urls.
In CaptiviePortalTracker a socket timeout is probably a captive portal.
Check that hipri has started.
Fix issue #
10226007: Reset apps restores most of the changed settings...
Fix issue #
10226007: Reset apps restores most of the changed settings...
The Android Open Source Project [Wed, 14 Aug 2013 19:09:27 +0000 (12:09 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: I498651fc3fa9b021570780e8b8848a806c31962f
Roman Nurik [Wed, 14 Aug 2013 18:32:13 +0000 (11:32 -0700)]
am
30e9065c: am
8ab80f1a: am
1a5bb9d5: Update Typography design guide Bug:
6947941
* commit '
30e9065c2530d9db5e63807649f1054b4ee33033':
Update Typography design guide Bug:
6947941
Roman Nurik [Wed, 14 Aug 2013 18:24:11 +0000 (11:24 -0700)]
am
8ab80f1a: am
1a5bb9d5: Update Typography design guide Bug:
6947941
* commit '
8ab80f1a02874a3bc4d9ec1272536e17a888bf3c':
Update Typography design guide Bug:
6947941
Roman Nurik [Wed, 14 Aug 2013 18:21:45 +0000 (11:21 -0700)]
am
1a5bb9d5: Update Typography design guide Bug:
6947941
* commit '
1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66':
Update Typography design guide Bug:
6947941
Baligh Uddin [Wed, 14 Aug 2013 18:18:19 +0000 (11:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b9539ca9b8988f87e4ca48b555725f6cd133284
Auto-generated-cl: translation import
Alan Viverette [Wed, 14 Aug 2013 18:17:25 +0000 (11:17 -0700)]
Throw exception in FragmentManager when queuing to a destroyed activity
Change-Id: I0522cf27fd423070f7578c1c43c1f05a335810bf
Roman Nurik [Wed, 14 Aug 2013 16:52:41 +0000 (09:52 -0700)]
Update Typography design guide
Bug:
6947941
Change-Id: I18a5c9cfd9de511c280d8aa7e410b5b9939c6774
Mike Klein [Wed, 14 Aug 2013 17:13:30 +0000 (13:13 -0400)]
Remove comment that's only relevant for the underlying SkMatrix. Matrix has constructors.
bug:
8470620
Change-Id: I00063dc03f752955c27c73e9c59b0496a1795924
Andreas Huber [Wed, 14 Aug 2013 15:39:14 +0000 (15:39 +0000)]
Merge "Expose MediaCodec.setParameters API to" into klp-dev
John Spurlock [Wed, 14 Aug 2013 13:46:52 +0000 (09:46 -0400)]
Normalize dream service dump check with other services.
Bug:
10310128
Change-Id: Ieeeccc01832b569cf7fb3d1633d7dde60fceb7b2
Matthew Xie [Wed, 14 Aug 2013 08:14:08 +0000 (08:14 +0000)]
Merge "LE: Add peripheral role support (1/4)" into klp-dev
Andre Eisenbach [Wed, 7 Aug 2013 02:57:48 +0000 (19:57 -0700)]
LE: Add peripheral role support (1/4)
Initial stack support for the LE peripheral role.
Change-Id: I6222493488822b4289b90888ccc97ad9306f54d1
Matthew Xie [Wed, 14 Aug 2013 07:27:49 +0000 (07:27 +0000)]
Merge "LE: Add instance ID to descriptors (1/4)" into klp-dev
Svetoslav [Wed, 14 Aug 2013 07:09:25 +0000 (07:09 +0000)]
Merge "Partial implementation for the favorite and available printer tracking." into klp-dev
Svetoslav [Tue, 13 Aug 2013 05:36:50 +0000 (22:36 -0700)]
Partial implementation for the favorite and available printer tracking.
1. Added a dedicated class that keeps track of the user's favorite printers
based on past usage. We keep the last 50 uses and assign a decreasing weight
to older historical use records. The printer whose records' sum is the
largest is considered the favorite for the user and so on.
2. Factored out the printer discovery logic from the print job config activity
into a separate available printers provider class. It encapsulates all the
logic to communicated with the remote print services to discover printers,
keep track of added, updated, and removed printers.
3. Preliminary scetch of the printer chooser acitivty that will show all the
printers.
Change-Id: I5524665f2a9a565f186db85214d5e41a44f4812e
Daniel Sandler [Wed, 14 Aug 2013 06:29:05 +0000 (06:29 +0000)]
Merge "Toward regularizing color & level across battery indicators." into klp-dev
Daniel Sandler [Fri, 12 Apr 2013 05:39:02 +0000 (01:39 -0400)]
Toward regularizing color & level across battery indicators.
Each of our existing assets is slightly incorrect in some
way: inconsistent pixel jumps from one percent to the next,
inconsistent color change, etc. The only way to get it
perfectly right is to draw it programmatically.
Bug:
8504254 // inconsistent color change threshold
-- previously --
Bug:
3136046 // in Gingerbread
Bug:
3387973 // Honeycomb
Bug:
5070948 // ICS
Change-Id: I6a3e7409ecec55e10328541ecb1e9d54aebdbe96
Daniel Sandler [Wed, 14 Aug 2013 05:24:33 +0000 (05:24 +0000)]
Merge "How did that get there?" into klp-dev
Daniel Sandler [Wed, 14 Aug 2013 05:19:45 +0000 (22:19 -0700)]
How did that get there?
Whoever checked this in: Turn in your badge and your gun.
Change-Id: I635dbc3bae6a58bf425241fb4105e26cc03a9869
Daniel Sandler [Wed, 14 Aug 2013 03:18:01 +0000 (20:18 -0700)]
Defend against NPE.
During SystemUI startup, populating accessibility for other
views can race with attaching SignalClusterView to its parent.
Bug:
9999664
Change-Id: Iba34a3edba403ae65ff3c37b953d0736068a67b9
Daniel Sandler [Wed, 14 Aug 2013 02:35:33 +0000 (02:35 +0000)]
Merge "Drop simultaneous pointer events when tracking velocity." into klp-dev
Andre Eisenbach [Tue, 9 Jul 2013 06:58:16 +0000 (23:58 -0700)]
LE: Add instance ID to descriptors (1/4)
If a remote devices offers multiple descriptors with the same UUID, the
instance ID is used to differentiate between them.
Change-Id: I0c36494c980c86abd23f9647196af8d59ef663e9
Daniel Sandler [Wed, 14 Aug 2013 02:24:19 +0000 (19:24 -0700)]
Drop simultaneous pointer events when tracking velocity.
They're not really simultaneous, but within 1ms of one
another, which is too close for getEventTime() to
distinguish; these events were causing the velocity
computation to become (understandably) confused and
resulting in failed panel flings.
Bug:
10246454
Change-Id: I3829192cdf9ad2a222ec8deca031d772d58de0da
Lajos Molnar [Wed, 14 Aug 2013 01:26:38 +0000 (01:26 +0000)]
Merge "MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilities" into klp-dev
Kenny Root [Wed, 14 Aug 2013 01:26:06 +0000 (18:26 -0700)]
am
5ad480c8: am
965eb258: am
1c2cb653: am
999ddae7: am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
5ad480c8fba9a7044d827c38db235cffd52fbc13':
Use hostname verifier directly instead of instance
John Spurlock [Wed, 14 Aug 2013 01:05:38 +0000 (01:05 +0000)]
Merge "Delay transient navigation confirmation prompt." into klp-dev
Kenny Root [Wed, 14 Aug 2013 00:59:31 +0000 (17:59 -0700)]
am
965eb258: am
1c2cb653: am
999ddae7: am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
965eb258438619774d37cce0ccf9edc976c7a343':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:57:10 +0000 (17:57 -0700)]
am
1c2cb653: am
999ddae7: am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
1c2cb6533bfebf8b930850215e24327420e34a4b':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:54:18 +0000 (17:54 -0700)]
am
999ddae7: am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
999ddae70360fc99e804d0b176af487582cd37c8':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:51:15 +0000 (17:51 -0700)]
am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
ae24c0d539414805a6c979f9318d0765506221ae':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:48:20 +0000 (17:48 -0700)]
am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
bf15c7cecefba8fdb3070c389a4966f11a8d8656':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:44:27 +0000 (17:44 -0700)]
am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
dceda36b0052aca7a93a265ea6eb8e8fb71cd322':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:42:45 +0000 (17:42 -0700)]
am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
1c5e33d37dd4f8c68ccc16758e21572f193a8eb2':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:36:42 +0000 (17:36 -0700)]
am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
3bc3240ffb51358fa706099cfc5e120cf0f1b60d':
Use hostname verifier directly instead of instance
John Spurlock [Wed, 14 Aug 2013 00:02:46 +0000 (20:02 -0400)]
Delay transient navigation confirmation prompt.
Ensure the nav bar is hidden, then wait about the same amount
of time before showing the prompt.
Bug:
10312565
Change-Id: Ifbbbc55edf2e40844296e3e96fcc5b491f1b246f
Kenny Root [Wed, 14 Aug 2013 00:31:32 +0000 (17:31 -0700)]
am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
a6226a2d202619ddb7e3e9765a3dc9f20241f853':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:27:49 +0000 (17:27 -0700)]
am
32c99004: Use hostname verifier directly instead of instance
* commit '
32c990044f027542a034a7606cf010dca6df252f':
Use hostname verifier directly instead of instance
Tom O'Neill [Wed, 14 Aug 2013 00:18:16 +0000 (00:18 +0000)]
Merge "API for location settings injection" into klp-dev
Igor Murashkin [Tue, 13 Aug 2013 23:33:18 +0000 (23:33 +0000)]
Merge "camera2: Clear up docs for CameraDevice#configureOutputs" into klp-dev
David Christie [Wed, 14 Aug 2013 00:10:36 +0000 (00:10 +0000)]
Merge "Don't allow airplane mode to affect location status icon. Gps still operates when airplane mode is on, and consumes just as much power so the icon shouldn't be hidden." into klp-dev
David Christie [Wed, 14 Aug 2013 00:07:58 +0000 (00:07 +0000)]
Merge "Update location AppOp monitoring to respect settings. If a provider is disabled, we don't mark an app as actively using location just because it's requested that provider. Also updates the concept of high power to support third party custom providers (doesn't hard code gps but looks at the provider's actual stated power requirement)." into klp-dev
Alan Viverette [Tue, 13 Aug 2013 23:57:28 +0000 (16:57 -0700)]
Prevent refocus after entering touch mode
BUG:
10210009
Change-Id: I9a5d7016728cc7d1fb1c759708b6df41c81865bb
destradaa [Tue, 13 Aug 2013 23:56:31 +0000 (23:56 +0000)]
Merge "Add support in the platform for Flp Geofencing." into klp-dev
Robert Greenwalt [Tue, 13 Aug 2013 23:22:52 +0000 (23:22 +0000)]
Merge "Add support for batched wifi scans." into klp-dev
David Christie [Tue, 13 Aug 2013 23:14:10 +0000 (16:14 -0700)]
Don't allow airplane mode to affect location status icon.
Gps still operates when airplane mode is on, and consumes
just as much power so the icon shouldn't be hidden.
Change-Id: I10edc8771d3dd1831e94d26c6f61ca82d805cc12
David Christie [Tue, 13 Aug 2013 22:54:32 +0000 (15:54 -0700)]
Update location AppOp monitoring to respect settings.
If a provider is disabled, we don't mark an app as
actively using location just because it's requested
that provider. Also updates the concept of high
power to support third party custom providers
(doesn't hard code gps but looks at the provider's
actual stated power requirement).
Change-Id: Ie01243bf04d7301962ea9cdb25fb7d8d97566e02
destradaa [Tue, 13 Aug 2013 01:50:30 +0000 (18:50 -0700)]
Add support in the platform for Flp Geofencing.
Change-Id: I0fb0e276d3a06322697bb5d46323779aca1f78c5
Wink Saville [Tue, 13 Aug 2013 22:57:54 +0000 (22:57 +0000)]
Merge "In isMobileOk don't execute finally if mobile data is not supported." into klp-dev
John Spurlock [Tue, 13 Aug 2013 22:35:57 +0000 (22:35 +0000)]
Merge "Sysui flag-related doc fixes." into klp-dev
Adam Skory [Tue, 13 Aug 2013 22:30:51 +0000 (22:30 +0000)]
Merge "Fix NPE in ActivityManagerService" into klp-dev
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
Use hostname verifier directly instead of instance DO NOT MERGE
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit
928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug:
9984058
Change-Id: I79d8a934bfc390e4cd503fd592e21bc4e5446a7d
Kenny Root [Tue, 13 Aug 2013 21:51:52 +0000 (14:51 -0700)]
am
1adbf6b9: (-s ours) am
61768c97: am
3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '
1adbf6b900a621675cd1928307bb88bb2c6501e5':
Use hostname verifier directly instead of instance DO NOT MERGE
Scott Main [Tue, 13 Aug 2013 21:51:31 +0000 (14:51 -0700)]
am
9b979448: am
261e00cb: am
b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit '
9b979448581311f27456c1dcb9623a8d21bcf64f':
Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
Tom O'Neill [Tue, 13 Aug 2013 21:41:22 +0000 (14:41 -0700)]
API for location settings injection
- Partial fix for b/
10287745
Change-Id: Ie998ce0a7b350e4183fce5753bfac3eb51238ff4
Igor Murashkin [Fri, 9 Aug 2013 23:26:14 +0000 (16:26 -0700)]
camera2: Clear up docs for CameraDevice#configureOutputs
Change-Id: Id2397ca17c5968cb4dfdb337ea56be9d5f481669
Robert Greenwalt [Fri, 2 Aug 2013 01:24:13 +0000 (18:24 -0700)]
Add support for batched wifi scans.
bug:
9301872
Change-Id: I5a7edfdbd2b78a65119d11acad491eae350c0870
John Spurlock [Tue, 13 Aug 2013 21:21:09 +0000 (17:21 -0400)]
Sysui flag-related doc fixes.
Add new flags to existing flag listings, fix a broken @link, and
tweak wording.
Change-Id: Iebc4f5fc1c6fc3f8685c6252f88d8044fe08b79d
Adam Skory [Tue, 13 Aug 2013 20:32:31 +0000 (13:32 -0700)]
Fix NPE in ActivityManagerService
Bug:
10294281
Change-Id: Iaf608ae099b90fac8ad726285652b5c3e74e1632
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit
928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug:
9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
Fabrice Di Meglio [Tue, 13 Aug 2013 20:13:46 +0000 (20:13 +0000)]
Merge "Code cleaning for Drawables" into klp-dev
Wink Saville [Tue, 13 Aug 2013 19:41:06 +0000 (12:41 -0700)]
In isMobileOk don't execute finally if mobile data is not supported.
Move the early return outside the try {} finally so we don't call
setEnableFailFastMobileData(DctContants.DISABLED). Otherwise
referencing counting is wrong and an exception is thrown in DcTrackerBase.
Bug:
10304904
Change-Id: I5ba5121e473bada9f3daa8d6f3d3577cec8212fc
Craig Mautner [Tue, 13 Aug 2013 19:38:01 +0000 (19:38 +0000)]
Merge "Fix Configuration layout direction comparison." into klp-dev
Eino-Ville Talvala [Thu, 8 Aug 2013 19:38:36 +0000 (12:38 -0700)]
Camera2: Add metadata keys and enum values
- Insert metadata enum ints into CameraMetadata
- Insert metadata Keys into relevant files
- Remove some dead code in CameraMetadata
Generated from /system/media/camera/docs.
Change-Id: I3d864ad8c7add5f35ca740860cb2883d54a0791e
Kenny Root [Tue, 13 Aug 2013 18:44:05 +0000 (11:44 -0700)]
am
61768c97: am
3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '
61768c97d6e066d633afe61a790a24473f59572c':
Use hostname verifier directly instead of instance DO NOT MERGE
Kenny Root [Tue, 13 Aug 2013 18:41:11 +0000 (11:41 -0700)]
am
3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '
3870c570bbd438cefd09a061b9481314a15dd659':
Use hostname verifier directly instead of instance DO NOT MERGE
Scott Main [Tue, 13 Aug 2013 18:00:49 +0000 (11:00 -0700)]
am
261e00cb: am
b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit '
261e00cb046db01b2bae9342f34ff99e99ada368':
Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.