drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,384 Commits 1 Branch 0 Tags
Commit Graph

153384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruben Brunk
8aa88195fe am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* commit '3b57d98a1a84ce063cb3681cae10795216300035':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-22 03:43:23 +00:00
John Spurlock
76e9454189 am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 
* commit '61ffcacad7be97c8f102b23298d2c9c80f69e550':
  Doze: Ensure a doze reset happens after leaving keyguard.
 2014-09-22 03:17:40 +00:00
Yigit Boyar
27dd47f81a am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit 'a07169280401c84ac914b98028d7e991cee5a85d':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-22 03:17:19 +00:00
Ruben Brunk
ee3ef2b8af Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* changes:
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-22 02:54:22 +00:00
John Spurlock
87038509f3 Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 2014-09-22 02:00:38 +00:00
Yigit Boyar
5507b223dd Merge "Allow fallback to Toolbar's default Navigation Icon" into lmp-dev 2014-09-22 01:14:40 +00:00
Ruben Brunk
97b5301b09 camera2: Avoid setting null metering regions in LEGACY. 
Bug: 17587491

- If a single region with zero weight is set, revert to default
  metering region rather than attempting to set a null to
  avoid setParameters failure.

Change-Id: Iccd4d53d5a2134a9d744eafb731f464b653a154d
 2014-09-21 16:09:34 -07:00
Ruben Brunk
09a6bed6c6 camera2: Fix JPEG orientation set by LEGACY request. 
Bug: 17589231
Change-Id: Id449bc7a39a6550413e6c441b6dc204e11eacda9
 2014-09-21 16:09:34 -07:00
John Spurlock
cf5d3c98d1 Doze: Ensure a doze reset happens after leaving keyguard. 
Bug:17536133
Change-Id: Ibc88a7f2c1a51656676fe62d4de8ab3ec4dd4081
 2014-09-21 18:00:01 -04:00
Sailesh Nepal
67d65dd84e am 5fb8a942: Merge "Pass disconnect reason for failed remote connections" into lmp-dev 
* commit '5fb8a9425dfa31b3a50a54ff361e339dc0f777d7':
  Pass disconnect reason for failed remote connections
 2014-09-21 21:41:19 +00:00
Sailesh Nepal
c0f337ca7a Merge "Pass disconnect reason for failed remote connections" into lmp-dev 2014-09-21 21:35:23 +00:00
Ruben Brunk
5426bc2351 am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 
* commit '6a80927aef62f74a4801180adf68fe8781181060':
  camera2: refactor LEGACY mode error handling.
 2014-09-21 19:25:56 +00:00
Ruben Brunk
2610a1ba5d Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 2014-09-21 19:16:57 +00:00
Ruben Brunk
e663cb7728 camera2: refactor LEGACY mode error handling. 
Bug: 17431462
Bug: 17407537

- Add Surface format/size validation during configure.
- Update exception error codes used in binder calls.
- Report dropped requests, frames, captures, and device
  errors in binder callback properly.
- Fixes CameraDeviceTest errors for incorrect metering
  rectangle weight in template tests.
- Fixes CameraDeviceTest errors for missing
  noiseReductionMode field in template tests.
- Implement flush call.

Change-Id: I0da803bccf2bfb9b4c0cf61208e160a86c577497
 2014-09-21 12:09:23 -07:00
Baligh Uddin
7782b8abb6 am 6564aa05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6564aa053e240e8a4eb75191ecf03ab135eedad8':
  Import translations. DO NOT MERGE
 2014-09-21 18:15:31 +00:00
Baligh Uddin
ff2e858fe7 am 8c86f1cc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '8c86f1cc29583585ad701bcca710b403127005c2':
  Import translations. DO NOT MERGE
 2014-09-21 18:15:06 +00:00
Baligh Uddin
33d34b89d1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 18:07:51 +00:00
Baligh Uddin
64387a366d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 18:07:46 +00:00
Baligh Uddin
11f6e414d4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-09-21 18:07:44 +00:00
Baligh Uddin
961bc1fb6a Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 18:07:42 +00:00
Baligh Uddin
c114196a30 am 71f9d6af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '71f9d6afdc8e3ed2ad8b4a24800e66e3aab13252':
  Import translations. DO NOT MERGE
 2014-09-21 18:04:56 +00:00
Baligh Uddin
b8be77af27 am 8b8757a2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '8b8757a2f32a1d1b6b123e6215deff48042a01ad':
  Import translations. DO NOT MERGE
 2014-09-21 18:04:41 +00:00
Baligh Uddin
830d0b3722 am f4b32152: (-s ours) Import translations. DO NOT MERGE 
* commit 'f4b321526d6ceea190a1d9284fd6a45895071c97':
  Import translations. DO NOT MERGE
 2014-09-21 18:04:37 +00:00
Svetoslav
e5b726efca am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev 
* commit '23e6a2440435d417791e99b95402721b535f73e4':
  Fix memory leak in accessibility cache.
 2014-09-21 18:02:20 +00:00
Baligh Uddin
01328341a3 am c9d9fbf9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c9d9fbf9acd32de0ae90109d95b09e90191f7930':
  Import translations. DO NOT MERGE
 2014-09-21 18:02:16 +00:00
Baligh Uddin
8befb14626 am 569d3d30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '569d3d30043f07d15abc6cfcafc1d27056c1c096':
  Import translations. DO NOT MERGE
 2014-09-21 18:02:13 +00:00
Baligh Uddin
a7c206856c am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5ed716c1f4a4ae0ec9c8ec787b56cf6596b1020d':
  Import translations. DO NOT MERGE
 2014-09-21 18:02:10 +00:00
Svetoslav
650d7d9dd2 Merge "Fix memory leak in accessibility cache." into lmp-dev 2014-09-21 17:53:45 +00:00
Baligh Uddin
e5a94bbdaa Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 17:52:21 +00:00
Baligh Uddin
a9e651b6ba Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:52:19 +00:00
Baligh Uddin
6a307e8ba1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 17:52:16 +00:00
Baligh Uddin
c416d6a1f9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-09-21 17:52:14 +00:00
Baligh Uddin
44767762ca Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:51:58 +00:00
Baligh Uddin
e2334661d7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 17:51:55 +00:00
Baligh Uddin
d411d5a87b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-09-21 17:51:53 +00:00
Baligh Uddin
c9759d761e Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 17:51:47 +00:00
Baligh Uddin
43c9e64b9a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:51:34 +00:00
Baligh Uddin
817bb46306 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 17:51:04 +00:00
John Spurlock
91e022b426 am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit 'bfaadc6b4098c23f5dc1a15522a011ba3cd72bf5':
  Mark sysui config resource as untranslatable.
 2014-09-21 17:06:49 +00:00
John Spurlock
8fefb4281a Merge "Mark sysui config resource as untranslatable." into lmp-dev 2014-09-21 16:57:55 +00:00
Baligh Uddin
f0e65a3298 Import translations. DO NOT MERGE 
Change-Id: I4e30e9bfaa1032d9e2cd8ca170945b4c4f16d597
Auto-generated-cl: translation import
 2014-09-20 23:13:04 -07:00
Baligh Uddin
5e4576ca87 Import translations. DO NOT MERGE 
Change-Id: Ib5b293b29ddcea39bcba9d707ef2b25bc2af5772
Auto-generated-cl: translation import
 2014-09-20 23:12:21 -07:00
Baligh Uddin
974c9c8187 Import translations. DO NOT MERGE 
Change-Id: Ib126d3dd73ff597b813ed6f792ca2e667abc155d
Auto-generated-cl: translation import
 2014-09-20 23:11:31 -07:00
Baligh Uddin
b1b8fa00de Import translations. DO NOT MERGE 
Change-Id: If5c2ca9461d0d7846374fda66e3d091dfa8f05e7
Auto-generated-cl: translation import
 2014-09-20 23:10:32 -07:00
Yohei Yukawa
e63b5fae8d Work on issue #17506095: Plumb a new configuration to IMMS 
This CL makes a plumbing from SystemConfig to IMMS.

Change-Id: Ia70b870723acf647e0c27f24aff91b40d6f85543
 2014-09-21 10:34:35 +09:00
Sailesh Nepal
c2a978dba3 Pass disconnect reason for failed remote connections 
If a remote connection fails to create call setDisconnected
instead of setState. This allows us to pass the disconnect
reason.

Note, this CL is very low risk since it only impacts remote
connections.

Bug: 17594857
Change-Id: Id296f3f5a4bb9168b358d3bfda94e04623a6b99c
 2014-09-20 18:23:05 -07:00
Baligh Uddin
0315371dd2 Import translations. DO NOT MERGE 
Change-Id: Ie0eee73354b0677b17df5e3d3118f9e0e062e5e2
Auto-generated-cl: translation import
 2014-09-20 16:16:12 -07:00
Baligh Uddin
ba79ed185a Import translations. DO NOT MERGE 
Change-Id: I86574134832a7ecc70bae35901997448bf241460
Auto-generated-cl: translation import
 2014-09-20 16:13:58 -07:00
Baligh Uddin
63caa9d5c3 Import translations. DO NOT MERGE 
Change-Id: Ibe2f80b5805c0805c1eb708deadf81b57302e8c5
Auto-generated-cl: translation import
 2014-09-20 16:11:52 -07:00
Baligh Uddin
615bd17249 Import translations. DO NOT MERGE 
Change-Id: I63ca0e486e5e1ad3c2a0b654ce5be5b1789d11b1
Auto-generated-cl: translation import
 2014-09-20 16:09:28 -07:00