Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,778 Commits 3 Branches 0 Tags
8391e03b7ef20f22ffc31da43e01b2fb8d1ec00a
Commit Graph

1327 Commits

Author SHA1 Message Date
Andreas Gampe
9568772acb Merge "Frameworks/base: Fix format string in Geofence" 2015-03-17 21:30:49 +00:00
Andreas Gampe
1414a6291d Frameworks/base: Fix format string in Geofence 
%p is not a valid conversion in format strings. It is also superfluous,
as it is already known that location is null.

Bug: 19797138
Change-Id: I5784e28b05b4ca9aac57e0fc9da4a7f01d9b3247
 2015-03-17 21:30:20 +00:00
Andreas Gampe
aae42eb261 Merge "Frameworks/base: Fix format string in Camera" 2015-03-17 20:52:21 +00:00
Andreas Gampe
02ffb2aad9 Frameworks/base: Fix format string in Camera 
One cannot print a boolean with %d. That will result in an exception.

Bug: 19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
 2015-03-17 20:51:38 +00:00
Andreas Gampe
63662320ae Frameworks/base: Force long computation 
Ensure that an int-based computation is carried out as long.

Change-Id: I23b10a95600674e8a5a65c0ea349afdc6aa152ae
 2015-03-15 20:17:07 -07:00
Ruben Brunk
ff475c0ea7 Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 
automerge: 41af9d5

* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:36:13 +00:00
Ruben Brunk
259f3d90b8 camera2: Fix legacy scaling factor application. 
Bug: 19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
 2015-02-12 13:27:26 -08:00
Alex Klyubin
33d3c53da0 resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp 
Change-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a
 2015-02-11 12:37:12 -08:00
Alex Klyubin
b9f8a5204a Move hidden ApplicationInfo flags into a separate field. 
The public API field android.content.pm.ApplicationInfo.flags can
support only 32 flags. This limit has been reached. As a short term
workaround to enable new public flags to be added, this CL moves flags
which are not public API into a separate new field privateFlags and
renames the affected flags constants accordingly (e.g., FLAG_PRIVILEGED
is now PRIVATE_FLAG_PRIVILEGED).

The new privateFlags field is not public API and should not be used
for flags that are public API.

The flags that are moved out of ApplicationInfo.flags are:
* FLAG_HIDDEN,
* FLAG_CANT_SAVE_STATE,
* FLAG_FORWARD_LOCK, and
* FLAG_PRIVILEGED.

NOTE: This changes the format of packages.xml. Prior to this CL flags
were stored in the "flags" attribute. With this CL, the public flags
are stored in a new "publicFlags" attribute and private flags are
stored in a new "privateFlags" attribute. The old "flags" attribute
is interpreted by using the old values of hidden/private flags.

Change-Id: Ie23eb8ddd5129de3c6e008c5261b639e22182ee5
 2015-02-11 11:06:40 -08:00
Nick Vaccaro
5ff571155f am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev 
* commit 'd0d13d822cdec4fa7214d1495137064c28ecc07e':
  Update API to contain new wrist tilt sensor type and string.
 2015-02-11 00:20:52 +00:00
Nick Vaccaro
f5021f6818 Update API to contain new wrist tilt sensor type and string. 
Convert the wrist tilt sensor from being a vendor-defined sensor
type to being an official android sensor type.

Change-Id: I39807bdca4f4c853fa0f7e88e6d98c02245f2a8b
 2015-02-10 20:43:44 +00:00
Zhijun He
0b039b0315 am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b 
* commit '9f8e82ed968115d14a564397c6b316af3ba42caf':
  camera-metadata: clarify the AE precapture trigger spec
 2015-02-08 21:23:05 +00:00
Zhijun He
dd72be5971 camera-metadata: clarify the AE precapture trigger spec 
Doc only change.

Bug: 19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
 2015-02-06 17:51:34 -08:00
Ruben Brunk
78ee980738 am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 
automerge: 2a11473

* commit '2a114737c636e69a65478778c6edb24c2266518e':
  camera2: Make legacy error handling more robust.
 2015-02-05 23:07:13 +00:00
Ruben Brunk
cd0d7cdefe Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 2015-02-05 19:54:37 +00:00
Zhijun He
1350671f40 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
automerge: 6bafb86

* commit '6bafb866554a7dea0844438c27a7caea0aab83f2':
  Camera2: relax the EV compensation requirements
 2015-02-05 03:44:01 +00:00
Ruben Brunk
e3c0434d97 camera2: Make legacy error handling more robust. 
- Relax internal timeout for JPEG captures in LEGACY mode.
- Make RequestThreadManager.quit() idempotent to avoid queuing
  messages on a dead thread's handler.
- Catch RuntimeExceptions from other Camera1 API methods to
  allow proper cleanup + release of Camera1 API client.

Bug: 19255187
Change-Id: I6cb08bb6b832b0d0df6ee6e8983c35de2df4a408
 2015-02-04 17:26:17 -08:00
Zhijun He
81c8018031 Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 2015-02-05 01:10:29 +00:00
Zhijun He
f1745ce8a8 Camera2: relax the EV compensation requirements 
FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.

Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8
 2015-02-04 13:59:43 -08:00
Lajos Molnar
d8e6a8b764 am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112 
* commit '6999ef348818ec62a931f539c2caa799728b8a90':
  camera2: limit flexYUV array size in DngCreator
 2015-02-03 23:23:11 +00:00
Lajos Molnar
fdb2112bbc camera2: limit flexYUV array size in DngCreator 
corrected overread

Bug: 19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
 2015-02-03 14:57:09 -08:00
Jinsuk Kim
7e79bdb494 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 
* commit 'eb2c4a07a118bb6f41455ffd14f35086298675cd':
  CEC: Do null/empty check against the parameter for checkRecordSource()
 2015-01-29 22:37:01 +00:00
Jinsuk Kim
dbdaea0c6d Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 2015-01-29 22:22:31 +00:00
Jinsuk Kim
c8aaaef20f CEC: Do null/empty check against the parameter for checkRecordSource() 
This prevents out-of-bound exception from occurring.

Bug: 19188370
Change-Id: I051dccf7760cb542ea3dc9b0adc9625fa2ad8b1f
 2015-01-29 16:28:37 +09:00
Eino-Ville Talvala
745d45e0c0 am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21 
* commit '06b1014cf28431706d42219549170896bd581a29':
  Camera2 legacy: Do not advertise NV21 support.
 2015-01-28 23:29:23 +00:00
Eino-Ville Talvala
ccf6e88eec Camera2 legacy: Do not advertise NV21 support. 
Also reduce logging somewhat for common scenarios.

Bug: 19161738
Change-Id: If96ed7d2bac0229159564072d7969d7bea3fae27
 2015-01-28 12:57:56 -08:00
Jinsuk Kim
55055d690e am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 
automerge: 9ae7d49

* commit '9ae7d4975ce471a7b295282ca999cb20a6cbb273':
  CEC: Add logic to return to internal source
 2015-01-23 07:00:40 +00:00
Jinsuk Kim
76cf035513 Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 2015-01-23 06:51:58 +00:00
Eino-Ville Talvala
92baed1212 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5 
automerge: 0ec0465

* commit '0ec0465542ba41634ed13dd6bae2eca6afa62d4a':
  Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
 2015-01-23 00:31:41 +00:00
Eino-Ville Talvala
7fde5e5ba3 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev 2015-01-23 00:05:26 +00:00
Jinsuk Kim
cb8661c08f CEC: Add logic to return to internal source 
This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.

Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.

Bug: 19008579

Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48
 2015-01-22 16:58:26 +09:00
Eino-Ville Talvala
fa0b9a00b4 Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface) 
Add missing implementation.
Also improve docs for flexible Surface sources.

Bug: 19076351
Change-Id: I1f1126a291480dcb68d3dd90825b5994e54dcc99
 2015-01-21 16:49:59 -08:00
Jinsuk Kim
00959a56e5 am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 
automerge: 375ae7b

* commit '375ae7ba3263ee8eceeb371b170e9181c801c612':
  Mark TimeUnit as @SystemApi
 2015-01-20 23:47:44 +00:00
Jinsuk Kim
28d2a693ef Mark TimeUnit as @SystemApi 
Bug: 18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
 2015-01-21 07:33:40 +09:00
Narayan Kamath
6ed21403e7 am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase" 
* commit 'e02fe5afac0bc792559a4c424ffc8391c501abfe':
  camera2: Clarify the documentation on the ImageReader usecase
 2015-01-07 18:42:57 +00:00
Martin Storsjo
5c533e4fa0 camera2: Clarify the documentation on the ImageReader usecase 
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.

Change-Id: I75261baf162a58c415705db99afa474c3826f900
 2015-01-07 20:10:25 +02:00
Yin-Chia Yeh
641178f94f am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev 
* commit 'c2112a75983cce62ed493ec0feafbb2c27ad76b4':
  Camera: doc update for color aberration modes
 2015-01-07 00:10:51 +00:00
Yin-Chia Yeh
941aac0c07 Camera: doc update for color aberration modes 
Code-gened document update for camera2 spec.

Bug: 18915494
Change-Id: I4b6236415f93739da4562eac81f53d2fd4c10f69
 2015-01-06 18:46:15 +00:00
Jinsuk Kim
fe3cdf015e am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev 
* commit '877919bb182dbd8c87901cb94f318cf5d5408bc8':
  CEC: Let MHL device be of type 'source'
 2015-01-05 07:23:05 +00:00
Jinsuk Kim
e416d0f67b CEC: Let MHL device be of type 'source' 
MHL devices should be of type source that can stream AV contents
to the connected TV. This should be supported by the API
HdmiDeviceInfo.isSourceType().

Bug: 18897172
Change-Id: I7dcbd7773127bf26797c204504a12c3e2ebbd83b
 2015-01-05 16:07:28 +09:00
Ruben Brunk
c7c20b34ec am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 
automerge: 81b381b

* commit '81b381b82e83ec742a8a6541dabbc63dae087c0a':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-12 04:09:55 +00:00
Ruben Brunk
433e715cc0 camera2: Fix LEGACY YUV production and orientation. 
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
 2014-12-11 11:35:46 -08:00
Ruben Brunk
28089cc39b Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 
automerge: 6d98265

* commit '6d9826546d89e03cea170ebb5b3f292d5f4a027b':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-09 23:20:39 +00:00
Ruben Brunk
3ef5033cda Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev 2014-12-09 23:09:52 +00:00
Ruben Brunk
f4a637d0be Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode. 
Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
 2014-12-09 11:56:22 -08:00
Eino-Ville Talvala
b71d983a7f am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev 
* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
  Camera2: Add HDR scene mode for backwards compatibility.
 2014-12-08 19:17:38 +00:00
Zhentao Sun
b97782f2da am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev 
* commit '4f04cb20cc37d7a70c2a50af97cc6fd6d064bb06':
  Fixed a leak in GeofenceHardwareImpl.java.
 2014-12-08 19:09:36 +00:00
Eino-Ville Talvala
f4eac12954 Camera2: Add HDR scene mode for backwards compatibility. 
To maximize backwards compatibility, support the HDR scene mode fully,
as it was supported on Camera HAL1 / Camera API1.

Bug: 18639933
Change-Id: I35c164563379f7f820b42c674bd91f706061170c
 2014-12-05 11:31:08 -08:00
Zhentao Sun
8485098fa2 Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev 2014-12-04 22:52:51 +00:00
Yin-Chia Yeh
e168dd28f8 am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit '871571ae0c4d8f334265b99e274892346756d51b':
  Camera: update antibanding spec
 2014-12-04 20:23:00 +00:00