Commit Graph

39100 Commits

Author SHA1 Message Date
Igor Murashkin
ffdfcd7f27 Merge "camera2: legacy: Don't set the @hide frame number metadata" into lmp-dev 2014-07-25 21:16:23 +00:00
Igor Murashkin
56678d8778 camera2: legacy: Don't set the @hide frame number metadata
Change-Id: Id1c8292444a45a97228d5c95f23f6d1f8171d3b5
2014-07-29 15:14:57 -07:00
Igor Murashkin
bdf366cc70 camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)
Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc
2014-07-29 15:09:45 -07:00
Igor Murashkin
3676164462 Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev 2014-07-29 21:36:00 +00:00
Igor Murashkin
3a3eb15741 camera2: legacy: fix cached results bug and fix focus modes
- Also add request.frameCounter and request.pipelineDepth results

Change-Id: I104c8243fa525622cb4ab7b5535cbca8588862f3
2014-07-29 14:23:27 -07:00
Igor Murashkin
83d8639e90 camera2: legacy: Add focus support
* Characteristics will list control.availableAfModes
* Request/result for control.afMode and control.afState

(Does not yet support control.afRegions)

Change-Id: I828111425fa587114d5159f7fb2b1e53a2c74e61
2014-07-29 14:20:41 -07:00
Igor Murashkin
3f2757a305 Merge changes I104c8243,I82811142 into lmp-dev
* changes:
  camera2: legacy: fix cached results bug and fix focus modes
  camera2: legacy: Add focus support
2014-07-25 21:16:23 +00:00
George Mount
7299bc1305 Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 2014-07-25 21:16:23 +00:00
George Mount
807e40c55c Allow a "ghost view" that paint a different view from the overlay.
Bug 15744995

The ghost view doesn't route touch events, but hides another
view in its normal parent, and paints it as a child of another
ViewGroup or ViewGroupOverlay.

Change-Id: I352e14c366ccfb7303cee1dbff8563c673fd12ff
2014-07-29 07:27:52 -07:00
Prerepa Viswanadham
f6b3d8ca36 Fix crash in Stopping/Starting BLE advertising after
BluetoothAdapter cycling

Bug 16528460
Change-Id: Iad852bc93d307c5ca5f7e42f24248aa02c105e8a
2014-07-29 21:06:29 +00:00
George Mount
964c3cf5b2 Add default propagation back to Explode.
Bug 16217557

Change-Id: I47460db128749af978077755a777068392492aee
2014-07-29 14:13:00 +00:00
Jon Miranda
0615026ba1 Merge "Exposed getLocationOnScreen, added formatToHexString method." into lmp-dev 2014-07-24 15:36:21 +00:00
Michael Wright
9469cdde2c Add paragraph tags to MediaProjection docs
Change-Id: Ia881f9bcf3b93bd699f9ddf80d51ec7d0e74d2ed
2014-07-29 20:46:40 +00:00
Jon Miranda
4597e98069 Exposed getLocationOnScreen, added formatToHexString method.
In order to use the ExportedProperty annotation, I needed a public non-void
method which is why I created a new "public int[] getLocationOnScreen()."

The formatToHexString method is used to convert an int or byte to a hex string
prefixed with "0x". I set the value to true on these flags: mGravity,
mPrivateFlags, mSystemUiVisibility, mViewFlags, mGroupFlags, mMarginFlags,
and flags.

Change-Id: I5914992ba19b80643dfcc6caa487398452e18cbc
2014-07-29 07:25:49 -07:00
Adrian Roos
489d2dfc29 Fix checkbuild
Change-Id: I9c3de31af792863b93a29ef81b50e2149b0a2184
2014-07-29 20:30:50 +00:00
Alan Viverette
4d193bdbe7 Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 2014-07-28 22:45:16 +00:00
Alan Viverette
60727e07c6 Clean up TimePicker and DatePicker styling
Removes the time and date picker specific themes and defaults their
theme attributes to use the alert dialog theme attribute's value.

BUG: 14973897
Change-Id: Id5cc74ea0c1a379fc1ee76b354a1bb5ba329585a
2014-07-29 12:49:50 -07:00
Dake Gu
09d9c3be8a Transition: Don't suppressLayout(false) for returning activity
Change-Id: I7be8a779ab8996809b36baa107acd55ab872580c
2014-07-29 11:34:35 -07:00
Alan Viverette
57b69dd27e Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 2014-07-28 18:28:56 +00:00
Alan Viverette
500c56089f Partial revert "Add better errors for unresolved attributes, remove unused code"
This reverts commit 0e42f4b98752b6457b04887e2a557fa007da73d7.

Change-Id: Ic3f0cb709c7aaa0a9892d728311886714ba73f22
2014-07-29 11:30:35 -07:00
Sandeep Siddhartha
6817337118 Read the keyphrase ID from the recognition event
Bug: 16516658
Change-Id: Ibeee81c9543aa1091bb075066cfc2269107f13c0
2014-07-29 11:24:51 -07:00
Matthew Williams
ee410da42b remove possible JobScheduler race in cancel()
Client can jobFinished() before getting a cancel msg.
1) Do better clean up of JobServiceContext after client jobFinished()
to remove superfluous MSG_CANCELs
2) When processing MSG_CANCEL check whether the context is still active
3) Do JobServiceContext cleanup before calling back to JobSchedulerService
Client can get a cancel msg even after calling jobFinished() (opposite to above)
1) explicitly check whether there are any MSG_CALLBACKs in the queue before
processing a MSG_CANCEL. If there are we can throw away the cancel.

Bug: 16547638
Change-Id: I90644586c7895a9ce97de752a5d657faf7f74b78
2014-07-29 11:11:41 -07:00
Jason Monk
9a090e6ded Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev 2014-07-25 23:00:08 +00:00
Jason Monk
8863b57e89 Fix incorrect Activity#startLockTask doc
It referenced a swipe down gesture that doesn't exist.  This should
be more safe, and cover other devices as well.

Bug: 16626273
Change-Id: I907b25a00d903f9f36ca335d3a75c1f8f931d50e
2014-07-29 13:49:32 -04:00
Alan Viverette
216d3e6d81 Add better errors for unresolved attributes, remove unused code
Change-Id: Icf81a81b9ce97b5a5edff85569e6e3da93149436
2014-07-29 10:35:42 -07:00
Adrian Roos
1cc41c938c Merge "Make TrustAgentService a SystemApi" into lmp-dev 2014-07-24 15:36:04 +00:00
Adrian Roos
a06d5ca1d9 Make TrustAgentService a SystemApi
Bug: 16401527
Change-Id: I6d19281600bacac7c8a29afc07c39ca1d461d23c
2014-07-29 12:54:49 +02:00
Jim Miller
604e7558ef Add new DevicePolicyManager API to allow fine-grained TrustAgent management
This adds a new feature that allows a device admin to specify a
whitelist of features that are allowed for the given admin.

Change-Id: I83f853318efbcf72308532d0a997374f73fa9c10
2014-07-28 21:32:01 -07:00
John Spurlock
2b0e09c59f Settings: Constants for notification settings.
Bug:16208321
Change-Id: Iaf18dfc2edda9d80553f02ea0a74236230f89079
2014-07-28 20:43:47 -04:00
Sreeram Ramachandran
f4e0c0cb8e Allow VPNs to add/remove link addresses dynamically.
Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
2014-07-29 00:32:59 +00:00
Riley Andrews
4789e41a9f Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation." into lmp-dev 2014-07-24 15:37:54 +00:00
Riley Andrews
68eccdade2 Add cursor flags into SpriteController to suppor async cursor updates.
- This is fairly blindly taken from nvidia's implementation.

Change-Id: I825ecbd9cb4b394793dce079591b37efca546bbe
2014-07-28 22:04:06 +00:00
Christopher Tate
c17739d112 Provide outside-facing API for data management intent+label
Bug 16346320

Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
2014-07-28 23:13:06 +00:00
Jinsuk Kim
cfcdf12701 Merge "Add MHL getPortInfo" into lmp-dev 2014-07-24 16:04:26 +00:00
Jinsuk Kim
f4eb72d53b Add MHL getPortInfo
Allows MHL support flag to be put into port information

Bug: 16215362
Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
2014-07-28 06:57:04 +09:00
Michael Wright
5438e4e173 Add missing documentation for createVirtualDisplay
Fix incorrect access modifier in Activity documentation.

Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
2014-07-25 23:01:32 +00:00
Ruben Brunk
971251f362 camera2: Update preview counter after request completed.
Bug: 15116722

- This was causing the preview counter to double decrement
  for requests where the jpeg callback was executed first.

Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
2014-07-25 22:53:32 +00:00
Christopher Tate
9679410db5 Add data-management intent + label to BackupTransport API
Bug 16346320

Change-Id: Id9e855a1d3cebbf801c27a21e1edc3ffcccfd2e9
2014-07-28 21:33:15 +00:00
Craig Mautner
22132d7950 Make affiliatedTaskId public and unhidden.
Allow apps to see which of their tasks are affiliated in the
RecentTaskInfo returned by getAppTasks().

Fixes bug 16546323.

Change-Id: I54d75c02c194f58fb6513fa91c312289460f56b4
2014-07-28 21:10:16 +00:00
George Mount
a7dc1702af Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-dev 2014-07-28 18:28:56 +00:00
Selim Gurun
d92e726cbe Merge "Revert "Load the WebView Java code from an APK." DO NOT MERGE" into lmp-dev 2014-07-28 18:28:56 +00:00
Ben Murdoch
64fb02956b Revert "Load the WebView Java code from an APK." DO NOT MERGE
This reverts commit 72618c3363c83f2668dab4495b100a61d6d8700a.

Bug: 16448724
2014-07-28 21:07:24 +01:00
George Mount
2cacfe3a98 Allow changing bounds to and from a zero-sized bounds.
Bug 14590183

Change-Id: I596cb384198a6f7de14afed0d78711f127d3511e
2014-07-28 14:54:23 +00:00
Eino-Ville Talvala
bd9b106806 Camera2: CameraManager refurbishing and error management
- Invoke availability listeners when first added
- Handle camera service crashes
 - Listen to service death
 - Attempt to rebind on every call if service died
 - If service is still dead, act as if no cameras are connected
- Fix bug in DeviceImpl that prevented proper handling of errors on open
- For clarity, don't UncheckedThrow for exceptions that are already unchecked

Bug: 16514157
Bug: 16483815
Bug: 16483222
Bug: 16561237

Change-Id: I3d54de1204f5a863882cf675fcee6280d53c4039
2014-07-28 20:21:12 +00:00
Bo Liu
c15fbba494 Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 2014-07-28 18:28:56 +00:00
Robert Greenwalt
39ca3f5f69 Merge "Remove dead code 1." into lmp-dev 2014-07-24 20:48:02 +00:00
Sreeram Ramachandran
42065ac64c Prohibit address families by default unless a VPN explicitly allows them.
Bug: 15972465
Change-Id: I3278d94536fefacc86390c1ba4231680f7be8589
2014-07-28 18:52:41 +00:00
Robert Greenwalt
39fa65a3be Remove dead code 1.
Starting with startUsingNetworkFeature and stop.
Figure it's easier to code review incremental changes.

Change-Id: I19aee65e740858c3a9a2a1a785663f6fee094334
2014-07-28 11:34:36 -07:00
Sandeep Siddhartha
39c12fab49 Use blob (shared memory) for large data in sound model/recognition event/config
Also add a missing null check in writeBlob

Bug: 16516353
Change-Id: Ie702f8daae541cab7c2cee6e13d49e7fc84c84e1
2014-07-28 11:10:32 -07:00
Alexandra Gherghina
a71e3903e5 Return a default icon from the package manager directly
Bug: 16369104
Change-Id: I2db300a69a08030eacc245ee91556f0443ba5878
2014-07-28 17:30:56 +00:00