17358 Commits

Author SHA1 Message Date
Winson Chung
2eb4f9c377 DO NOT MERGE
Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
2014-05-27 17:07:52 +00:00
Winson Chung
8f4f2ff5cb Merge "DO NOT MERGE " into lmp-preview-dev 2014-05-27 17:07:10 +00:00
Craig Mautner
c752919c7c Merge "Do not start tasks on ActivityViews unless explicit. DO NOT MERGE" into lmp-preview-dev 2014-05-27 16:37:45 +00:00
Craig Mautner
b539b3aafb Do not start tasks on ActivityViews unless explicit. DO NOT MERGE
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.

Fixes bug 15162447.

Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
2014-05-27 09:22:55 -07:00
Craig Mautner
5d0045835b Merge "Add more error checking to xml restore" into lmp-preview-dev 2014-05-27 16:13:28 +00:00
Craig Mautner
b45a730efb Merge changes I88865c02,I34cc1310 into lmp-preview-dev
* changes:
  Check for null DO NOT MERGE
  Improve DocCentric documentation. DO NOT MERGE
2014-05-27 14:24:04 +00:00
Craig Mautner
8aa29921df Merge "Only start TaskPersister once." into lmp-preview-dev 2014-05-27 14:22:04 +00:00
Craig Mautner
bf1bf9dea7 Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev 2014-05-27 14:14:34 +00:00
Craig Mautner
e0129b3c67 Add more error checking to xml restore
Bad files and OS updates can cause the restore to throw an NPE.
Rather than bring down the server process over this, just delete
the persistent file and keep going.

Fixes bug 15219594.

Change-Id: Id9cd39988ff93a26def036a05c46209364f2a4c0
2014-05-27 06:56:44 -07: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
Craig Mautner
87f851d0ba Only start TaskPersister once.
Because ActivityManagerService.systemReady() is reentrant we could
restore tasks and start the TaskPersister more than one time. This
fix limits operations on TaskPersister to one time only.

Fixes bug 15256579.

Change-Id: I6bf2c26b37acdfd9b15a6f277966966b743d03b6
2014-05-26 16:52:58 -07: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
Craig Mautner
1f74bad9ac Check for null DO NOT MERGE
Fixes bug 15129354.

Change-Id: I88865c021a024ab94e44dc71f09f8325a79e0775
2014-05-24 09:54:36 -07: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
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
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
Winson Chung
376543bc5f DO NOT MERGE
Invalidating screenshots when we resume the task that they were taken in. (Bug 13587139)

- Removing multiple calls to get the same thumbnail screenshot
(cherry picked from commit d4ce870e9ad24eff444443bd19ca2061f7c3099d)

Change-Id: Id1feea856a1374173c7f0d329d6f11482794df1a
2014-05-23 16:58:15 +00: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
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
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
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
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
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
Dianne Hackborn
2932513181 (DO NOT MERGE) Battery monitoring fixes:
- Improve monitoring of level changes to not be confused
  when it goes up while draining or down while charging.
- Put back in connectivity service code to tell battery
  stats about the interfaces.
- Turn back on reporting of mobile radio active state
  from the RIL.
- Fix bug in marshalling/unmarshalling that would cause
  the UI to show bad data.

Change-Id: I733ef52702894cca81a0813eccdfc1023e546fce
2014-05-22 16:43:17 -07:00
Christoph Studer
3e144d3dfc NoMan: Allow SysUI to register as listener
Expand ACL of INotificationManger.registerListener() from
system only to system or SysUI.

Also call onListenerConnected() on listeners connected via
INotificationManger.registerListener().

Bug: 15131411
Change-Id: I8f2ce34325ad72c7740b383de2ebb9fb88dea5d3
2014-05-22 23:45:07 +02:00
Christoph Studer
71f18fd1b6 SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE
In preparation of migrating to NotificationListenerService,
remove dependence on IBinder keys for notifications and switch
to SBN.getKey() instead.

Bug: 15131411
Change-Id: Ic272e4a05fde6481c734144c5b34c49b2f021649
(cherry picked from commit 7c96ae873d9a54ebaeb5b7ef21b48224dc42d094)
2014-05-22 21:41:13 +00:00
Yohei Yukawa
4fae8e165b Merge "Remove unnecessary internal lock" 2014-05-22 11:07:14 +00:00
Yohei Yukawa
5a647b69be Remove unnecessary internal lock
Previously, InputMethodSubtypeSwitchingController has relied on
its own internal lock for #getNextInputMethod and
class has to be invalidated whenever
InputMethodManagerService#mMethodMap is updated, any method of
InputMethodSubtypeSwitchingController should be called under
the global lock of InputMethodManagerService#mMethodMap.

As a consequence, we can conclude that
InputMethodSubtypeSwitchingController does not need its own
internal lock.

This CL also adds additional synchronization blocks into
the constructor of InputMethodManagerService to address the
existing inconsistency that methods with *Locked suffix are
called without the lock actually.

BUG: 7043015
Change-Id: I9d4d3d7232c984432185c10c13fb726a6158cac8
2014-05-22 18:18:02 +09:00
Lorenzo Colitti
521d8cdae0 Merge "Make the EthernetManager available." 2014-05-22 05:55:56 +00:00
Jinsuk Kim
dbbceffd9b Merge "Add feature actions for HDMI-CEC playback device" 2014-05-22 03:19:23 +00:00
Jungshik Jang
0ddf4db856 Merge "Add finish() after timeout of Reqeust Arc operations." 2014-05-22 02:42:19 +00:00
Jinsuk Kim
78d695d8ba Add feature actions for HDMI-CEC playback device
- OneTouchPlayAction
- DevicePowerStatusAction
- addHotplugEventListener
- removeHotplugEventListener

Change-Id: Ia7f31507ca62127efbacbbfe07ab43ba1f9bd4cf
2014-05-22 11:15:51 +09:00
Lorenzo Colitti
f1cc12950c Merge "Delete the EthernetDataTracker." 2014-05-22 01:01:50 +00:00
Lorenzo Colitti
5569ba20b6 Merge "Fix a typo in IpConfigStore." 2014-05-21 23:53:47 +00:00
Lorenzo Colitti
f9ff2c9ae5 Make the EthernetManager available.
Change-Id: I7a60e977d7a40a5d0367168f2f6633ccae591ac4
2014-05-21 16:41:24 -07:00
Lorenzo Colitti
3c44c99af5 Delete the EthernetDataTracker.
Code search says these are the only two files that use it. The
tracker will be resurrected in a slightly different form in
frameworks/opt/net/ethernet.

Bug: 14993642
Bug: 14981801
Change-Id: I2477668ca78dfe46661dda1d97c7f786fd7eba35
2014-05-21 16:40:46 -07:00
Lorenzo Colitti
56cf7c517e Fix a typo in IpConfigStore.
Change-Id: I1fc845bf4547ae9a86db02ed29b6d5ba60a01277
2014-05-21 16:38:11 -07:00
Winson Chung
7220faeec6 Merge "Small perf tweaks." 2014-05-21 23:12:32 +00:00
Winson Chung
47a3e65acc Small perf tweaks. 2014-05-21 16:03:42 -07:00
Svetoslav
f34771187b Merge "Fixing bugs due to the new custom accessibility action APIs." 2014-05-21 21:59:19 +00:00
Svetoslav
5c4cd189f2 Fixing bugs due to the new custom accessibility action APIs.
1. AccessibiltiyAction was incorectly throwing an exception when
   a custom action was constructed.

2. AccessibilityManagerService should no longer enforce only standard
   actions as we allow custom ones too.

bug:15110963

Change-Id: Iea57e0a6449b87bd8d103c55ca255e80705f2565
2014-05-21 14:53:25 -07:00
Jason Monk
711b7a5428 Merge "Don't exit lock task on sleep" 2014-05-21 20:58:48 +00:00
narayan
a562f5daf6 am 82ec8c58: am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '82ec8c58b1f1cd0cce56d11b7679440f6ba54f4a':
  Fix NPE in PackageManagerService.
2014-05-21 20:49:09 +00:00
narayan
82ec8c58b1 am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit 'ab3d85ab1a0ae58add5df6efc30607624475405b':
  Fix NPE in PackageManagerService.
2014-05-21 20:22:03 +00:00
narayan
ab3d85ab1a am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '838b1e2215cbc27e77530f4c79124c088353e0e7':
  Fix NPE in PackageManagerService.
2014-05-21 20:17:52 +00:00
Jason Monk
2d437d0461 Don't exit lock task on sleep
Change-Id: I332088ce31ce06a771461a78fcc63f4afc824813
2014-05-21 16:06:53 -04:00
Christoph Studer
cee44ba418 Simplify NotificationListenerService API
Use ParceledListSlice to send the list of active notifications
from NoMan to NotificationListeners.

This allows us to simplify the API to what it was before
introducing the "String[] key" workaround for dealing with large
numbers of StatusBarNotifications.

While we're at it, rename Ranking.getIndexOfKey to something that
makes more sense.

Bug: 15126927
Change-Id: I02c2087978c6c4ec1198be496c6250a66143ecb3
2014-05-21 22:03:45 +02:00
narayan
0cfe875ac5 Fix NPE in PackageManagerService.
Check that each package from the setting has
a parsed pkg before we attempt to perform dex-opt
on it. If it doesn't have a parsed package, adjust
the ABI in the settings, but don't perform dexopt.
It will be dexopted later if it's still active
based on the setting.

bug: 15081286

Change-Id: Ifb6d1d5efdc9c59b251731972afa951ad930d05c
2014-05-21 21:00:48 +01:00