Baligh Uddin
5c17173add
Merge "Import translations. DO NOT MERGE"
2013-03-13 15:00:57 +00:00
Baligh Uddin
609d45f964
Merge "Import translations. DO NOT MERGE"
2013-03-13 14:57:43 +00:00
Jim Miller
34f09eaf03
resolved conflicts for merge of 8f4772fe to master
...
Change-Id: I65cb4a9b3f339ad4b6997d71dc5f4577c03bb026
2013-03-12 19:19:27 -07:00
Jim Miller
8f4772feb4
am 86277467: Merge "Prevent momentary switch of keyguard to landscape" into jb-mr2-dev
...
* commit '86277467eec5e269328364e91abe164991653635':
Prevent momentary switch of keyguard to landscape
2013-03-13 02:05:35 +00:00
Jim Miller
86277467ee
Merge "Prevent momentary switch of keyguard to landscape" into jb-mr2-dev
2013-03-13 02:03:28 +00:00
Justin Koh
23a1680449
am c631feed: am c0ce7eeb: Add a minimum size for the event pools.
...
* commit 'c631feed18cd408992d0874a0a8b59a851857d87':
Add a minimum size for the event pools.
2013-03-13 01:52:18 +00:00
Justin Koh
c631feed18
am c0ce7eeb: Add a minimum size for the event pools.
...
* commit 'c0ce7eeb481540e24bc45f52e604df923c507043':
Add a minimum size for the event pools.
2013-03-13 01:49:48 +00:00
Jim Miller
8e26cd8687
Prevent momentary switch of keyguard to landscape
...
This fixes a bug where keyguard was created without setting
the preferred orientation. The result is it would temporarily
assume the orientation of the device after being hidden.
The fix sets the flag when the keyguard view hierarchy is created
rather than when visibility changes.
Fixes bug 8124979
Change-Id: Ic54a185e4f51f79f2bb7fbc5ffc6992641e89132
2013-03-12 18:45:28 -07:00
Justin Koh
c0ce7eeb48
Add a minimum size for the event pools.
...
Add a minimum size for the event pools for devices which don't have sensors.
Otherwise the system server crash loops on boot.
Change-Id: Ic51c6fc26c8779d9f435f358d4274148a2ddbfb3
2013-03-12 18:06:35 -07:00
Jaikumar Ganesh
df23f8cb91
am f667b7a7: am 6e544fd4: Remove spurious @Override.
...
* commit 'f667b7a7f93cc60faaf007086dcb4020d7568d96':
Remove spurious @Override.
2013-03-13 00:08:18 +00:00
Jaikumar Ganesh
f667b7a7f9
am 6e544fd4: Remove spurious @Override.
...
* commit '6e544fd4ca82a3f415c4cf6ca70eedea5112015e':
Remove spurious @Override.
2013-03-13 00:06:10 +00:00
Jaikumar Ganesh
6e544fd4ca
Remove spurious @Override.
...
Change-Id: Idd468be5c05bcdf397c6ba02a902c4ef7719fca8
2013-03-12 17:00:27 -07:00
Matthew Xie
fa22a0410e
am 86b00416: am d6c87ccd: Merge "Fixed 32 bit characteristic value assignment" into jb-mr2-dev
...
* commit '86b00416e812a342209de4d5391acf30d0faa5a4':
Fixed 32 bit characteristic value assignment
2013-03-12 23:21:12 +00:00
Matthew Xie
86b00416e8
am d6c87ccd: Merge "Fixed 32 bit characteristic value assignment" into jb-mr2-dev
...
* commit 'd6c87ccde6722c7dedd05a18f30d8634893e10ee':
Fixed 32 bit characteristic value assignment
2013-03-12 23:18:12 +00:00
Michael Wright
1636c2a4d3
am d1bb4d4b: am 999c2a69: Merge "Remove unused interface IInputConnectionCallback" into jb-mr2-dev
...
* commit 'd1bb4d4be20f3538d1a7ed4ec2736c10ca1a565e':
Remove unused interface IInputConnectionCallback
2013-03-12 23:17:46 +00:00
Matthew Xie
d6c87ccde6
Merge "Fixed 32 bit characteristic value assignment" into jb-mr2-dev
2013-03-12 23:16:02 +00:00
Michael Wright
d1bb4d4be2
am 999c2a69: Merge "Remove unused interface IInputConnectionCallback" into jb-mr2-dev
...
* commit '999c2a69b4c881b898555e8d84b1b38e276a65c0':
Remove unused interface IInputConnectionCallback
2013-03-12 23:12:18 +00:00
Dianne Hackborn
dc37c5f2e3
am 0c42b580: am 53149acf: Merge "Implement limited shared libraries in apks." into jb-mr2-dev
...
* commit '0c42b58041dc0ede9865335fa48637fb6b677cd3':
Implement limited shared libraries in apks.
2013-03-12 23:10:38 +00:00
Michael Wright
999c2a69b4
Merge "Remove unused interface IInputConnectionCallback" into jb-mr2-dev
2013-03-12 23:09:39 +00:00
Dianne Hackborn
0c42b58041
am 53149acf: Merge "Implement limited shared libraries in apks." into jb-mr2-dev
...
* commit '53149acf7bfe262ff8764351d35af247fcdc4ef0':
Implement limited shared libraries in apks.
2013-03-12 23:08:47 +00:00
Shawn Pearce
6c08f4dbab
am c129d78e: am d665b495: Merge "Add new sensor types." into jb-mr2-dev
...
* commit 'c129d78edadfd9f9e2af1d4bc0f6af4907e08780':
Add new sensor types.
2013-03-12 23:07:07 +00:00
Shawn Pearce
c129d78eda
am d665b495: Merge "Add new sensor types." into jb-mr2-dev
...
* commit 'd665b49518d1952c2c32825782ff117a13bc7484':
Add new sensor types.
2013-03-12 23:05:21 +00:00
Dianne Hackborn
53149acf7b
Merge "Implement limited shared libraries in apks." into jb-mr2-dev
2013-03-12 23:03:59 +00:00
Shawn Pearce
d665b49518
Merge "Add new sensor types." into jb-mr2-dev
2013-03-12 23:01:53 +00:00
kmccormick
8801b1995b
am d3458de9: am adfd7c51: am 00707306: am 37fc02be: am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
...
* commit 'd3458de9a662c05f20e43b09f76d8ed3c09211e6':
Doc change: updates to Gestures training class.
2013-03-12 22:41:57 +00:00
kmccormick
d3458de9a6
am adfd7c51: am 00707306: am 37fc02be: am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
...
* commit 'adfd7c51981edcda404baeaa19fb388ad389e367':
Doc change: updates to Gestures training class.
2013-03-12 22:39:40 +00:00
kmccormick
adfd7c5198
am 00707306: am 37fc02be: am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
...
* commit '00707306e28bbe8aac52dc07154d658a322a4985':
Doc change: updates to Gestures training class.
2013-03-12 15:36:59 -07:00
kmccormick
00707306e2
am 37fc02be: am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
...
* commit '37fc02be989e880314c05390eca01398ddee996a':
Doc change: updates to Gestures training class.
2013-03-12 15:34:26 -07:00
kmccormick
37fc02be98
am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
...
* commit '61f13cd877405f8bb72c2ad33c717ba3f02acf74':
Doc change: updates to Gestures training class.
2013-03-12 15:32:46 -07:00
kmccormick
61f13cd877
am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
...
* commit 'ae657a05db910936a92340ffe721351d259d434b':
Doc change: updates to Gestures training class.
2013-03-12 15:31:14 -07:00
kmccormick
ae657a05db
am e23f97ba: Doc change: updates to Gestures training class.
...
* commit 'e23f97ba6ee5214679fff61e33deda075cfd741d':
Doc change: updates to Gestures training class.
2013-03-12 15:29:21 -07:00
Eric Laurent
1f6fe3408d
am 1f8ac95a: am 9105ce74: Merge "audio service: fix regression in startBluetoothSco" into jb-mr2-dev
...
* commit '1f8ac95ac6dba5b646e19acef0effbdae5491a6a':
audio service: fix regression in startBluetoothSco
2013-03-12 22:22:27 +00:00
Eric Laurent
1f8ac95ac6
am 9105ce74: Merge "audio service: fix regression in startBluetoothSco" into jb-mr2-dev
...
* commit '9105ce744ecd237d4c74f4ee3a5b204c72e10c96':
audio service: fix regression in startBluetoothSco
2013-03-12 22:20:08 +00:00
Romain Guy
ed4750b3e7
am daafaff8: am baea5269: Merge "Add TaskManager API" into jb-mr2-dev
...
* commit 'daafaff83965acbda157669e7c48a2caa55d37bc':
Add TaskManager API
2013-03-12 22:19:00 +00:00
Romain Guy
daafaff839
am baea5269: Merge "Add TaskManager API" into jb-mr2-dev
...
* commit 'baea5269b647ee9ee9b2db11625b36482b9c0266':
Add TaskManager API
2013-03-12 22:16:35 +00:00
Eric Laurent
9105ce744e
Merge "audio service: fix regression in startBluetoothSco" into jb-mr2-dev
2013-03-12 22:16:02 +00:00
Shawn Pearce
c2eb8221d5
am 2c91feb9: (-s ours) am c6da8d29: Merge "Remove old show/hide messages on new ime (DO NOT MERGE)" into jb-mr2-dev
...
* commit '2c91feb9d245cc6db8fcfb0a43461abb83d17663':
Remove old show/hide messages on new ime (DO NOT MERGE)
2013-03-12 22:14:30 +00:00
Romain Guy
baea5269b6
Merge "Add TaskManager API" into jb-mr2-dev
2013-03-12 22:13:29 +00:00
Shawn Pearce
2c91feb9d2
am c6da8d29: Merge "Remove old show/hide messages on new ime (DO NOT MERGE)" into jb-mr2-dev
...
* commit 'c6da8d29f288bb457e7e9213398fe1582bfe573c':
Remove old show/hide messages on new ime (DO NOT MERGE)
2013-03-12 22:10:02 +00:00
kmccormick
e23f97ba6e
Doc change: updates to Gestures training class.
...
Change-Id: I5328a82736472e4a7507709380875ba0c9ef6f8e
2013-03-12 15:07:40 -07:00
Lorenzo Colitti
440662c481
am 7a1d77d2: am 8818d84a: Merge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev
...
* commit '7a1d77d217e42ec02d5c9f79924b1009fd2219c2':
Unit test routes with interfaces in LinkProperties
2013-03-12 22:07:36 +00:00
Shawn Pearce
c6da8d29f2
Merge "Remove old show/hide messages on new ime (DO NOT MERGE)" into jb-mr2-dev
2013-03-12 22:07:03 +00:00
Romain Guy
5dc7fa7096
Add TaskManager API
...
This API can be used to run arbitrary tasks on a pool of worker
threads. The number of threads is calculated based on the number
of CPU cores available.
The API is made of 3 classes:
TaskManager
Creates and manages the worker threads.
Task
Describes the work to be done and the type of the output.
A task contains a future used to wait for the worker thread
to be done computing the result of the task.
TaskProcessor
The processor dispatches tasks to the TaskManager and is
responsible for performing the computation required by
each task. A processor will only be asked to process tasks
sent to the manager through the processor.
A typical use case:
class MyTask: Task<MyType>
class MyProcessor: TaskProcessor<MyType>
TaskManager m = new TaskManager();
MyProcessor p = new MyProcessor(m);
MyTask t = new MyTask();
p.add(t);
// Waits until the result is available
MyType result = t->getResult();
Change-Id: I1fe845ba4c49bb0e1b0627ab147f9a861c8e0749
2013-03-12 15:06:42 -07:00
Lorenzo Colitti
7a1d77d217
am 8818d84a: Merge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev
...
* commit '8818d84a3540de6e53e5d82e2112292102574118':
Unit test routes with interfaces in LinkProperties
2013-03-12 22:06:33 +00:00
Lorenzo Colitti
8818d84a35
Merge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev
2013-03-12 22:04:52 +00:00
Lorenzo Colitti
1994bc14ab
Unit test routes with interfaces in LinkProperties
...
Change-Id: Ie41a56bc9863ee72f4d7a8f72e436fc57e57b1af
2013-03-12 15:01:05 -07:00
Craig Mautner
274323ce8f
Remove old show/hide messages on new ime (DO NOT MERGE)
...
The previous show/hide messages in the queue were still trying
to be honored even after a new ime was attached.
Fixes bug 8263462.
Change-Id: Iee60dbd1d58542f73aedeac5ccb54cddeb5d5dfe
2013-03-12 14:44:59 -07:00
Eric Laurent
f5a1fc3c0f
audio service: fix regression in startBluetoothSco
...
Commit 2a57ca93 introduced a regression in startBluetoothSco()
where the calling pid was cleared before creating the entry for
the client app. The pid in the entry was always the system server pid
and the SCO client verification logic was broken preventing the activation
of the BT SCO connection.
Change-Id: I4e024b22fceb350f829ff0d8664703faeef7af48
2013-03-12 21:40:25 +00:00
John Reck
6d2679cd3b
am 389a543d: am 93f99846: am bd5ee4d3: am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"
...
* commit '389a543d61e109ba03dd3d736d4a3e719906342a':
Fix NPE when pasting non-text from Clipboard
2013-03-12 21:39:11 +00:00
John Reck
389a543d61
am 93f99846: am bd5ee4d3: am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"
...
* commit '93f99846df1e00f115c8870eab6ef3df54d1ec6a':
Fix NPE when pasting non-text from Clipboard
2013-03-12 21:37:52 +00:00