Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
185,283 Commits 3 Branches 0 Tags
61bc9d535ba664dfda0beffc509ea22644ce77c3
Commit Graph

1389 Commits

Author SHA1 Message Date
Andreas Gampe
9a9b45c285 am d6f25364: am 9568772a: Merge "Frameworks/base: Fix format string in Geofence" 
* commit 'd6f25364eed09d39b493488cd6adaa02e0d8a252':
  Frameworks/base: Fix format string in Geofence
 2015-03-17 22:02:29 +00:00
Andreas Gampe
d6f25364ee am 9568772a: Merge "Frameworks/base: Fix format string in Geofence" 
* commit '9568772acbf5b36f2edb41f7c5b06d499329add0':
  Frameworks/base: Fix format string in Geofence
 2015-03-17 21:42:55 +00:00
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
1938a389e7 am 3814163b: am aae42eb2: Merge "Frameworks/base: Fix format string in Camera" 
* commit '3814163b6ddc35292f6b25f782ad7a858c703c24':
  Frameworks/base: Fix format string in Camera
 2015-03-17 21:12:25 +00:00
Andreas Gampe
3814163b6d am aae42eb2: Merge "Frameworks/base: Fix format string in Camera" 
* commit 'aae42eb26176482b09f0846e6acf7efa844a0d23':
  Frameworks/base: Fix format string in Camera
 2015-03-17 21:05:48 +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
Ruben Brunk
db2b5f4472 Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup" 2015-03-17 19:11:33 +00:00
Ruben Brunk
443ab2c7db camera2: Release surface in ImageReader#close and fix legacy cleanup 
Bug: 19694090
Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e
 2015-03-17 17:49:29 +00:00
Andreas Gampe
2851d7d0fd am 7f95a1bc: am 5eb42122: Merge "Frameworks/base: Force long computation" 
* commit '7f95a1bc3271318d7f08f19426be24b17186f9f0':
  Frameworks/base: Force long computation
 2015-03-16 21:58:39 +00:00
Andreas Gampe
7f95a1bc32 am 5eb42122: Merge "Frameworks/base: Force long computation" 
* commit '5eb421221bcade4f5715d42843346f7d3c733547':
  Frameworks/base: Force long computation
 2015-03-16 20:49:12 +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
Eric Laurent
2035ac85f6 broadcast radio API 
Initial implementation of system APIs for broadcast
radio framework. Added manager and interfaces to control
a broadcast radio function exposed by the radio HAL.

- RadioManager: contains data structures and definitions as well as
top level API for feature discovery and tuner interface instantiation.
- RadioTuner: interface to control a broadcast radio tuner.
- RadioModule: framework component implementing the RadioTuner interface
and controlling a HW radio module via the radio HAL.
- RadioMetadata: representation of radio meta data (Station name, PTY,
song title, artwork, etc...) communicated by the framework to the client.

Change-Id: Iee42a185c694503e25f0b2dcfa417d88f5e9549b
 2015-03-13 15:34:50 -07:00
Yin-Chia Yeh
d6ee06a0c8 Merge "Camera: add @hide API for setting camera rotation" 2015-03-12 20:36:49 +00:00
Jeff Brown
6c7b41adf9 Rename Looper::isIdling() to isPolling() to resolve confusion. 
The loop isn't technically idle at this time, it's just checking
whether any file descriptors have pending events.  However it's
still a good signal as to whether the loop is alive.

Added a real isIdle() function.

Bug: 19532373
Change-Id: Idd273e8774f469ccafb00d560818cf279dfd6ba6
 2015-03-11 15:00:34 -07:00
Yin-Chia Yeh
49ea6ae76d Camera: add @hide API for setting camera rotation 
Only adding API header. Haven't filled in implementation.

Change-Id: I99a1c84d194dd20562845a0f566dd10ddb3041b7
 2015-03-10 10:33:44 -07:00
Eino-Ville Talvala
24c369e025 Camera2: Add hidden depth stream configuration tags 
Change-Id: Iec1ceb894d90210bc3ab06acc92dcbbe42b74465
 2015-03-09 11:15:31 -07:00
Eino-Ville Talvala
864005b026 Camera2: Remove unused parameters in ICameraDeviceUser#createStream 
- width, height, format are unused

Change-Id: I26540aab1118108b0325df69cfa2dd23da41849b
 2015-03-09 11:15:30 -07:00
Chien-Yu Chen
a0e17fafa1 Merge "CameraManager: implement flashlight controls" 2015-03-03 22:24:12 +00:00
Chien-Yu Chen
afa91399fd CameraManager: implement flashlight controls 
Implement the flashlight controls and callbacks and update the
torch mode states.

Bug: 2682206
Change-Id: I59025f34f9ece75dd535166a25c428b8d68c6e4b
 2015-03-03 13:55:07 -08:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05:00
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