17403 Commits

Author SHA1 Message Date
Craig Mautner
e88d180d6c am e2c92ac8: Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev
* commit 'e2c92ac847d151cbf4d578ee85d3ff10126e9ada':
  Update launchFlags after changing Intent flags
2014-05-27 14:23:35 +00:00
Craig Mautner
bf1bf9dea7 Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev 2014-05-27 14:14:34 +00:00
Nicolas Prevot
e282c97e21 Merge "Rename code related to cross-profile intents." 2014-05-27 10:07:58 +00:00
Jinsuk Kim
0bc8b0718f Fix a bug using wrong addresses for CEC logical address allocation
Change-Id: I41da586c16dca4f325d147bb3abe5d4e09f7b91c
2014-05-27 09:52:40 +00:00
Jinsuk Kim
7fe2ae0fe9 Hook up the CEC playback API to service internal logic.
This change enables CEC playback API (oneTouchPlay, queryDisplayStatus).
Also updated local device list type to SparseArray to make it easy
to get one based on device type.

Change-Id: I6f88b2dac2d873c493a90411549a4e5719a5e460
2014-05-27 04:45:23 +00:00
Wonsik Kim
c3a6e23e3f am e32b2d32: Revert "Revert "Add physical TV input handling to TvInputManagerService""
* commit 'e32b2d32d7e4a492bb3038c7bc55988a908437a4':
  Revert "Revert "Add physical TV input handling to TvInputManagerService""
2014-05-27 04:08:51 +00:00
Wonsik Kim
c22dbb6919 Revert "Revert "Add physical TV input handling to TvInputManagerService""
This reverts commit 1940e197a8de186df5edf0b78e0907ae539bd215.

Bug: 14118245, Bug: 15197740
Change-Id: Ia308f16d2ed8ec55112a4d21c180ccb97e8d7c6a
2014-05-27 01:33:50 +00:00
Jungshik Jang
1a4485dcd2 Add HdmiCecDeviceInfo to HdmiCecLocalDevice
As HdmiCecLoclaDevice is a wrapper for local devices
it should include cec device info.

Change-Id: I479665b2aa6bd56470b79dbbb7fb1015f6356090
2014-05-26 13:52:14 +09:00
Jungshik Jang
02bb4265ac Implement <Polling Message>.
When Device Discovery is launched or Hot-plug detection is
launched, the first step of it is to send <Polling Message>
to all remote devices. According to type of feature,
it may have different retry count for sending <Polling Message>.

As <Polling Message> to all devices should be serialized operation
it runs on io thread as single operation.

Along with this, added assertRunOnIoThread and
assertRunOnServiceThread used to make sure that all methods are
called in proper thread.

Change-Id: I2d2df0216867c188e99ba24b216ec73f3396eeae
2014-05-26 11:53:13 +09:00
Yuncheol Heo
1178cd29b2 Merge "Add the constants for the callback result of SendCecCommand()." 2014-05-26 02:45:40 +00:00
Yuncheol Heo
ece603b795 Add the constants for the callback result of SendCecCommand().
- Move the send failure warning messages into HdmiCecController.sendCommand()
  from each Actions.
- Stringfy with more detail messages for some opcodes.

Change-Id: Ib7ce24dd2a1f290e6c3a0b26738772ef1d4a9630
2014-05-26 11:35:09 +09:00
Craig Mautner
a254cd7e0f Update launchFlags after changing Intent flags
If you don't you're going to have a bad time. In particular we
did not act on the new flags and the documentLaunchMode setting
was ignored.

Fixes bug 15245852.

Change-Id: Ie1c435c4a821b9fc787e5e06e7b24aa98a242225
2014-05-25 16:47:39 -07:00
Jinsuk Kim
2918e9e133 CEC Initialization per device type
CEC initialization may vary from device type to type. Changed logical address
map to HdmiCecLocalDevice map to handle it. These per-type classes for local
device will be extended also to take care of incoming CEC commands that should
require different action based on device type.

Change-Id: Ia59a464607b14e942fcf83e63aa1d6310ca6a575
2014-05-25 21:32:50 +00:00
Guang Zhu
82d96d5e21 Merge "Revert "Add physical TV input handling to TvInputManagerService"" 2014-05-24 19:03:02 +00:00
Guang Zhu
70aa0c6db3 Revert "Add physical TV input handling to TvInputManagerService"
Bug: 15197740

This reverts commit c8324a8e70d9f617c92f49e7c0b3e2484d9190fd.

Change-Id: Ie7b5405e929b5903f43188c3445fe9d24ecf92c2
2014-05-24 19:02:50 +00:00
Craig Mautner
e67a784eb2 Modify task navigation to return to recent tasks. DO NOT MERGE
Tasks launched from the recent task list will now return to the list
when they are finished. Also tasks that are launched from the
notification panel and services will now return to the list,
provided that the launcher is not front and center when they are
launched.

Fixes bug 14464114.

Change-Id: Ic0d3731fc7248d1eaa80e5ee399753d80e80c979
2014-05-24 09:50:37 -07:00
Craig Mautner
4d22b4a016 Merge "Modify task navigation to return to recent tasks." 2014-05-24 16:48:16 +00:00
Wonsik Kim
5d038b9d6f Merge "Add physical TV input handling to TvInputManagerService" 2014-05-24 15:13:47 +00:00
Craig Mautner
df6523f270 Modify task navigation to return to recent tasks.
Tasks launched from the recent task list will now return to the list
when they are finished. Also tasks that are launched from the
notification panel and services will now return to the list,
provided that the launcher is not front and center when they are
launched.

Fixes bug 14464114.

Change-Id: Ic0d3731fc7248d1eaa80e5ee399753d80e80c979
2014-05-23 19:03:00 -07:00
Craig Mautner
21d24a21ea Add code for persisting tasks and activities to disk DO NOT MERGE
Recent tasks that have the persistable flag set are
saved to /data/system/recent_tasks/ on shutdown and in the
background. Their thumbnails are saved to
/data/system/recent_images/.

Change-Id: Ifb820a01c412fe1f8c0f6e41aa655fafd89eaa8d
2014-05-23 18:42:33 -07:00
Craig Mautner
94d643a1c2 Merge "Check for null" 2014-05-23 23:26:03 +00:00
Christopher Tate
6000a6c663 Merge "Run the task manager service at startup" 2014-05-23 23:18:13 +00:00
Christopher Tate
8f64f80888 Run the task manager service at startup
Also moves most of it into android.app.task rather than android.content.

Bug 14993295
Bug 14997851

Change-Id: I9b5738d026ea2526cdfbc96d0239c74687c51611
2014-05-23 16:07:45 -07:00
Craig Mautner
deec695253 Merge "Add code for persisting tasks and activities to disk" 2014-05-23 22:37:20 +00:00
Christopher Tate
ec41d7abab Merge "DO NOT MERGE - Don't crash uninstalling updates to system apps" into lmp-preview-dev 2014-05-23 22:36:12 +00:00
justinzhang
c137a2d6c1 Merge "Hide status bars in lock task" 2014-05-23 20:46:28 +00:00
justinzhang
5286d3ff47 Hide status bars in lock task
Call StatusBarManager to show/hide status bars for lock task.
(Same CL as https://googleplex-android-review.git.corp.google.com/#/c/461068/,
sorry for the confusion.)

Bug: 13669575
Change-Id: I5c90bdb1d868aa02d3679e854b5ccbe434d996d6
2014-05-23 16:44:25 -04:00
Craig Mautner
b20f796dab Check for null
Fixes bug 15129354.

Change-Id: I88865c021a024ab94e44dc71f09f8325a79e0775
2014-05-23 13:28:40 -07:00
Dmitriy Ivanov
9b7135645e am 190ed5db: am 2137d6a8: am d5ee4144: Merge "Increase start timeout for wrapped process"
* commit '190ed5db4ac90612c1f6420f87ea462076fbe1a0':
  Increase start timeout for wrapped process
2014-05-23 19:34:53 +00:00
Kenny Guy
759c9b9688 Merge "Fix bug with removeUser assuming it is called from system uid." 2014-05-23 16:27:35 +00:00
Kenny Guy
ee58b4f44d Fix bug with removeUser assuming it is called from system uid.
This causes adb shell pm remove-user to fail.

Bug: 15160176
Change-Id: If1ff61dbde90f930d32affd87f935b318df813df
2014-05-23 15:23:52 +01:00
Chris Wren
470c1accf5 Fix a concurrency bug in the ranking reconsideration.
If we rely on mNotificationList to be sorted, then we cannot allow
records to change without a corresponding call to sort.  Currently
RankingFuture may modify records in a separate thread, while the sort
doesn't happen until later.  This creates a window for race conditions.

Instead, RankingFuture should record operations to be performed on the
record that will replayed later, in a transaction along with a sort.

We can't simply overwrite the old record completely because another
future may be concurrently modifying a different aspect of the record.
Two futures that attempt to modify the same aspect will be serialized
and the second will overwrite eventually the first.

Change-Id: I9223cabdc60f72d8e37e6d8119bea1e0127185c0
(cherry picked from commit 77d3e0d0297caca5358879d36e8ba77710eb8e82)
2014-05-23 13:47:01 +00:00
Chris Wren
e3dd9118a2 Merge "Fix a concurrency bug in the ranking reconsideration." 2014-05-23 13:44:55 +00:00
Chris Wren
4ad99682dd Fix a concurrency bug in the ranking reconsideration.
If we rely on mNotificationList to be sorted, then we cannot allow
records to change without a corresponding call to sort.  Currently
RankingFuture may modify records in a separate thread, while the sort
doesn't happen until later.  This creates a window for race conditions.

Instead, RankingFuture should record operations to be performed on the
record that will replayed later, in a transaction along with a sort.

We can't simply overwrite the old record completely because another
future may be concurrently modifying a different aspect of the record.
Two futures that attempt to modify the same aspect will be serialized
and the second will overwrite eventually the first.

Change-Id: I9223cabdc60f72d8e37e6d8119bea1e0127185c0
2014-05-23 09:36:09 -04:00
Julia Reynolds
0e1dc0f5aa Merge "Create deviceowner gated APIs for creating and removing users in devicepolicymanager." into lmp-preview-dev 2014-05-23 13:08:09 +00:00
Adrian Roos
f176e3be88 am fe3a59cf: Merge "Add a cache to LockPatternUtils" into lmp-preview-dev
* commit 'fe3a59cfa476fd22006f585b1c5ae8624d5191df':
  Add a cache to LockPatternUtils
2014-05-23 13:04:10 +00:00
Adrian Roos
98157e8dbb Merge "Add a cache to LockPatternUtils" into lmp-preview-dev 2014-05-23 12:58:19 +00:00
Adrian Roos
4f7884542c Add a cache to LockPatternUtils
Caches responses from LockSettingsService in the client process.

Bug: 15088101
Change-Id: If77c5ec45f52a02c800d50cb8550bfcb180f301d
2014-05-23 14:38:33 +02:00
Nicolas Prevot
8194899071 Rename code related to cross-profile intents.
For example, replace ForwardingIntentFilter by CrossProfileIntentFilter

Bug: 15023443

Change-Id: Iee8cdf578817ef9956bcdece803a49b0d07b67f7
2014-05-23 13:16:01 +01:00
Julia Reynolds
6cbbe9ec99 Create deviceowner gated APIs for creating and removing users in devicepolicymanager.
This will allow DMAgent to manage users for EDU's cart model user case.
Bug: 15015887

Change-Id: I1eadf1701cb75fc4b50eb1a0df1525eff818286e
(cherry picked from commit be9f43b9618ec25121b151d247eb0285fb6554b3)
2014-05-23 11:14:34 +00:00
Christoph Studer
ab17ddf66f am 44ff0d4e: Merge "NoMan: Allow SysUI to register as listener" into lmp-preview-dev
* commit '44ff0d4e5b59b15788f9b5ad01ef82b59237c8a7':
  NoMan: Allow SysUI to register as listener
2014-05-23 10:16:31 +00:00
Christoph Studer
00b206e39b Merge "NoMan: Allow SysUI to register as listener" into lmp-preview-dev 2014-05-23 09:21:49 +00:00
Christoph Studer
0cc609606a Merge "SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE" into lmp-preview-dev 2014-05-23 09:21:13 +00:00
Wonsik Kim
1f58975996 Add physical TV input handling to TvInputManagerService
Remaining work:
- Support buffer producer profile
- Implement communication with HdmiControlService such as input switch
and key event passing

Bug: 14118245
Change-Id: I01e6a8b5374a0cbe6f2ef1feabe768fd3c65480a
2014-05-23 16:15:58 +09:00
Craig Mautner
ef73ee1dd9 Add code for persisting tasks and activities to disk
Recent tasks that have the persistable flag set are
saved to /data/system/recent_tasks/ on shutdown and in the
background. Their thumbnails are saved to
/data/system/recent_images/.

Change-Id: Ifb820a01c412fe1f8c0f6e41aa655fafd89eaa8d
2014-05-22 23:41:42 -07:00
Jungshik Jang
46038ae020 Merge "Add SendMessageCallback to Hdmi control service." 2014-05-23 03:18:29 +00:00
Dmitriy Ivanov
190ed5db4a am 2137d6a8: am d5ee4144: Merge "Increase start timeout for wrapped process"
* commit '2137d6a843b82996e08f0e03376e48860919d8bc':
  Increase start timeout for wrapped process
2014-05-23 02:40:42 +00:00
Dmitriy Ivanov
2137d6a843 am d5ee4144: Merge "Increase start timeout for wrapped process"
* commit 'd5ee4144c4beae54219e1b8eb10418b02dd4a63b':
  Increase start timeout for wrapped process
2014-05-23 02:35:42 +00:00
Jungshik Jang
d643f764f7 Add SendMessageCallback to Hdmi control service.
As we have separate IO thread, we should have async callback
mechanism to get result of send request.
For that, I added SendMessageCallback interface to HdmiControl
Service
Along with this, replace message-based IO handling with
post Runnable based one for consistency

Change-Id: I61cf5b751b4f2af3b34956060869f3512f161d11
2014-05-23 11:14:15 +09:00
Christopher Tate
d9a6475c9c DO NOT MERGE - Don't crash uninstalling updates to system apps
Bug 15167960

Cherrypick from master

Change-Id: Ibcb3275adb27b20939a237511aaaa8b0011127e1
2014-05-22 19:03:01 -07:00