Jinsuk Kim
7f01f8e76f
Register HdmiControlService
...
Register the new service that will replace HdmiCecService.
The old one will be removed once the client of the old service
finishes migration to the new service.
Change-Id: I3906292fcf0a7c8286bc89af21a03bd11d3a0e72
2014-05-29 17:10:39 +09:00
Elliott Hughes
9149c7abb2
am a487fb77: am df0e9ed5: am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
...
* commit 'a487fb77dff1a86fbd160694de41e32b74f10cb1':
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 22:18:03 +00:00
Mike Lockwood
3378717241
Merge "Add Audio Manager support for Bluetooth A2DP Sink profile"
2014-05-28 21:54:11 +00:00
Elliott Hughes
a487fb77df
am df0e9ed5: am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
...
* commit 'df0e9ed5536e2cab860f3ecf9dab0030a471766e':
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 21:48:46 +00:00
Elliott Hughes
df0e9ed553
am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
...
* commit '862be91276ec9532b3ed00d43fc7a750f1e6adb0':
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 21:41:30 +00:00
Brigid Smith
461ac24b8c
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
...
Bug: 15116468
Change-Id: I6aef941c6b6bd59347855f7265e701a3aaa08edc
2014-05-28 14:21:06 -07:00
Eino-Ville Talvala
5b02e9f65f
am a4aad3d0: Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev
...
* commit 'a4aad3d0e5c258d6bbf6254ec5ab80a470b1b529':
camera2: Update native/managed key mappings.
Camera2: switch API interface to java classses
Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
camera2: Add new metadata keys, change types for existing range keys
Camera2: Replace int[] by MeteringRectangle
2014-05-28 20:35:58 +00:00
Eino-Ville Talvala
b9a65de1f7
Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev
...
* changes:
camera2: Update native/managed key mappings.
Camera2: switch API interface to java classses
Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
camera2: Add new metadata keys, change types for existing range keys
Camera2: Replace int[] by MeteringRectangle
2014-05-28 20:33:42 +00:00
Mike Lockwood
0a40ec2192
Add Audio Manager support for Bluetooth A2DP Sink profile
...
Change-Id: Iff6035e85faf52647cc41a59f98ba2924300eb8d
2014-05-28 13:32:08 -07:00
John Reck
c93ee799ee
am 94e5ee1c: Merge "Disable RT animations" into lmp-preview-dev
...
* commit '94e5ee1c3b2c5f70a5e687a77dcc2c93db50b062':
Disable RT animations
2014-05-28 19:41:02 +00:00
John Reck
10d1b4d0b7
Merge "Disable RT animations" into lmp-preview-dev
2014-05-28 19:38:06 +00:00
John Reck
4645ab81b7
Disable RT animations
...
Bug: 15287046
Change-Id: Ib511053726153649ea1bda337d14bc05db4f0bf9
2014-05-28 12:35:30 -07:00
Christopher Tate
560ce61c59
Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-preview-dev
2014-05-28 19:03:03 +00:00
Dan Stoza
00f535845b
Merge "SurfaceFlinger: Add sourceCrop to screenshot"
2014-05-28 18:31:38 +00:00
Paul Jensen
a46d3e1158
Merge "Adjust Network's SocketFactory to restrict host name resolution to that Network"
2014-05-28 18:26:29 +00:00
Griff Hazen
8c2a828849
am c15d315a: am a9cb1e66: Add full screen size preset to WearableExtender
...
* commit 'c15d315aeb2c23895e940560784bd51f7962b702':
Add full screen size preset to WearableExtender
2014-05-28 17:44:11 +00:00
Ruben Brunk
574936894d
camera2: Update native/managed key mappings.
...
Switches to using managed value classes for the following keys:
- android.sensor.info.sensitivityRange
- android.sensor.info.exposureTimeRange
- android.jpeg.gpsCoordinates
- android.jpeg.gpsTimestamp
- android.jpeg.gpsProcessingMethod
- android.statistics.lensShadingMap
- android.lens.info.shadingMapSize
Also fixes a minor bug in LensShadingMap
Bug: 14628001
Change-Id: Ia0f541242f529ab9ba3111db799306b198f2b40b
2014-05-28 10:26:21 -07:00
Amith Yamasani
d5ba868b0d
Merge "Fix singleUser attribute"
2014-05-28 16:42:42 +00:00
Amith Yamasani
4b9d79c30e
Fix singleUser attribute
...
Make it work correctly for singleton content providers.
Relax which apps can export singleton content providers.
Change-Id: I43d315c25ed76a876bfa6d5e0d1351bc19c9bdba
2014-05-28 09:39:36 -07:00
John Reck
81d29b5f0c
am 2d196d9f: Merge "Implement FlushCaches TODO" into lmp-preview-dev
...
* commit '2d196d9f9d4978fd0df80815e15012518be5ff18':
Implement FlushCaches TODO
2014-05-28 16:05:06 +00:00
John Reck
45d0192929
Merge "Implement FlushCaches TODO" into lmp-preview-dev
2014-05-28 16:02:06 +00:00
Griff Hazen
10f6de686e
Merge "DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtender" into lmp-preview-dev
2014-05-28 15:59:14 +00:00
George Mount
854ed1c4e2
am 27d805ea: Merge "Use activity transitions when launched from fragments." into lmp-preview-dev
...
* commit '27d805ea6fb5aa3dbe46d4f8af86c46bce523760':
Use activity transitions when launched from fragments.
2014-05-28 14:42:01 +00:00
George Mount
1cc3e2e7a0
Merge "Use activity transitions when launched from fragments." into lmp-preview-dev
2014-05-28 14:37:34 +00:00
George Mount
f0ebc5dc21
Merge "fixed mIsReturning initialized too late. DO NOT MERGE." into lmp-preview-dev
2014-05-28 14:37:19 +00:00
Sungsoo Lim
e0a88629e1
am 5e73be4a: Merge "Fix a typo" into lmp-preview-dev
...
* commit '5e73be4affbf84a4935ac310b8323bfc944caa7e':
Fix a typo
2014-05-28 10:09:40 +00:00
Sungsoo Lim
d3ee3ca90c
Merge "Fix a typo" into lmp-preview-dev
2014-05-28 09:37:29 +00:00
Jinsuk Kim
b0674f0f7c
Fix a couple of bugs in CEC services
...
- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable
Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
2014-05-28 09:30:39 +00:00
Yin-Chia Yeh
8490ace76f
Camera2: switch API interface to java classses
...
android.sensor.info.physicalSize: float[] -> SizeF
android.statistics.hotPixelMap: int[] -> Point[]
android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve
Bug: 14628001
Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
2014-05-28 01:36:54 -07:00
Eino-Ville Talvala
2bb91a7a68
Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
...
Also fix a minor bug in ColorSpaceTransform copying validation.
Affected keys:
android.colorCorrection.transform
android.colorCorrection.gain
android.control.aeAvailableAntibandingModes
android.control.aeAvailableModes
android.control.afAvailableModes
android.control.availableEffects
android.control.availableSceneModes
android.control.availableVideoStabilizationModes
android.control.awbAvailableModes
android.edge.availableEdgeModes
android.hotpixel.availableHotPixelModes
android.lens.info.availableOpticalStabilization
android.noiseReduction.availableNoiseReductionModes
android.sensor.calibrationTransform1
android.sensor.calibrationTransform2
android.sensor.colorTransform1
android.sensor.colorTransform2
android.sensor.forwardTransform1
android.sensor.forwardTransform2
android.statistics.info.availableFaceDetectModes
android.tonemap.availableToneMapModes
Bug: 14628001
Change-Id: Ic0a3ff0aaa6bfe872cf8fb740870618c3eee3008
2014-05-28 01:36:53 -07:00
Igor Murashkin
78712a8bd7
camera2: Add new metadata keys, change types for existing range keys
...
Also adds the following keys:
* android.control.maxRegionsAe
* android.control.maxRegionsAwb
* android.control.maxRegionsAf
* android.request.maxNumOutputRaw
* android.request.maxNumOutputProc
* android.request.maxNumOutputProcStalling
Changes the following keys' type
generations:
* android.control.aeTargetFpsRange
* (Range<Integer>)
* android.control.aeAvailableTargetFpsRanges
* (Range<Integer>[])
* android.control.aeCompensationRange
* (Range<Integer>)
* android.lens.focusRange
* (Range<Float>)
Bug: 14628001
Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
2014-05-28 01:36:53 -07:00
Yin-Chia Yeh
817f8933ee
Camera2: Replace int[] by MeteringRectangle
...
Bug: 14628001
Change-Id: I8ae4efa24d41043046a84b04e5209259a8a21063
2014-05-28 01:36:53 -07:00
Lorenzo Colitti
af878b4e3c
Merge "Support disconnecting while trying to connect."
2014-05-28 07:40:50 +00:00
Lorenzo Colitti
9a6a11ae1e
Support disconnecting while trying to connect.
...
Currently, once a NetworkAgent has decided to connect, there's
no way to disconnect without first connecting and having
ConnectivityService tear down the connection. This is suboptimal
because it causes the transport to keep retrying even if it knows
that it will not be able to connect.
Instead, allow the transport to abort a connection request that's
in progress, as long as the agent is not yet registered with
ConnectivityService.
Also add locking to evalScores. evalScores should already have
been taking a lock, because it accesses member variables that are
also accessed by the send*methods.
Bug: 15295359
Change-Id: I913c341bdfc50be9c23b632399f53168e754c1c0
2014-05-28 07:35:24 +00:00
Sungsoo Lim
a2c901d430
Fix a typo
...
Change-Id: I93e7e38a2e3502883b64c38567eaf5957c4197d2
2014-05-28 16:34:21 +09:00
Matthew Williams
bc132a068b
Merge "Implementation of TaskManager reschedule/cancel"
2014-05-28 02:52:00 +00:00
Matthew Williams
b61c506a50
Implementation of TaskManager reschedule/cancel
...
Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.
Implemented all API functions
Change-Id: I0264c2614cc52c28730abbcb1557f314f058f991
2014-05-27 18:36:54 -07:00
Griff Hazen
d5f11f98d1
DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtender
...
Bug: 14838838
Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
2014-05-27 17:36:44 -07:00
Griff Hazen
14f5799ba9
DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender
...
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
2014-05-27 17:34:27 -07:00
Griff Hazen
e6fff6e088
Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev
2014-05-28 00:31:46 +00:00
Griff Hazen
c15d315aeb
am a9cb1e66: Add full screen size preset to WearableExtender
...
* commit 'a9cb1e66737f816d643bca03832af719cbdd0f20':
Add full screen size preset to WearableExtender
2014-05-28 00:18:03 +00:00
Chris Craik
f87ec6a644
am 365dfe93: Merge "Update docs around empty/null outline behavior" into lmp-preview-dev
...
* commit '365dfe93dd3baab1417e20bc9ba7e3175600faa0':
Update docs around empty/null outline behavior
2014-05-28 00:13:31 +00:00
Chris Craik
ddce68996b
Merge "Update docs around empty/null outline behavior" into lmp-preview-dev
2014-05-28 00:08:58 +00:00
Igor Murashkin
5fe5bcaeaa
am dc0230fc: Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev
...
* commit 'dc0230fc450e8880fb640cd476f2248bf0a401e4':
camera2: Add partial results to the capture listener (API change)
2014-05-27 23:57:36 +00:00
Igor Murashkin
79458826c6
Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev
2014-05-27 23:54:21 +00:00
Griff Hazen
69170a56c6
am be5898b1: am 6f72ac5d: Doc fixes for Notification.WearableExtender
...
* commit 'be5898b198a9eee2d21eeff345ed19573d37257a':
Doc fixes for Notification.WearableExtender
2014-05-27 22:47:27 +00:00
Griff Hazen
be5898b198
am 6f72ac5d: Doc fixes for Notification.WearableExtender
...
* commit '6f72ac5d5f4b7bae34bb3dab7821f3dbcbf02bcd':
Doc fixes for Notification.WearableExtender
2014-05-27 22:44:28 +00:00
Griff Hazen
a9cb1e6673
Add full screen size preset to WearableExtender
...
For custom display notifications.
Bug: 14838838
Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
2014-05-27 15:40:09 -07:00
Dave Langemak
dab839e047
Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev
2014-05-27 21:26:52 +00:00
Chris Craik
67c360f3d5
Update docs around empty/null outline behavior
...
bug:15257846
Change-Id: Ie4d1b0aaeb900eaaa7e54097f3e0d795beb8f445
2014-05-27 14:10:17 -07:00