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

156787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
5d3a3f0ea6 am ea3a8243: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 
* commit 'ea3a82430c2d410ddea9fb92202db807bbe3fa70':
  Doze: Ensure a doze reset happens after leaving keyguard.
 2014-09-22 02:19:10 +00:00
John Spurlock
58e3dc2f93 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 02:09:07 +00:00
Yigit Boyar
2c029f3fe2 am 747a975b: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit '747a975bef3589fb5407ad3f74cc67770e2d86fa':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-22 02:07:54 +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
8451341d8d 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 01:52:58 +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
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
31647c69ee am bf1000a9: am 5fb8a942: Merge "Pass disconnect reason for failed remote connections" into lmp-dev 
* commit 'bf1000a927f1fddb6a9a18f47ea82fa829cc6d66':
  Pass disconnect reason for failed remote connections
 2014-09-21 21:52:32 +00:00
Sailesh Nepal
35f91bdf02 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:28 +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
eea600eae1 am 9acb2ddb: am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 
* commit '9acb2ddb5edac2b78fb34e4a13cfef937af3505b':
  camera2: refactor LEGACY mode error handling.
 2014-09-21 19:36:59 +00:00
Ruben Brunk
cfbf29be2e 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:51 +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
8b35f40d00 am b683a33e: (-s ours) am 6564aa05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b683a33e593fb033cd2b145b751a22c47a2effe6':
  Import translations. DO NOT MERGE
 2014-09-21 18:22:41 +00:00
Svetoslav
ea2ecf1611 am efe0f19c: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev 
* commit 'efe0f19cd99b5d5ab72fa0c261cb30c0d708efc9':
  Fix memory leak in accessibility cache.
 2014-09-21 18:15:48 +00:00
Baligh Uddin
749f4a2bc4 am db7a564b: (-s ours) am c9d9fbf9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'db7a564ba9207b1cc88fd995c9aed93f26ac4759':
  Import translations. DO NOT MERGE
 2014-09-21 18:15:43 +00:00
Baligh Uddin
a5a6a90067 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:39 +00:00
Baligh Uddin
eda4774a82 am 1ab8abb1: (-s ours) am 569d3d30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '1ab8abb1c3eaa47921d8027454b14534a979f268':
  Import translations. DO NOT MERGE
 2014-09-21 18:15:38 +00:00
Baligh Uddin
02fde656c3 am fea91df7: (-s ours) am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'fea91df724464bc03b4afd348c52506f4ccb388a':
  Import translations. DO NOT MERGE
 2014-09-21 18:15:34 +00:00
Baligh Uddin
33d34b89d1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 18:07:51 +00:00
Svetoslav
582dc798f2 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:01 +00:00
Baligh Uddin
190e914a5b am c9d9fbf9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c9d9fbf9acd32de0ae90109d95b09e90191f7930':
  Import translations. DO NOT MERGE
 2014-09-21 18:01:57 +00:00
Baligh Uddin
e95faa93ec am 569d3d30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '569d3d30043f07d15abc6cfcafc1d27056c1c096':
  Import translations. DO NOT MERGE
 2014-09-21 18:01:53 +00:00
Baligh Uddin
6f8df5f814 am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5ed716c1f4a4ae0ec9c8ec787b56cf6596b1020d':
  Import translations. DO NOT MERGE
 2014-09-21 18:01:48 +00:00
Svetoslav
650d7d9dd2 Merge "Fix memory leak in accessibility cache." into lmp-dev 2014-09-21 17:53:45 +00:00
Baligh Uddin
a9e651b6ba Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:52:19 +00:00
Baligh Uddin
44767762ca Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:51:58 +00:00
Baligh Uddin
43c9e64b9a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:51:34 +00:00
John Spurlock
6fe0f01886 am a3402f94: am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit 'a3402f940a6f59304fed30a35d33d44309fed14c':
  Mark sysui config resource as untranslatable.
 2014-09-21 17:17:58 +00:00
John Spurlock
45d1265696 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:58 +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
b1b8fa00de Import translations. DO NOT MERGE 
Change-Id: If5c2ca9461d0d7846374fda66e3d091dfa8f05e7
Auto-generated-cl: translation import
 2014-09-20 23:10:32 -07: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
615bd17249 Import translations. DO NOT MERGE 
Change-Id: I63ca0e486e5e1ad3c2a0b654ce5be5b1789d11b1
Auto-generated-cl: translation import
 2014-09-20 16:09:28 -07:00
Baligh Uddin
75d4b6216d Import translations. DO NOT MERGE 
Change-Id: I71fe6c9dd2eb6f3999171885a3b33e979dd7595b
Auto-generated-cl: translation import
 2014-09-20 13:28:25 -07:00
Baligh Uddin
78ec95e714 Import translations. DO NOT MERGE 
Change-Id: Ib08e8991a092d8404352d9709d837be2eb392b55
Auto-generated-cl: translation import
 2014-09-20 12:56:55 -07:00
Nick Kralevich
d6087c0204 resolved conflicts for merge of 4cbee7d2 to lmp-dev-plus-aosp 
Change-Id: Ie35383ff88d63beef1e3ce4ae92813025709beb7
 2014-09-20 11:28:22 -07:00
Yigit Boyar
565dc77229 am 3439d367: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '3439d367f662f84cc26c3e7a0eefb6d5d57be5c0':
  Find activity from context in menu inflator for click events
 2014-09-20 04:46:21 +00:00
Jeff Brown
2a46170cd6 am 54d28e51: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '54d28e51275e948d59484e3bd3e3eaea25c012e8':
  Decouple turning screen on from waking up in policy.
 2014-09-20 04:46:16 +00:00
Jeff Brown
a43c3ce178 am d875a696: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit 'd875a6969eb810b8301d96f636f4710c5ab51484':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 04:46:10 +00:00
Jeff Brown
c7b904465b am 3f6f0a50: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit '3f6f0a501dfebb9da9863891648976063d41f3bf':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 04:46:04 +00:00
Yigit Boyar
6e6e3fbdb2 am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '646e0428a489d786c29a9ad48c1f21f3d644af42':
  Find activity from context in menu inflator for click events
 2014-09-20 03:08:13 +00:00
Jeff Brown
fd92288dfe am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '09395677f7ef5119556e8ba100c0bd27480c9797':
  Decouple turning screen on from waking up in policy.
 2014-09-20 03:07:31 +00:00
Jeff Brown
a598014121 am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit '6d098d406305bb6f34d48ce6035ba3920659a805':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 03:07:26 +00:00
Jeff Brown
d39f2734eb am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit 'f10fc92c564048b51f1775fe92738669d358fa16':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 03:07:20 +00:00
Svetoslav
13bd771c99 Fix memory leak in accessibility cache. 
We were not clearing the cache if window state change event
is fired which was the behavior before adding the window
inspection APIs. As a result if no accessibility service
cares about windows we get a leek. Also when the accessibiilty
service cares about windows we were not clearing all windows
nodes from the cache. Now if a windows change or a window
state change event is recived we clear the cache.

bug:17589257

Change-Id: I8c416fbcab623160c6f505128b9fca713fcc6623
 2014-09-19 19:21:55 -07:00
Christopher Ferris
4cbee7d24d am b7442bbc: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit 'b7442bbc8c27b0643b7235076ee151b8257bf28d':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 01:30:36 +00:00
Yigit Boyar
1a74dc4547 Merge "Find activity from context in menu inflator for click events" into lmp-dev 2014-09-20 01:30:00 +00:00
Yigit Boyar
30f5dc935b Allow fallback to Toolbar's default Navigation Icon 
Bug: 17554486
Change-Id: Id9f2197820df42d81351540be5baa852f49bdf0a
 2014-09-19 18:26:07 -07:00