Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
183,287 Commits 3 Branches 0 Tags
ba67aee02cf864793129976cd8a8a46e60c60577
Commit Graph

1367 Commits

Author SHA1 Message Date
Filip Gruszczynski
cfb3185a27 am 0fbcc708: am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev 
* commit '0fbcc7086fe742e641915ed5f097119d01613cb5':
  Burn in protection.
 2015-02-25 21:47:12 +00:00
Filip Gruszczynski
0fbcc7086f am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev 
* commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178':
  Burn in protection.
 2015-02-25 21:40:38 +00:00
Filip Gruszczynski
d2e8640c2c Burn in protection. 
Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
 2015-02-25 12:22:49 -08:00
Yin-Chia Yeh
dc0ba09515 Camera: codegen doc update 
Codegen doc update only.

Change-Id: I444d59effb957e58b14c363174693cd6c7c84ebd
 2015-02-20 15:52:06 -08:00
Wale Ogunwale
421d6ad191 Merge "Adjust activity display metrics based on stack configuration." 2015-02-15 20:20:08 +00:00
Wale Ogunwale
7c72668f19 Adjust activity display metrics based on stack configuration. 
Apps normally use context.getResources().getDisplayMetrics()
or getWindowManager().getDefaultDisplay() to get information
about the screen dimensions. Not all the screen space is available
for apps in a multi-window environment, so we limit the dimensions
of the display object exposed to the app to that of the containing
stack.

Bug: 19225079
Bug: 19354838
Change-Id: I8dc3a6c9b99ecedcca28fc4ddaba9f31feb4f871
 2015-02-13 21:12:47 -08:00
Ruben Brunk
c61f921b99 am ff475c0e: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 automerge: 41af9d5 
* commit 'ff475c0ea71ffd5f015cce1462daf373129ca896':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:45:27 +00: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
fb7c14c5f9 am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 
* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:33:42 +00:00
Ruben Brunk
259f3d90b8 camera2: Fix legacy scaling factor application. 
Bug: 19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
 2015-02-12 13:27:26 -08:00
destradaa
1ea5736339 Merge "Intern strings used in Sensor information." 2015-02-12 20:30:07 +00:00
Alex Klyubin
05ecfd308d am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp 
* commit '33d3c53da021f0d044028860ace0f4ad817273f5':
  Move hidden ApplicationInfo flags into a separate field.
 2015-02-11 20:47:31 +00: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
668ebe9501 am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev 
automerge: 5ff5711

* commit '5ff571155f0a405d6f7d298c7acaddc84bb8fb26':
  Update API to contain new wrist tilt sensor type and string.
 2015-02-11 00:39:14 +00: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
destradaa
9ba7c1c175 Intern strings used in Sensor information. 
By creating a local 'interning map', Sensor information, such as: name, vendor,
stringType, and requirePermissions; 92 string objects are not needed anymore.
This frees ~6KB of memory in all processes accessing SensorManager.

Change-Id: Idfdc98160363bec844c34fc3b71f5e8d7843a7be
 2015-02-10 15:07:50 -08:00
Ruben Brunk
4b79268cb7 Merge "camera2: Formatting nitpicks." 2015-02-10 21:20:28 +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
Yin-Chia Yeh
7021b7e370 Merge "Camera2: lens shading related HAL3.3 update" 2015-02-10 01:15:56 +00:00
Yin-Chia Yeh
e4aa2831ce Camera2: lens shading related HAL3.3 update 
Codegen doc update.

Change-Id: I0e997b3e6fde7636bef3accdd0f8b7b969d37afa
 2015-02-09 11:33:06 -08:00
Yin-Chia Yeh
98bafbf956 Merge "Camera2: doc update for HAL3.3 tonemapping change" 2015-02-09 19:11:55 +00:00
Zhijun He
fa95b0420c Camera2: add precapture trigger CANCEL 
Bug: 19265647
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
 2015-02-09 10:42:42 -08:00
Zhijun He
6de4c88271 am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b 
automerge: 0b039b0

* commit '0b039b031557d77e112e88925904e9668f764aa7':
  camera-metadata: clarify the AE precapture trigger spec
 2015-02-08 21:29:18 +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
Yin-Chia Yeh
956c52b5a0 Camera2: doc update for HAL3.3 tonemapping change 
Codegen doc change.

Change-Id: Idd5185767c177f3179e5833be3f42357a5ead25f
 2015-02-06 12:53:31 -08:00
Ruben Brunk
7bf20e4791 am 78ee9807: am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev automerge: 2a11473 
* commit '78ee9807387e87714c74e6944d538409e0677b74':
  camera2: Make legacy error handling more robust.
 2015-02-05 23:16:36 +00: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
45441f3a7c camera2: Formatting nitpicks. 
Change-Id: Ic70afbfc45be3a187dc5542cb282ace646c57ae7
 2015-02-05 11:55:40 -08: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
d7c32e4843 am 1350671f: am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev automerge: 6bafb86 
* commit '1350671f406c238439e1dc4378287bd422aaf636':
  Camera2: relax the EV compensation requirements
 2015-02-05 03:50:18 +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
Yin-Chia Yeh
31fdd4580c Merge "Camera2: framework updates for HAL3.3 keys" 2015-02-03 23:39:52 +00:00
Lajos Molnar
3f514b5230 am d8e6a8b7: am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112 
* commit 'd8e6a8b7643ffa037fbd0e409674c450f0296809':
  camera2: limit flexYUV array size in DngCreator
 2015-02-03 23:27:55 +00: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
Yin-Chia Yeh
d9fc67ce3c Camera2: framework updates for HAL3.3 keys 
1. Return new keys in legacy shim
2. Codegened doc update from the spec change
3. Remove DISABLED mode from available scene mode list to ensure
   DISABLED is listed iff scene mode is not supported

Change-Id: If3dc74ea7e0fe6135722723f211024b604094f59
 2015-02-03 11:52:04 -08:00
Zhijun He
0e99c2260d Camera2: metadata spec update for reprocessing 
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
 2015-01-29 15:26:05 -08:00
Jinsuk Kim
b744db8715 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 
automerge: 7e79bdb

* commit '7e79bdb494b51175d9873f82f4ca8488ac6fccfa':
  CEC: Do null/empty check against the parameter for checkRecordSource()
 2015-01-29 22:41:23 +00: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
Mike Lockwood
2a57bc7fd6 MidiManager: Add USB peripheral MIDI support 
This allows the android device to appear as a USB MIDI device to
a USB host (like a Mac or a PC) using the f_midi USB gadget driver.

Change-Id: I14f1ba73bcce2c894e77efb8810beac4ffe246d8
 2015-01-29 12:59:28 -08: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
3537112124 am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21 
automerge: 745d45e

* commit '745d45e0c02588762cc05d7bf3a6f5542830a987':
  Camera2 legacy: Do not advertise NV21 support.
 2015-01-28 23:32:50 +00: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