• Home
  • History
  • Annotate
  • only in /frameworks/base/services/core/
History log of /frameworks/base/services/core/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
ba35a77c7c4494c9eb74e87d8eaa9a7205c426d2 28-Oct-2014 Jason Monk <jmonk@google.com> Add missing passive discovery flag

MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time. Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.

Bug: 18042409
Bug: 17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
ava/com/android/server/media/projection/MediaProjectionManagerService.java
60e46f609b6b0d03d87c3d631f423a859034edd0 24-Oct-2014 Paul Lawrence <paullawrence@google.com> Stop crypto UI from crashing during encryption

Don't try to read crypto meta data during this time

Bug: 18037893
Change-Id: I3628572b3b90e6fc0a7c71089b447fb0e5303ee9
ava/com/android/server/MountService.java
5c0f472d82b797317c79b31e4501a6d54b40ee34 21-Oct-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE

A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.

Bug: 17408780

Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
(cherry picked from commit b22d9ee0a364b10d488dd6a2e8ba69d5ca7f6258)
ava/com/android/server/hdmi/HdmiControlService.java
7b4a38b197ce43cb286d80fc6c4e9713b2807f13 21-Oct-2014 Adrian Roos <roosa@google.com> Delay discovery of system trust agents

Waits for BOOT_COMPLETED when enabling system trust agents.
This fixes an issue where no agents were discovered because the
packages were not ready after an OTA.

Bug: 18065140
Change-Id: Ibff9948e1536e07f868d6b29f432923a137091e6
ava/com/android/server/trust/TrustManagerService.java
a6711ff6f09cc25c693cbb50452e3f807c6122f5 17-Oct-2014 Svetoslav <svetoslavganov@google.com> Accessibility no longer overrides strong encryption.

Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
ava/com/android/server/MountService.java
b7d8514822aefbf8274f5464dc12cee151e2b78b 16-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
917c547beb9adecf2e7d2b355e85e37c2557c5d3 16-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Don't make lockdown VPN source firewall rules over-broad." into lmp-dev
28dcf0345b2857884c1f1639fadb720318445187 16-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
5d460b88715c8a902eb3930e690ddd1b8d84338f 15-Oct-2014 Craig Mautner <cmautner@google.com> Merge "Remove unnecessary logging." into lmp-dev
3d7485c1728b56dd5cde7b0097c907ad494702a8 15-Oct-2014 Craig Mautner <cmautner@google.com> Remove unnecessary logging.

Change-Id: Ia5b5325707f2f02f2c585130938565065e974938
ava/com/android/server/am/ActivityStackSupervisor.java
e52791055c855a957cad767dfa9889faae86660c 15-Oct-2014 Craig Mautner <cmautner@google.com> Merge "Move desired task to top if not already there." into lmp-dev
737fae2b2ea77e390c0dc1c91e9e1a98dac07d22 15-Oct-2014 Craig Mautner <cmautner@google.com> Move desired task to top if not already there.

Under certain circumstances when launching a new activity, the
topmost stack activity is moved to the front even though the
activity is being created in a different task.

This checks if the topmost stack task matches the desired
task and if not, moves the desired task to the top.

Also make activity dump ordering consistent.

Fixes bug 17721767.

Change-Id: I59397f31b629a208f3863887c57d6f6fb1f6e1f3
ava/com/android/server/am/ActivityStackSupervisor.java
b2344c81bcf49129d303a2919cfffd7a720c261b 15-Oct-2014 John Spurlock <jspurlock@google.com> Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
c7be69f1d63bcc8411875ff53e5561f2f4692072 15-Oct-2014 RoboErik <epastern@google.com> Merge "Don't call size on a null metadata" into lmp-dev
421c9df7ff52f8c43fd5356a59702931f39dc029 15-Oct-2014 RoboErik <epastern@google.com> Don't call size on a null metadata

bug:18002951
Change-Id: I3a2d2c781e7b235efbd8518d60eee7f44bbacd75
ava/com/android/server/media/MediaSessionRecord.java
e5b42d97f6fd3eb0220ea84f21e60d530d93fc46 15-Oct-2014 John Spurlock <jspurlock@google.com> Leave zen when apps set ringer-mode = non-silent (normal/vibrate).

Apps can end up in priority mode by setting ringer-mode = silent.

Now they can leave priority mode by setting ringer-mode = non-silent.
(normal or vibrate)

Bug: 17884168
Change-Id: I54c853885f4ae9ee618041dd7ac6ab0663fc7b37
ava/com/android/server/notification/ZenModeHelper.java
88a6ed5477eb6fa0453f9f29adef4c11b6eeade0 15-Oct-2014 Jeff Sharkey <jsharkey@android.com> Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
97d47ed036ff7bd3d7d2ddc1c6df1104ec237559 15-Oct-2014 Jeff Sharkey <jsharkey@android.com> Reduce PackageInstaller Binder memory pressure.

When restoring hundreds of apps on low-DPI devices, we end up sending
icon Bitmaps inline in the response instead of splitting into ashmem
regions. To avoid triggering TransactionTooLargeException, switch to
using ParceledListSlice under the hood.

Bug: 17926122
Change-Id: Ib4da6775e79d2fcb4aaea15f58ed998df203a5f9
ava/com/android/server/pm/PackageInstallerService.java
ad4cd0c01966017e2f51ec3d23d06de3874f100c 15-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Allow root and system to bypass the always-on VPN firewall rules

This is needed to allow the always-on VPN to survive network
switches. In L, network switches are graceful, and in order to
switch to a network, the system first has to validate it using
DNS requests (from netd, running as root) and HTTP requests
(from NetworkMonitor, running inside the system_server).

This should also allow always-on VPN to work on networks like
T-Mobile that use 464xlat, fixing a bug that has been present
since K.

Bug: 9597277
Bug: 17695048
Change-Id: I0daa5707f2139339f9ececde0e73aac3bf23fdc3
ava/com/android/server/net/LockdownVpnTracker.java
02c7abac856c3e94f4a2714d673cefb65c55efb7 15-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Don't make lockdown VPN source firewall rules over-broad.

Currently, the lockdown VPN adds firewall allow rules matching
the whole subnet that the server assigned, so for example if
the VPN server assigns it the IP address 10.1.23.5/8, it will
allow the whole of 10.0.0.0/8 to pass the firewall.

This is needlessly overbroad and has a particularly bad corner
case where if the prefix length is 0, everything is allowed.

Bug: 17695048
Change-Id: Idbec4b3aea0f72f9bdfd26dcd72d6a97d026fb12
ava/com/android/server/net/LockdownVpnTracker.java
0cb7903ddedbbb8a8171926e4460b74af589369d 15-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Propagate network state changes to the LockdownVpnTracker.

Bug: 17695048
Change-Id: I10378df0ab545729a6a315fd1bc8870cd98f47b3
ava/com/android/server/ConnectivityService.java
ava/com/android/server/net/LockdownVpnTracker.java
5873c3e862b83fb0c64b52b86bdd8f26ff8ffb5f 15-Oct-2014 Jinsuk Kim <jinsukkim@google.com> Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev
9797880808320e3a7bae1f59bc7e0c5a13189e5f 14-Oct-2014 Jeff Sharkey <jsharkey@android.com> Start cross profile intents as caller.

The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.

Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
ava/com/android/server/am/ActivityManagerService.java
eaab72ac4198fcc02090da11b1e942e6e338696a 10-Oct-2014 Jinsuk Kim <jinsukkim@google.com> DO NOT MERGE CEC: Queue actions for starting later when not ready

Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.

Bug: 17985588
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7

Conflicts:
services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecFeatureAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ea4966442cd035e592aa73c0c29225efe3f091fb 15-Oct-2014 Craig Mautner <cmautner@google.com> Merge "Add null check" into lmp-dev
29c58cad4ef8a14ec0a723318a92da85c8325c88 15-Oct-2014 Craig Mautner <cmautner@google.com> Add null check

Unable to examine bugreports that die in the middle of dump().

Help for bug 17721767.

Change-Id: I31a5e03acf67c926a1cbfefe2a7ea7fca3b71b06
ava/com/android/server/am/ActivityRecord.java
dbfbb17512fe6a5b3c7198d60b6a149969174a71 30-Sep-2014 Jeff Hao <jeffhao@google.com> Backport of ordering apps for boot dexopt.

This is a squashed commit of the following changes:

1. Order apps by priority when performing boot dexopt.
(cherry picked from commit 65cde7d42d741c7d9aa2714a397b7333f688ab55)

2. Improve priority ordering of apps when performing boot dexopt.
Added core apps and updated system apps.
(cherry picked from commit 272bf3a274daff62995caf05da338c1f2a73dae3)

3. Stop boot dexopt when low on memory.
(cherry picked from commit 1d892dcb6b0ff3a50cc63e387667dc29baf1014f)

Bug: 17641843
Change-Id: Ie32f1c21047d3462aaf728f7633fecf647ba2b47
ava/com/android/server/pm/PackageManagerService.java
35de0e2872b64f78b596a850d6da2c483ba65bb5 14-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev
f85e7af4d009862fc799c7232ec5cf9e2dc9fa34 14-Oct-2014 Dianne Hackborn <hackbod@google.com> Fix issue #10034864: Define YouTube application as the preferred...

...handler for its Intents

Fix bug when a third party app is installed as an additional but
worse match for the intent.

Also raise up the limit for when we start printing logs about
overly large strict mode data.

And turn off the logs about services being created and destroyed,
since with the way things are using services these days these have
become way too spammy.

Change-Id: I8fe301dfd80fb4b70213cb7783b7c5426245278d
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/pm/Settings.java
c130b428c5d7eb25dc7651c5cea82182f2241ddf 13-Oct-2014 Elliott Hughes <enh@google.com> Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev
9c33f28d912c9b51bff69e3eaad7090a6b8a3ec3 13-Oct-2014 Elliott Hughes <enh@google.com> Ensure that the SIM language doesn't override the user language on the encryption UI.

Bug: 17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17
ava/com/android/server/MountService.java
2dfd8d578a0c5b90ee10ce1f3ddb4aeb0e948f60 13-Oct-2014 Yohei Yukawa <yukawa@google.com> Merge "Update config when "Show input method" is changed" into lmp-dev
265d3e9d3eb6915d9ca9da5fcd1ddb29b5f8bc3b 13-Oct-2014 Michael Wright <michaelwr@google.com> Merge "Clean-up ColorFade's shaders and buffers." into lmp-dev
ce09f5a53c8408d995c116a4430c000574d9875a 11-Oct-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17829949: Don't kill Bluetooth service...

...even in extreme low memory condition

Bind to Bluetooth with BIND_IMPORTANT, so that it is allowed to
go to a higher oom adj level.

Fix some problems when this is done from a system or persistent
process, where this would go to a level that is *too* high. Instead,
introduce a new oom adj level for it that is right below persistent.

Change-Id: I002bcc4accc36c8579c4cda161be7d2fba21ba17
ava/com/android/server/BluetoothManagerService.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ProcessList.java
8629784bbb31e5edace15dfe025317c708723ebd 10-Oct-2014 Yohei Yukawa <yukawa@google.com> Update config when "Show input method" is changed

This is a follow up CL for I2237ded850a0d4ab43ca441d0b7df1.

Seems that we still need to update config settings every
time when "Show input method" is changed.

BUG: 17666032
Change-Id: I480aeaa038bef9c3c20e8f0b36110e92a35809db
ava/com/android/server/wm/WindowManagerService.java
294297df4e3f327a81d922563c518aee8ee3e51d 10-Oct-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev
ab4a81b3c625e33d04ae8070fcce6b6baee6522c 10-Oct-2014 Dianne Hackborn <hackbod@google.com> Improve some docs, fix some debugging.

- Add docs to Binder, Messenger, ResultReceier to explain their
relation (or lack there-of) to process lifecycle.
- Clarify some aspects of process lifecycle for services.
- Fix help text of am command.
- Fix per-package dumping of battery stats to not include history.
- Fix per-package dumping of proc stats to only include aggregated
and current stats and fix some formatting.
- Fix per-process dumping of meminfo to have an option to interpret
the input as a package, so including all processes that are
running code of that package.
- Fix top-level per-package debug output to correctly include all
of these improvements and give them a little more time (10s) to
complete for timing out.

Change-Id: I2a04c0f862bd47b08329443d722345a13ad9b6e2
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/am/ProcessStatsService.java
5018df761ba7dfa443a9abc728ddcd20d51a75c2 09-Oct-2014 Michael Wright <michaelwr@google.com> Clean-up ColorFade's shaders and buffers.

Bug: 17672241
Change-Id: I73328ee4d83c3a8700b7b19b661bcaec7ada877f
ava/com/android/server/display/ColorFade.java
fdf5b35ab46639759d6389a4e2a4d5799cb6814b 09-Oct-2014 Dianne Hackborn <hackbod@google.com> Implement issue #17906468: Allow search request to fall back to global search

Change-Id: I04834b2a9f1ec4a68c6a3fed14da2f8dd93b3be7
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/search/SearchManagerService.java
2e0f66820e12bbd24f476fba863d9dab564c6f97 09-Oct-2014 Christopher Tate <ctate@google.com> Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev
da058e260d1c5ac8039034b38db8c697c16017bb 08-Oct-2014 Christopher Tate <ctate@google.com> Also monitor MOVED_TO events for wallpaper updates

Restore uses moveTo(), not open/write/close, so we need
to watch for that as well. Now the wallpaper service sees
and regenerates the wallpaper image immediately upon restore.

Bug 17909454

Change-Id: I0db224c3d507bdc40399d49bb4bea01899f76ad1
ava/com/android/server/wallpaper/WallpaperManagerService.java
704998abbafea84c28c0bcd0c540af87562b4cc9 09-Oct-2014 Jeff Brown <jeffbrown@google.com> Merge "Ensure we correctly unblank displays when added." into lmp-dev
a78601dc1929428007fdbb07da0a07ae3fb60bd5 09-Oct-2014 RoboErik <epastern@google.com> Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev
6eb0f4808dd984a7fa45da5eca03b4c5d8ff9327 08-Oct-2014 Georgi Nikolov <geonik@google.com> Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev
724dbbd7330f6e3d03c2eab394b22495ec1c7cc4 08-Oct-2014 Ye Wen <ywen@google.com> Make MmsServiceBroker more robust to MmsService crashes

Retry connecting to MmsService when disconnected or upon each API call
if disconnected.

b/17862188

Change-Id: Iecfb0a6ffb59b94f6c1121bf00ba2db438ed7001
ava/com/android/server/MmsServiceBroker.java
0033a86c25fde70911086c3d8ff2738aa88c0ff6 08-Oct-2014 Jeff Brown <jeffbrown@google.com> Ensure we correctly unblank displays when added.

A previous change introduced a regression in the case where
a device has been added but is initially blanked. Because
we made changes to defer certain work until we escape the
critical section when making changes to the global display
state, we forgot to apply these changes when displays are
initially added.

This causes problems with HDMI displays remaining blanked
after they are plugged in.

Added a quick fix to ensure we perform the work when adding
a display although we don't bother trying to defer it outside
of the critical section.

Bug: 17909838
Change-Id: If5373d20d8827b7f4330a8cf49f8de64ca3f0740
ava/com/android/server/display/DisplayManagerService.java
326f230ceba67a9b72d2606f7c503bef6f938ddd 08-Oct-2014 Georgi Nikolov <geonik@google.com> BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler

Change-Id: Ida7af915c5b616216692493434b63c521398dfb0
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/JobServiceContext.java
ava/com/android/server/job/controllers/StateController.java
89b196958fee07475765bd3c458098464ba16f2e 08-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Put in real "code" (aka marketing) name." into lmp-dev
82df2c0839876d158889ea0e28e6f3adf0d4797d 08-Oct-2014 RoboErik <epastern@google.com> Ensure metadata bundles are unparceled before making them available

Bundles can't be read from multiple threads safely. This adds locking
around a read that had been previously overlooked and ensures that
unparcel is called on the metadata before it is even available to
other threads.

bug:17894033
Change-Id: I9a4b86a0d0af05b1dcba28a52df2e7a87c685704
ava/com/android/server/media/MediaSessionRecord.java
955d8d69ea6caabce1461dc25b339b9bf9dc61a6 08-Oct-2014 Dianne Hackborn <hackbod@google.com> Put in real "code" (aka marketing) name.

Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/dreams/DreamManagerService.java
ava/com/android/server/notification/ManagedServices.java
229c422c7bccddf4f55bad5fde8161828347906c 08-Oct-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Prevents HdmiControlService from turning on TV on wakeup

The feature causes Fugu to turn on TV for unexpected cases.
Disables the feature until we figure out a better way to find
right wake up events.

Bug: 17875468
Change-Id: Icfb04f40e5b13f751b7466ea9789ba8eadcddea6
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
d76f80bd3a38e11d27935cbe461c3a9d4243dd76 08-Oct-2014 keunyoung <keunyoung@google.com> Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev
030a93feb896d228317eb8dba6a89743c4d26dd7 07-Oct-2014 keunyoung <keunyoung@google.com> ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window

bug: 17677973
Change-Id: I2666a1c1cf8956e60d7261912da34d1999131eba
ava/com/android/server/wm/WindowManagerService.java
d876a1d368c668c17aca2b9c96ff012befb49dcf 07-Oct-2014 dcashman <dcashman@google.com> Add mProperSigningKeySet to PackageKeySetData constructor.

Bug: 17847565
Change-Id: Iafa9650140e82d244d2336a07232bd40bf3c5eb8
ava/com/android/server/pm/PackageKeySetData.java
41bb3455e44dc8fde4569bbfd56fa20c6da8a27d 07-Oct-2014 Amith Yamasani <yamasani@google.com> Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
aa6634eaca707f7cbf5f5a1d75b90d8d775d254b 06-Oct-2014 Amith Yamasani <yamasani@google.com> Set the default user restrictions to disallow calling and sms

When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
ava/com/android/server/pm/UserManagerService.java
99586dc0108d0f4311c8af4d06ed113bbf40a6ee 07-Oct-2014 Jeff Sharkey <jsharkey@android.com> Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
02bd78490d8594d225ecc70a74b2058cb968a657 07-Oct-2014 Jeff Sharkey <jsharkey@android.com> Reduce PackageInstaller I/O pressure.

When performing a restore during initial device setup, we could be
installing hundreds of packages. Currently, we're writing all
metadata (including heavy icons) for every session mutation! Because
we're holding the mSessions lock while writing all this heavy data,
we end up causing ANRs when apps call other PackageInstaller APIs.

This patch mitigates by moving the heavy icon data into separate
per-session PNG files, which we only persist when changed.

Bug: 17881962, 17567794
Change-Id: I4dee15d4a65a8eb65c381e6bb7477728b6cc30d2
ava/com/android/server/pm/PackageInstallerService.java
7f7d240b13b96b617e298c6178af0425308f5ef9 06-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
71c4578def00a5a4b9e159fd1ab88e616bc7e159 06-Oct-2014 Yuncheol Heo <ycheo@google.com> Merge "CEC: Reset active source status on routing control" into lmp-dev
995fcfc5919b7375d2d8cbc2ca5e08e193ffaf17 06-Oct-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Reset active source status on routing control

Set active source status to false when broadcast routing control
commands indicate other device is about to be the new active source.

Bug: 17840270
Change-Id: I176e21ec8789624e29421b912ba641a21f0f5f21
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
4c88087776305f54bec0aae59b8e63bc803c1401 06-Oct-2014 Jeff Sharkey <jsharkey@android.com> Merge "Recover from missing upgrade to system package." into lmp-dev
1c133105774835deaa99db78d9668b107246abef 05-Oct-2014 Jeff Sharkey <jsharkey@android.com> Recover from missing upgrade to system package.

When a system app has been upgraded, we mark the built-in version as
disabled, and skip it when parsing built-in apps, since we expect
the userdata version to be scanned a few moments later.

However, in very rare cases we can end up missing the expected
userdata version, and we'd end up dropping the package entirely, even
though we have a built-in version to fall back to. This change
handles that case by rescanning and enabling the built-in version when
the userdata version never materializes.

Also include critical log messages in check-in dumpsys to help track
down how we ended up in this state.

Bug: 17805839
Change-Id: I9971f882f9bb8ab7934c20b04e0b72366c4d04d0
ava/com/android/server/pm/PackageManagerService.java
3438bc1bfd363e1ee656b33ebc8d0e6744470aec 05-Oct-2014 Jeff Sharkey <jsharkey@android.com> Merge "Correctly rollback failed system app installs." into lmp-dev
914bd793b3415a198d0cb4216ff9da0a184ab803 04-Oct-2014 Jeff Sharkey <jsharkey@android.com> Correctly rollback failed system app installs.

Fix bug where we disabled system app, but never turned it back on
when the scanPackageLI() failed.

Bug: 17805839
Change-Id: I73999263aee703af187afd980fa0d0ce8451cf0c
ava/com/android/server/pm/PackageManagerService.java
f393e4910b42b2c9fd4dd6f970455649e00902e5 04-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
2d7576b082b84068fb9d68419b710b9bec49139b 04-Oct-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17752399: Multiple apps broken by GET_TASKS permission change

Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/PackageManagerService.java
483d1fb3a6b55c1309cbc2948b261fae936965e0 04-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Switch the NetworkInfo.mIsAvailable default

The placeholder for disconnected networks was setting it to false, but
this technically means that we know an attempt to connect to that
network will fail (which we don't really now). Some applications use
this an decide not to bother trying - an MMS app for example would
never send an MMS because it thinks the network is never available.

This is a L regression.

bug:17669247
Change-Id: Id6041f226da069c267c56418d42c55978c36c66f
ava/com/android/server/ConnectivityService.java
900e3b5fc5bb4bf4947f63c0fed0757dfb7effa6 04-Oct-2014 Jeff Sharkey <jsharkey@android.com> Merge "More durable logging around system app upgrades." into lmp-dev
3933a5dc8c8c04458c5b8c01919d7449c6d00497 04-Oct-2014 Jeff Sharkey <jsharkey@android.com> More durable logging around system app upgrades.

We've been seeing some really funky behavior when upgrading or
downgrading system apps around OTA time. Put more of these one-time
logs into durable storage to help investigate.

Bug: 17805839
Change-Id: If898d7df229c1f71e598b0d965325c272060e5e7
ava/com/android/server/EventLogTags.logtags
ava/com/android/server/pm/PackageManagerService.java
b88ba912f6bb2fd0ae16794470cce38ee308b6ea 03-Oct-2014 Christopher Tate <ctate@google.com> Merge "Fix alarm delivery-order sorting" into lmp-dev
1590f1ee7b7b7962f08e8cc29b9891b2ad124c9b 03-Oct-2014 Christopher Tate <ctate@google.com> Fix alarm delivery-order sorting

We also refine the order of delivery within any given package. Now,
we identify which apps have wakeup alarms being delivered in the
current pass, and deliver all of that app's alarms before moving
on to alarm delivery to apps who are only receiving non-wakeup alarms
in the current delivery pass. The TIME_TICK alarm is also hoisted to
the start of the current delivery pass if present.

Bug 17778686

Change-Id: I6306a00fe657787a77d0254c0807ac51e810fdcf
ava/com/android/server/AlarmManagerService.java
24861eabe641d5a147f127c8e7f98fab949224ab 03-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Send callbacks for Net property changes" into lmp-dev
a23867c4e8efb4cd9e86c70bff1a595da6679a82 03-Oct-2014 John Spurlock <jspurlock@google.com> Merge "Disable notification effects during phone calls." into lmp-dev
a848c1cc0a7b72b192aef9de2d448b3e1d17619c 01-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Send callbacks for Net property changes

LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
ava/com/android/server/ConnectivityService.java
a11b5e34f50899a48531bb84ba3f6d796a64985e 03-Oct-2014 Paul Jensen <pauljensen@google.com> Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev
6eead851d2ea56c3e7319587d4066b1828d54699 03-Oct-2014 Paul Jensen <pauljensen@google.com> Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev
32fe4c6e642ae8a2b36136e33040e12f88aa5e07 02-Oct-2014 John Spurlock <jspurlock@google.com> Disable notification effects during phone calls.

Listen for phone call state changes in NoMan, and disable
incoming non-call notification effects when non-idle.

Bug:17658454
Change-Id: I6f7d66413970fbff6822ab29a12f91cbed068261
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenLog.java
ava/com/android/server/notification/ZenModeHelper.java
b591da942e159588c70687dfe3e792feedc8f3b4 03-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything" into lmp-dev
3f16dd49e8fe33f64d290a41ad1cb32c8a333ce6 03-Oct-2014 Dianne Hackborn <hackbod@google.com> Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything

Tweak the oom tuning to raise everything by 50%. This is the same
increase we did for Volantis; I am thinking that most of the issue
there was not it being 64 bit, but it being tighter on RAM. From
my testing, it looks like in user switching there was some paging
going on with Nakasi, and with this change things seem to be better.

We should probably revisit this for future work on RAM. It seems
likely that a 64 bit device will need more RAM, so probably the value
I am picking here is larger than we actually need for other devices.
I think this is the safest change at this point though -- it leaves
Volantis the same, where we already had tweaked it to address paging
issues, raises it on Nakasi (to the same value as Volantis) where we
seem to have paging issues, and on our other devices also raises it
but those are generally not under memory pressure so this shouldn't
really make a difference.

Change-Id: Ib19394068734d322a015ed07370d9d4961877e4b
ava/com/android/server/am/ProcessList.java
519006395204ba3eab77ae420d20eb70ebb78af5 03-Oct-2014 Jason Monk <jmonk@google.com> Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev
9cdde5f8348ddd03e1d6eb2c741fb3e761ab66e9 02-Oct-2014 Baligh Uddin <baligh@google.com> Merge "Fix a bug with screen brightness during screen off animation." into lmp-dev
5c6756fefb6db0fe468b9d747960a6da344880ad 02-Oct-2014 Matthew Williams <mjwilliams@google.com> Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"

This reverts commit cf2bd348e73e880fe5bfc7a025732d4ec606ff1f.

Reverted because for account removal the AccountManagerService
delegates the sending of LOGIN_ACCOUNTS_CHANGED to the authenticator.
See b/17511110.

Change-Id: Ic03016af98070b4add5f7a5ec1fdff32ba63298e
ava/com/android/server/content/SyncManager.java
d594197868c4a51bb8f8bd62479999debc72bf2a 01-Oct-2014 Jing Ji <a5705c@motorola.com> Allow system app to take ownership of built-in permissions

Previous commit bfed9f34c makes the preloaded system app take
precedence over third-party apps when defining permissions, but
it also makes it be able to override android built-in permissions.

Now allow preloaded system app to take the ownership of built-in
permissions instead of overriding it.

Change-Id: I10d588d0284e4316ea4be552fd6191f33e3c725b
ava/com/android/server/pm/PackageManagerService.java
9dfad8c7f01e8a69989d1c44deb8a621216a0d9f 02-Oct-2014 Craig Mautner <cmautner@google.com> Merge "Remove misleading error log." into lmp-dev
bf4e414cf0d0f512a0929ecd4e662a925d7684f0 02-Oct-2014 Jeff Brown <jeffbrown@google.com> Fix a bug with screen brightness during screen off animation.

Due to a recent change there was a regression that caused the
screen brightness to be animated down to 0 while the screen
off animation was running. When the brightness was low this
would cause the screen off animation to be cut short.

This change ensures that we take into account the actual screen
state instead of the desired screen state when making screen
brightness decisions in case we are in the middle of a transition.

The darkness came early. The pixel fairies trembled.

Bug: 17718416
Change-Id: Ib4b55d61b359abbc70920e324f08a5db07bdd035
ava/com/android/server/display/DisplayPowerController.java
cf0f97a3aa754f5e75bf1dc5d4e78ca46aa17513 02-Oct-2014 Jason Monk <jmonk@google.com> Synchronize on all sendProxyBroadcast calls

To avoid race conditions. Also make mDefaultProxy volatile for
safety.

Bug: 17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf
ava/com/android/server/ConnectivityService.java
333c2ec88305a71ab1d59bf0482193273fac61af 02-Oct-2014 Craig Mautner <cmautner@google.com> Remove misleading error log.

It's perfectly ok for a secondary display to not have a home stack.
There is no reason to report it.

Related to b/17677973.

Change-Id: Ia9d52cabb601760d32d2b847dfa0ca4f304e4e2a
ava/com/android/server/wm/DisplayContent.java
c8b9a7428d12a782deda1b807164f0ec74d1ad12 30-Sep-2014 Paul Jensen <pauljensen@google.com> Send updated NetworkAgent score to NetworkFactories when validated.

Previously the score was not sent out causing other NetworkFactories
to have the lower unvalidated score and to repeatedly try to bring
up a new Network only to have it torn down.
Also, avoid logging an error when tearing down a network with only
listening requests.

bug:17726566
Change-Id: I82ff7c9bd5ec962f62a50ad0042c278622953969
ava/com/android/server/ConnectivityService.java
4b9b2be8945a4f22676ea948ae260108159e26a3 26-Sep-2014 Paul Jensen <pauljensen@google.com> Allow any unvalidated Network to satisfy NetworkRequests.

Explicitly selected Networks may never be validated (e.g. Chromecast)
but are still given a high score so they can explicitly become the
default Network. Without this fix they do not become the default
Network if another Network is present. This was an artifact of how
unvalidated Networks were handled, but now that unvalidated Networks
are properly handled, ala 50807d, we can freely rematch even
unvalidated Networks and NetworkRequests.
Also, never linger and teardown unvalidated Networks as the user
might be in the process of signing in. This better matches prior
behavior when unvalidated networks didn't match NetworkRequests,
and thus were never lingered.
Also, don't disconnect networks that may be lingering. The
disconnect logic in rematchNetworkAndReqeuests() is adjusted to only
fire when a network is newly validated.
It is incorrect to consider rematching uncreated Networks and
explicitly selecting created Networks, so this change logs error
messages in those cases.

bug:17647968
bug:17396616
Change-Id: Id6b8a350b8200f484d5bfd14ca0a8f64f08846a0
ava/com/android/server/ConnectivityService.java
e4a05afe85f15472325db9c535ef81f409fb6070 24-Sep-2014 Sreeram Ramachandran <sreeram@google.com> Send app permissions to netd.

Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/connectivity/PermissionMonitor.java
c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a 02-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
4d82c46ef5df06e1b92f3574e41b38a62ec0e607 02-Oct-2014 Erik Pasternak <roboerik@android.com> Merge "Implement auto-sleep functionality." into lmp-dev
8d05172112436a81bed6e4a0810f8914509d8a4d 01-Oct-2014 Dianne Hackborn <hackbod@google.com> More work on issue #17656716: Unhandled exception in Window Manager

Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock. This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it. And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing. So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BroadcastQueue.java
ava/com/android/server/am/UriPermission.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/Settings.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
c3e7f87bf9930a20c37609f567f5d88305fb1ddd 02-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev
144508d5da4dec37183617ec259ab83d2db4f012 02-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Revert white space changes." into lmp-dev
7f76e505624fddbc4ba3350f3e381ccd275a5a75 02-Oct-2014 Winson Chung <winsonc@google.com> Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev
9449a6162e275531857464acc2279894d5d6a240 02-Oct-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.

There was a path through idle where we could clear mBooting but not set
mBooted, so we would no longer start activities. This is probably happening
because if you start a user or userdebug build with the device plugged in
to adb, the system early on starts the USB security dialog, before home is
started. If that goes idle first, we will end up in the case where we
clear booting (because something went idle) but not set booted (because it
was not home that went idle).

Change this so that we always set booted when clearing booting.

Change-Id: I40053710eefa939315aeb9475ecdd2e8a87351ff
ava/com/android/server/am/ActivityStackSupervisor.java
01945f240a0cad450b5a417cf9380066f5736a01 02-Oct-2014 Dianne Hackborn <hackbod@google.com> Revert white space changes.

Change-Id: I3bc9995adf5cefd91f5a9fd4d2a701056dba3ca9
ava/com/android/server/am/ActivityManagerService.java
dcf21d15456e5aca28d063aea73139e30842e6d1 01-Oct-2014 Winson Chung <winsonc@google.com> Fixing invalid check to get component enabled state. (Bug 17679693)

Change-Id: I225d59bf766122d667d990d7e5b1971c6e8af2aa
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/LauncherAppsService.java
05af6adb8d4fd5ea069c9aead5a877da9085daa8 01-Oct-2014 Jeff Brown <jeffbrown@google.com> Implement auto-sleep functionality.

Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity. By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM. When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
ava/com/android/server/power/PowerManagerService.java
245645ca460150b4030d84c88faa931345a90a50 01-Oct-2014 Craig Mautner <cmautner@google.com> Merge "Don't clear visible-behind activity if it is top" into lmp-dev
64ccb7086741d520c041273610519a5c2f65b440 01-Oct-2014 Craig Mautner <cmautner@google.com> Don't clear visible-behind activity if it is top

Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
ava/com/android/server/am/ActivityStack.java
c909e1b2dfa2e47b786d96818f70f6308c5a78be 01-Oct-2014 John Spurlock <jspurlock@google.com> Zen: Fix new event category check.

Allow events through if configured, and use a switch
for separating mode-specific logic.

Bug:17580878
Change-Id: Id7b5d8b50173015d6a78568ed0a90e0bccf98549
ava/com/android/server/notification/ZenModeHelper.java
7123bd690fa14d0b9e33f5a70c58ea5b5f1b7d32 01-Oct-2014 Brian Carlstrom <bdc@google.com> Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev
62434d6a4b4b5aa7d44aa4344b5cb0f82df2b923 01-Oct-2014 Jeff Brown <jeffbrown@google.com> Merge "Reduce latency from doze to screen on." into lmp-dev
62321ab11460fd852449b3f6a2113694e3e04e7a 01-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev
7622a0f8e4198adf0aae5d4e167ee132b34f4cdb 30-Sep-2014 Dianne Hackborn <hackbod@google.com> Maybe fix issue #17700474: manta: high occurrence of device booted...

...but dev.bootcomplete flag is not set

Rework things to address a few issues I found:

- When the activity goes idle, the way we were handling finishing the
boot there was calling finishBooting() with the lock held, but it
shouldn't. We now dispatch that and turning on the screen together
in a separate message.

- Make sure we don't try to start the home activity until we have
reached the point of the system being ready and mBooting being set.
This ensures we don't do any work prematurely.

Change-Id: If30c1f287af73bc2164e7aadbe98022ae42cc5e7
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
0a434776b836f8fbea1f84b7bfe158b4ddafc876 30-Sep-2014 Jeff Brown <jeffbrown@google.com> Reduce latency from doze to screen on.

Don't wait for the brightness ramp to complete before reporting
display ready. Keep track of whether we have any unfinished
brightness changes and take care to grab a wakelock to ensure
they are eventually applied.

Ideally we would rewrite the whole state machine to more carefully
coordinate screen state and brightness changes but that's too
risky for now.

The pixel fairies are having a bad day.

Bug: 17718416

(cherry picked from commit 875f80c2732a3fbe652a6e8fc14031041f791308)

Change-Id: I7a2d8ba4591a12b773653d3dbf86c7db016f967e
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/display/DisplayPowerState.java
ava/com/android/server/display/RampAnimator.java
a39871ef5e9bf6703f18af0725484b06f5c78216 29-Sep-2014 Brian Carlstrom <bdc@google.com> Use VMRuntime.isBootClassPathOnDisk

Bug: 17679443
Change-Id: If53c236058a7237d735c2344a715cf0a36301f9b
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/storage/DeviceStorageMonitorService.java
86ef70eb08b83fc41d0c8e124315d9ee9fea0ee4 01-Oct-2014 Winson Chung <winsonc@google.com> Fixing build (Bug 17381033)

Change-Id: I95a7c8167f82a4fe982bdc9588d5fbaf5a627d0b
ava/com/android/server/wm/WindowManagerService.java
c12f57457411e67adf2c8acaad21b08c934e583b 01-Oct-2014 Winson Chung <winsonc@google.com> Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev
4fb4163f4c6f49eebc34d1b193c526558af0d375 01-Oct-2014 Craig Mautner <cmautner@google.com> Merge "Call Surface.release() for starting windows" into lmp-dev
c11b19caef12c3199393b68ae36931a603337c05 01-Oct-2014 Winson Chung <winsonc@google.com> Fixing an issue with leaking starting windows. (Bug 17657878)

In some cases, when starting an animation while another starting window is visible,
the starting window is never scheduled to be removed. In that case, we try and
schedule the closing app starting window to be removed when we are starting the
transition to a new activity. This also partially addresses issues related to
leaking windows in b/17381033.

Change-Id: Id26525cd71380852f109ec2f55a4a60db5086ded
ava/com/android/server/wm/WindowManagerService.java
49a2edf92ab9b02762a2c183809fdee55b0fcf40 25-Sep-2014 Craig Mautner <cmautner@google.com> Call Surface.release() for starting windows

If the window maanger received BinderDied for a starting window
before activity manager then it would null
AppWindowToken.startingWindow and not go through the
PhoneWindowManager.removeStartingWindow call later. That meant that
Surface.release() was never called from
ViewRootImpl.dispatchDetachedFromWindow(). Which in turn meant that
graphics memory was being leaked.

This change notifies the PhoneWindowManager to go through the
removeStartingWindow path when the starting window gets removed for
any reason.

This change also ensures that scheduleRemoveStartingWindow is
always called with the window manager lock held.

Fixes bug 17381033.

Change-Id: Ic6860d0e1410c9bb5053d85ae21a08b11f573b6d
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
b27d43a8805769f9a9dfdc024b5cd19b71cfd8d7 30-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Clear ident when obtaining provider across users." into lmp-dev
c0322ecda54d9c2db12e861f4d36ef50595b9740 30-Sep-2014 Jeff Sharkey <jsharkey@android.com> Clear ident when obtaining provider across users.

When calling getContentProvider() across user boundaries, and
creating the provider for the first time, we need to clear caller
identity. (We could have torn down the provider while the system
was under memory pressure.)

Bug: 17409650
Change-Id: I67713a03e5f7106f5e8fcf33fe3fdae81ce644ec
ava/com/android/server/am/ActivityManagerService.java
44d4eeaa48721296663a05d01071f196a509dc34 30-Sep-2014 Svetoslav <svetoslavganov@google.com> Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
16e4a1aade2b73edfdaa42aa86a3893fd039fc62 30-Sep-2014 Svetoslav <svetoslavganov@google.com> Use default encryption password if an accessibility service is enabled.

When device is encrypted the user has to authenticate in order to decrypt
the data partition which is required for running accessibility services
and Text-To-Speech. In order to address this issue we are falling back
to use the default password if there is an enabled accessibility service
and the user has secure lock. This will enable the user to authenticate
when accessibility layer is completely functional.

bug:17671790

Change-Id: Iafffe7bcd234008cf91ffb5011b21b803dca227a
ava/com/android/server/MountService.java
bc156ba430d286aaab8deb7bbb3bccc655cd2e92 30-Sep-2014 Matthew Williams <mjwilliams@google.com> Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev
d8f7e048281559462f9c590f9d7d48fb7fe065ce 30-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
4a154af9aad13c09821ada6187440feaec2d38e8 30-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Send volume keys to the default stream if not actually playing" into lmp-dev
165809b33198cd3926cc11e8cbc96b671d4c87d3 29-Sep-2014 RoboErik <epastern@google.com> Send volume keys to the default stream if not actually playing

This ensures that we'll only adjust volume on a session's stream if
that stream is actually in use.

bug:17690423
Change-Id: I5fce8265a015bbc5034afa16719d9a0bbf257598
ava/com/android/server/media/MediaSessionRecord.java
9eef5bf8d1a69879ada3176c839676dc82b14daf 29-Sep-2014 RoboErik <epastern@google.com> Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev
df382cada180033e5bbde82998b73ef19e541ed2 29-Sep-2014 RoboErik <epastern@google.com> Be more paranoid about threading in MediaSessionRecord

This makes copies of objects with bundles before posting to another
thread and is more aggressive about locking before making assignments
of mutable objects.

bug:17692568
Change-Id: I28e8229718b862c485e870fd2ca06a3a18a7c454
ava/com/android/server/media/MediaSessionRecord.java
39838b98f1fef11ff29bf682029331849a39a633 29-Sep-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev
d8826bcb2b7f1d8046d5ce95df059cc2559e9f82 29-Sep-2014 John Spurlock <jspurlock@google.com> Zen: Fix downtime calculation for Sunday mornings.

Previous calculation would always exit downtime on Sunday mornings,
due to the target day ending up at zero (an invalid day).

Bug:17682999
Change-Id: Icc5f01a42c3c644170eea9e60442cf77ce15a06c
ava/com/android/server/notification/DowntimeConditionProvider.java
f7c4509ffbbe6b1849c3ea61edac8d1d23906eaa 29-Sep-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev
9ffa50096f5ad980bdaef4d214ad1a835b9b2991 26-Sep-2014 Christoph Studer <chstuder@google.com> NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI

Bug: 17660485
Change-Id: I8684067538fcd2d43a9f95c6aa707b275b13ee40
ava/com/android/server/notification/ValidateNotificationPeople.java
89e0f0937a70d73b5ed188c9337b4d33860e5573 15-Sep-2014 Paul Jensen <pauljensen@google.com> Move mobile provisioning APN support into telephony.

Most of this logic is simply removed from ConnectivityService.
The captive portal detection is now done by the NetworkMonitor.
The notification logic is still left in ConnectivityService as
it's used by both the NetworkMonitor and telephony's mobile
provisioning logic.

bug:17324098

Change-Id: Ibd1c42b1a75795f90a6483d3d0a5a14f88b193d8
ava/com/android/server/ConnectivityService.java
061f4159dca9b68f0315d725a945af9736dde62f 28-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Update LegacyTypeTracker state before sending connect broadcasts.

Currently, LegacyTypeTracker sends out connected broadcasts
before updating its internal lists of networks. This creates a
race condition where an app can query LegacyTypeTracker state
(e.g., via getActiveNetworkInfo) as soon as it gets the
broadcast, and get information that has not been updated.

Bug: 17540101
Change-Id: Iefd6d5e9fd0b427c5872166208831f70fcef8b6f
ava/com/android/server/ConnectivityService.java
119aac93f8d757ff464dd4d1135ffcf37f7cda02 29-Sep-2014 Matthew Williams <mjwilliams@google.com> Fix deadlock caused by clearAllBackoffs in SSE

BUG: 17420163
This CL is a copy of ag/359292
That commit was lost, see the bug for more details.

Change-Id: I68747d447f8c95e6b5022f9bc8cbab677e0c3d4e
ava/com/android/server/content/SyncManager.java
ava/com/android/server/content/SyncStorageEngine.java
208678718f9f8db3bc279c7d5bd1445af2831ae3 10-Sep-2014 jgu21 <jinghui.gu@intel.com> Frameworks/base: Early init native bridge

Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

(cherry picked from commit 2eacd06bfb82b33dfcbccafbcfc0bf1218484bb5)

Bug: 17671501
Change-Id: I970db5b284b0c12e2d8a45df3950c1fff2927a4e
ava/com/android/server/am/ActivityManagerService.java
485f2095f8ba695b88331c01a2de468b5616a5d7 11-Sep-2014 New Author Steven Liu <stevenliu@motorola.com> redirect RIL_UNSOL_OEM_HOOK_RAW to system app

Add LISTEN_OEM_HOOK_RAW_EVENT and onOemHookRawEvent to PhoneStateListener.

Bug: 17298769
Change-Id: Iaea054d3cc2925eea1e11f8871faabc7bc9dfb2d
ava/com/android/server/TelephonyRegistry.java
e3c3de677c2ec16049f23304c0692b9ed35eb51e 27-Sep-2014 RoboErik <epastern@google.com> Merge "Don't forward media keys to the app if the phone session is active" into lmp-dev
f839b4fcb6b179529585765517895a8c90fe315b 26-Sep-2014 Elliott Hughes <enh@google.com> Set the system locale correctly even on an encrypted device.

Bug: 17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
ava/com/android/server/MountService.java
ava/com/android/server/am/ActivityManagerService.java
de9ba39c1714f5bc9e1785d8224ad26c132b6293 26-Sep-2014 RoboErik <epastern@google.com> Don't forward media keys to the app if the phone session is active

This checks if the phone app is currently getting or in a call when a
media key event is sent and sends it to the phone session instead of the
foreground app if it is.

bug:17527302
Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
192554b59bd53087b4079de3e371103ec574dba6 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev
2f1993ec460166413e7887f151630f6708077c0f 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17671802: "content" command always prints...

..."uid 2000 does not have android.permission.UPDATE_DEVICE_STATS"

Make sure to clear calling identity before getting into the guts
of the activity manager. Also fix the places the activity manager
calls in to battery stats to not require a permission check, anyway.

Change-Id: Ifd90937875b9fe0c36aa3f5cf1ec173746914e6b
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BatteryStatsService.java
3cedef53ce8dbebb4bfabc5909914bd270629540 26-Sep-2014 Paul Lawrence <paullawrence@google.com> Merge "Don't set dev.bootcomplete until interacting with user" into lmp-dev
95cce9f382693ad13039d1a1fb15529017a20929 23-Sep-2014 Paul Lawrence <paullawrence@google.com> Don't set dev.bootcomplete until interacting with user

Specifically we want to not set it when encrypting and showing
progress.

Bug: 17606949
Change-Id: I668cf47781011e7fcea7aa3b43c7783b3dea77a1
ava/com/android/server/am/ActivityManagerService.java
a2b48057e1a15bc9e88a764cad16cda784dc4c04 26-Sep-2014 Kenny Guy <kennyguy@google.com> Merge "Uninstall for all users should check device admins." into lmp-dev
2d1cc187632ed84f66a9618788562337fb81123f 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17574819: Chrome browser process is killed..." into lmp-dev
cd97c96734ac00a6a800724fe5d8e81ee0ee134c 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17574819: Chrome browser process is killed...

...in background due to dying renderer process

Completely turn this off, for now.

Change-Id: I028eefc9b7e627d29569ef72d9ab940ac5960c7c
ava/com/android/server/am/ActiveServices.java
f3ac9463171cbc343c78f35b5f6d842c101ddba6 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev
2ca21efdde386c660832c86faf74d61fd3f9330d 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17661444: Persistent service not automatically restarted

The code to recover when running processes are removed from the
LRU list turned up an existing problem where we would remove a
persistent process from the LRU list, making it more obvious.

Now it is fixed.

Change-Id: I94ccb924b3e5649b2819d3392b6f6c9c725dc903
ava/com/android/server/am/ActivityManagerService.java
42dad8041823833106311ff43cc17a8b3c583d32 26-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
5dde6e334d06e5c2116b2169d7ad67e95238a6f0 25-Sep-2014 Kenny Guy <kennyguy@google.com> Uninstall for all users should check device admins.

Uninstall for all users should check whether package
is admin for any user not just user 0.

Bug: 17657954
Change-Id: Ia116248b5889fc02dd46816a132e03c8e62662c9
ava/com/android/server/pm/PackageManagerService.java
e1b032a84086a5d6f36b6910171110543224bdf5 25-Sep-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev
0a285b4462719b938dfd5bf54808a9a4a2e3e5b5 25-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Include reason when wiping data." into lmp-dev
143dc769ef9709f0e65cda85f2ff6375c69560c8 24-Sep-2014 RoboErik <epastern@google.com> Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
fae2aabc30b0c3143fe3096140f8f4a9b00d87a7 24-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev
004a4b20f8d3116e6a711525960d433fcfea4ee4 24-Sep-2014 Jeff Sharkey <jsharkey@android.com> Include reason when wiping data.

This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
ava/com/android/server/MasterClearReceiver.java
b294eac086e7dba9c13cfb6cb4e24e39a1b88631 24-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev
337abb3b4e705b06f9385df063be4cc06604be04 24-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17614141: Add protection for accessing images

Add basic filename protection, also only file names that are for
app icons so this can't be abused to access thumbnails.

Change-Id: I2831c0f3f08a39aa734f93f76b6fd4aaf97e87c6
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ee9d415f9bf534b542141be6db075eb192ea7a27 24-Sep-2014 Chet Haase <chet@google.com> Merge "Avoid drawing the starting window twice" into lmp-dev
ff072725e39b8c6928d6ca2d7e263d7d081a2288 24-Sep-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17624121: Settings crash while launching on wiped device

Cleaner paths and better error reporting when a problem goes wrong
while binding an application. This gets rid of the (recently added)
error about removing a process that hasn't been killed, and cleanly
kills the process along with more detailed errors about where things
failed.

Change-Id: I710a209c14da1515929e6254396b793177eee115
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
23b113592a5f461ec66026cbf8bce253cb8d3a46 24-Sep-2014 RoboErik <epastern@google.com> Clear the volume cache for all inactive state transitions

bug:16988480
Change-Id: I0426c76681f8ec832c3f72842ee494d286050fea
ava/com/android/server/media/MediaSessionStack.java
8eb48d26ccbde07140da3e798ca32182814ea237 24-Sep-2014 Chet Haase <chet@google.com> Avoid drawing the starting window twice

Logic in WindowState caused a delayed layout on the starting window,
which forced another layout/draw pass, which was unnecessary. Making
the resize call happen sooner means that that request gets lumped in
with a pending layout request, so there's only one resulting draw.

This saves not only the second drawing operation, but also the creation
of an extra buffer in SurfaceFlinger for that second draw request. This
buffer is temporary, but can be quite large on some devices and push
the system over the memory edge in extreme situations. It's difficult
to track this memory usage difference as the buffer resides at a very
low level in the system. But you can see in systrace that the second
allocation (and the second draw) is not happening after the fix.

Issue #17570761 Constrain starting window to only one buffer

Change-Id: I0e0fff7efdc812730706afccbfb020dea3f8d3e2
ava/com/android/server/wm/WindowState.java
12aeda802ed91a49977a22166319ce74a3352e30 23-Sep-2014 Christoph Studer <chstuder@google.com> NoMan: Add 3s timeout in matchesCallFilter()

In Priority mode, NoMan can block the telecom Ringer
indefinitely when looking up the caller contact details via
ContactsProvider.

Fix this by introducing a 3s timeout and assume the call
matches the call filter when the timeout is hit.

Bug: 17598245
Change-Id: Ia0893cf203e6ffd943c749719ebb9e0f0958eb01
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ValidateNotificationPeople.java
ava/com/android/server/notification/ZenModeHelper.java
49d810cb632bd4c334ebfd3932658fa6973bcbef 23-Sep-2014 Robin Lee <rgl@google.com> Reset keystore when user is added or removed

Because user IDs are recycled it is not safe to leave this kind of
information around after deleting.

Bug: 17403144
Change-Id: I441f85750cf8818adaf62a1acdb2ba7b4bfc1b7e
ava/com/android/server/LockSettingsService.java
bdc07b6986d6ba5cab2ab98a36814ed9f8e3b520 24-Sep-2014 Zoltan Szatmary-Ban <szatmz@google.com> Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
83a76db6c588ac0ecc713a9920b5a46448e3884c 24-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Force layout and animation when display changes" into lmp-dev
9b5e824da70b6446a2e1418bc0cf1efaa33bd862 24-Sep-2014 Craig Mautner <cmautner@google.com> Force layout and animation when display changes

Each time that window manager gets a notification that a display has
been added, removed or changed, run a pass through
performLayoutAndPlaceSurfaces. This ensures that
WindowAnimator.animate() runs once so that the surfaces of remote
displays can be updated with their visibility.

Fixes bug 17533991.

Change-Id: If8745527df86c74da75fbe26b8a2a6fddeb74d2a
ava/com/android/server/wm/WindowManagerService.java
75b8966cad24354272759a1579376f7e64e40050 24-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Only stop/start clatd if necessary." into lmp-dev
e034716628de94399717a744f14bdfd534d8f87a 24-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
58817f502c3c9cfa8a4b3b04cd1cc3ca3644b1aa 24-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev
8cfd9e6c110d4abbbbe88599ada976dd55b6cf50 24-Sep-2014 Matthew Williams <mjwilliams@google.com> Merge "Fix lock ordering in JobScheduler" into lmp-dev
48a30db75dd0eedf8e065c89825b2af86a381b62 23-Sep-2014 Matthew Williams <mjwilliams@google.com> Fix lock ordering in JobScheduler

BUG: 17625667
Two part clean-up.
1) Don't try to lock in onControllerStateChanged. Do it in the handleMessage
instead where the rest of the locking is. This is sufficient to fix this bug.
2) The other side of the deadlock came b/c we lock when cancelling and calling
stopTrackingJob. Controllers handle their own locking so this isn't
necessary. B/c of a potential race from the controller side, added an explicit
check for the JSS to only run an expired job if it still exists.

Change-Id: Iaeebbc19437eb5b73e3ced3168f1fc13e564a4be
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/JobStore.java
eeb2c7e712dbae91de04ab2338c1fbccfbce7ba2 24-Sep-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17628623: Need to update default preferred activities for YouTube

Improve the warning logs when setting up preferred activities
to help identify when there are issues and what they are. Also
improve the algorithm a little to still apply permissions when
resetting them and there are additional third party apps, as long
as the additional app is something like another browser and the
preferred activity being set is more specific (has a better match).

And add an example of using manifest-based preferred activities
in to ActivityTest -- and yes it DOES work! :p

Change-Id: I1ff39e03a5df6526206e0c3882085396b355d814
ava/com/android/server/pm/Settings.java
c93fbd1fae3d461f2f8a7c039b15f953ed6a8b50 23-Sep-2014 Michael Wright <michaelwr@google.com> Specify a device identifier for keyboard layout notification.

Bug: 17614683
Change-Id: If53489b09212bfa487d7dc3a7f9b000731d949ac
ava/com/android/server/input/InputManagerService.java
6800e1b9211257bf8dfa79a3c7ebd3e265fcf196 23-Sep-2014 Jeff Brown <jeffbrown@google.com> Merge "Move setting the display state out of the critical section." into lmp-dev
d0e0154c1f0be7786f12aea60add7ed4fb7c4e6c 23-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev
e75926d6dc49878682631508c996e472d79a8d41 19-Sep-2014 Jeff Brown <jeffbrown@google.com> Move setting the display state out of the critical section.

Setting the display power state currently happens while holding the
display manager lock. This change moves it out of the lock to
ensure other services don't get stuck for several hundred
milliseconds.

Unfortunately, surface flinger ends up stalled a little later
so this only solves part of the problem.

Bug: 17623774
Change-Id: I201137c5e7f82c776f28a436845fcf3191fd0ca5
ava/com/android/server/display/DisplayDevice.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/LocalDisplayAdapter.java
ava/com/android/server/display/VirtualDisplayAdapter.java
def101127a3ad0a65eb1c3ef53e9f41c4d6be5d2 23-Sep-2014 John Spurlock <jspurlock@google.com> Merge "Remove redundant wifi-display notification." into lmp-dev
03365ccc395f76c023bb63414eef1bd02aef90e7 23-Sep-2014 John Spurlock <jspurlock@google.com> Remove redundant wifi-display notification.

Since all devices now appear in quick settings, remove the
framework notification and obsolete artifacts.

Bug:17607193
Change-Id: If952b826d79c77068285373c6b44a430f78c20b1
ava/com/android/server/display/WifiDisplayAdapter.java
193b27cd3d703a3fb879792b22bee88ea1fe0407 23-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev
23e79fcef98618fc049af55673b43ea9e70ffa9b 23-Sep-2014 Tsuwei Chen <tsuwei@google.com> Merge "Better detection for SIM information readyness. 1) listen to SUBINFO broadcast intent to better capture SIM info update. 2) notify HAL about SUPL server/host everytime they get set." into lmp-dev
2fb173a34be19ac6886b923865fc6fd247e3990e 23-Sep-2014 Jorim Jaggi <jjaggi@google.com> Merge "Only wait for relevant windows when turning on the screen" into lmp-dev
678c13c02a7a9c48766d45166c9756fb3b404bb9 23-Sep-2014 Tsuwei Chen <tsuwei@google.com> Better detection for SIM information readyness.
1) listen to SUBINFO broadcast intent to better capture SIM info update.
2) notify HAL about SUPL server/host everytime they get set.

Bug: 17288144

Change-Id: I65cb4e0879c55c078e85d062877e491904e78222
ava/com/android/server/location/GpsLocationProvider.java
39569afc9fc2d2ff1d254eb2924fbd05a9ea37c0 23-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17307700: retarget a relinquished task is not working

Missed by 1!

Change-Id: If6504e37563d1242df8da4609cbcbcd550d68fdd
ava/com/android/server/am/TaskRecord.java
25e1ecaabbde4741663c8e5a777d9df9b939572c 23-Sep-2014 Dianne Hackborn <hackbod@google.com> Maybe fix issue #17614177 APR: system process restarting due to infinite loop

Also try to get rid of a huge wtf we are seeing across a lot of devices
where we incorrectly change real states on a service that is restarting,
and get rid of one of the noisier boot logs in the package manager.

Change-Id: I2510b6fb082eac3f6168cbd57bc3b70ad006114d
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ProcessStatsService.java
ava/com/android/server/pm/PackageManagerService.java
dc9ead4409d784620c6c65a56ca083ff7dd817f0 23-Sep-2014 Jorim Jaggi <jjaggi@google.com> Only wait for relevant windows when turning on the screen

Bug: 17536119
Change-Id: Ibe8da9fdd52a1a46eb856425b28ffc4f505b2697
ava/com/android/server/wm/WindowManagerService.java
55fa0207134d7a2470f060445938b2d63e180f4e 23-Sep-2014 Jeff Brown <jeffbrown@google.com> Merge "Fix window manager policy state when waking from doze." into lmp-dev
3ee549ca2404067bb8b2fcbaa741ec118c76bf3e 23-Sep-2014 Jeff Brown <jeffbrown@google.com> Fix window manager policy state when waking from doze.

Once upon a time when the world was fresh and new, the heavens
had an easy rhythm. Day and night. Night and day. In the day,
the pixel fairies would cavort and play in the bright gardens
with narry a mark of shadow or gloom. In the night, they would
rest peacefully, dreaming no dreams and knowing no fear.

Then one night a fairy dreamed the first dream. At first
the dream was peaceful, full of colors and delight, hopes and
memories. Then all at once, jarringly, it awoke in bright
daylight. The pixel fairy knew fear, for the world had changed
and it was unprepared.

Time passed and the pixel fairies grew accustomed to their
fate, day and night, night and day, sometimes dreaming, until
there came a night when a fairy did not sleep. It roamed
the land in a dreamless doze, lost and afraid amid a grim haze
of grey and darkness. The fairy despaired. It wanted no
part of this place. It pretended for a time to be awake but
the bright daylight would not come. It pretended for a time to
be dreaming but the colors and memories would not come.
That is when the fairy wished for oblivion. Then just as
suddenly, it awoke in the daylight. It fell to the ground,
stunned as if it had forgotten how to walk in the too bright
daylight.

Though the world again grew softer and kinder in time, the pixel
fairies were never the same. For the night is dark and full
of terrors.

---

It used to be easy. Screen on and screen off could explain almost
everything about the state of the device but it's different now with
ambient display. We need to be able to wait for all windows to be
drawn even in the case where the device is still nominally asleep.
In truth, the window manager policy which drives a lot of these
interactions is a thicket of outdated assumptions.

Added a new method to tell the window manager policy when the screen
is being turned off so that it can correctly account for changes
to the interactive state (wakeUp and goingToSleep) and screen state
(screenTurningOn and screenTurnedOff). Now we can independently
poke keyguard during interactive state changes and we can apply
screen on blocking during screen state changes.

Moved the code which manages screen on blocking (which is what
ensures the UI has fully drawn before revealing screen contents)
from the power manager to the display manager since the display
manager is in a better position to accurately track the state of
the screen, particularly when the screen is being turned off.

Fixed a bunch of synchronization issues. Previously some work
had been moved to a handler without considering what might
happen if it became reordered relative to other work happening
elsewhere. Documented the desired behavior in the code to
prevent this from happening again.

There's still a bunch of stuff in here that isn't quite right,
particularly the assumption that there's only one screen, but
it's good enough for now. Hopefully there aren't too many bugs.

Bug: 17605802
Change-Id: Ic7319e09948c8a3cda014d7e169c964a3ad86f14
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/power/Notifier.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/wm/WindowManagerService.java
0bec95d0525971d5b78ff082150e05291275a939 23-Sep-2014 Zoltan Szatmary-Ban <szatmz@google.com> Register ActivityManagerService.PackageMonitor for all users.

With the introduction of managed profiles, ActivityManagerService.PackageMonitor
can receive Intents from users other than current one.

Bug: 17580914, 17314317
Change-Id: I7c601618f7819d6775cf422dca70a929ee1089d9
ava/com/android/server/am/ActivityManagerService.java
1df5fa55c5a5c1ba054b783ea639c99d57c357cf 20-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Only stop/start clatd if necessary.

Previously we would restart clatd on every LinkProperties
change, which now happens every time we switch radio technology
(e.g., LTE to HSPA). We also would not stop it if the link got
an IPv4 address.

Bug: 15024258
Bug: 17186694
Bug: 17569702
Change-Id: I65cfcd5e7acec8ea1a12392a59dabd668c58490f
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Nat464Xlat.java
74971c75dcdfacdf49f110c2104f20e704bffdcb 23-Sep-2014 Paul Jensen <pauljensen@google.com> Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev
60446165d8bd44f72cec8d0c5583a688369fa660 19-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Block address families with routes, not NetworkAgent side channel

Now that we support unreachable routes, use those to block
address families on VPNs. This is a much more elegant solution.
Also update LinkProperties when IP addresses are added and
removed, fixing a TODO.

Bug: 17462989
Change-Id: Ib749d84710dca70d672350b9f129bb91419ec77e
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/connectivity/Vpn.java
1e2b63d91d2e475eb68a492b98232d585284e406 23-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Merge changes I3ebf0cec,I8635472c into lmp-dev

* changes:
Add a throw route to the VPN endpoint.
Support non-unicast route types: unreachable and throw.
fee7ad16191bb0fb7f09648cb2e00cda97c020b6 23-Sep-2014 Amith Yamasani <yamasani@google.com> Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev
c7437dd7c0fd90757698934d199fe864b40254e1 23-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "I am such an idiot." into lmp-dev
4a1ef0b171e1b87b815df0ac718eb9fe2c2af4fe 23-Sep-2014 Dianne Hackborn <hackbod@google.com> I am such an idiot.

Seriously, don't look at this. It is so dumb.

Brought up by issue #17307700: retarget a relinquished
task is not working

Change-Id: I947438d3502f75510e2974211bb78d31008eaa90
ava/com/android/server/am/ActivityManagerService.java
abbc20243171ec1b95998df02d0e96421736450f 23-Sep-2014 xinhe <xinhe@google.com> Merge "Fix for empty RSSI triangle after boot" into lmp-dev
2e51cc684271071759231fca1e17f94ed2e6bdfb 23-Sep-2014 Adam Lesinski <adamlesinski@google.com> Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev
246a8bcadde961f6bc8172811a052af3568a6f4d 23-Sep-2014 Adam Lesinski <adamlesinski@google.com> Revert behavior of Lockscreen Activity Launch to KK

There exists a lifecycle regression where launching an
app from the lockscreen (camera, etc.) causes a series
of onResume, onPause, onRestart, onStart, onResume.

This CL reverts the behavior to what it was in KK, which
is to say that the Launcher is first resumed/paused, then
the Activity being launched has a simple onRestart,onStart, onResume
lifecycle.

Bug:17459745
Change-Id: I04091d2f86a929ee972c8d6debc1beb033c135a8
ava/com/android/server/am/ActivityManagerService.java
5d47a093526080a677044ffc3a1d44be318a9b95 23-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17609716: Frequent crash in system_server (RT restarts)" into lmp-dev
e35c9bf9ba0cb4438dfd001055fc6cd5c2d0a575 22-Sep-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Add events as a new config attribute." into lmp-dev
2dac62c2e985ce1848b0fff751d4ed2cc3885c0c 19-Sep-2014 John Spurlock <jspurlock@google.com> Zen: Add events as a new config attribute.

Decouple events from alarms in the zen interception function,
and default the new allowEvents to true.

Bug:17580878
Change-Id: Iff10df385206ad73c3423ff118c79e94a10918d9
ava/com/android/server/notification/ZenModeHelper.java
19c3b5d0d9852dedef485479473e0c4c1d9f78ea 22-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #17581375: Nexus 5 getting low on RAM" into lmp-dev
c2f6f947b6f3ebc5df5ac0a3d2c9f959b9c5e6c5 22-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17609716: Frequent crash in system_server (RT restarts)

There was some code here locking on the lock object instead of
the main activity manager lock...!!!

Change-Id: Ic85151fbef915f6fb8fd5ce3c1a7e9b810412cb6
ava/com/android/server/am/ActiveServices.java
3119b82c4336519201f1d3f3218b6849dabc7e16 22-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Monitor MediaRouter for remote display connections." into lmp-dev
d412563922f46feb4d3c3ba1500f34bddd21d73c 22-Sep-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17581375: Nexus 5 getting low on RAM

Try to catch any cases where we remove a ProcessRecord from the LRU
list when it may still have a process associated with it, report
that this happened, and try to make sure the process is killed.

Change-Id: Icd74439caba5e1c283c01a49a46dae926a00ba71
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ProcessRecord.java
ae7034aaf092adb52e7d1b5b86b2986e91295b9f 22-Sep-2014 Amith Yamasani <yamasani@google.com> Fix regression in launching CantAddAccountActivity for correct user

This activity should be launched for the user calling addAccount()

Bug: 17608124
Change-Id: I5d7e47bc625442494dc322ccafdc25f5f5c6aa7b
ava/com/android/server/accounts/AccountManagerService.java
ca5e72c5aeb85c99ed7a5ae3bf3a870462562352 22-Sep-2014 Yohei Yukawa <yukawa@google.com> Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev
5026279ce45ae78126046607a2634dc9dae93199 18-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Add a throw route to the VPN endpoint.

Without this, legacy VPN types that don't send all traffic
through a tun or ppp interface, but instead have the kernel
apply IPsec transforms directly to the original packets, will
try to send traffic to the VPN endpoint through the VPN, which
will not work.

Bug: 17462989
Change-Id: I3ebf0cec726dd12b2c57ba5d66775f8c02b25b70
ava/com/android/server/connectivity/Vpn.java
4b0f8e6fb707e19799011c1f4a5e4f54603e34b1 18-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Support non-unicast route types: unreachable and throw.

Bug: 17462989
Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb
ava/com/android/server/NetworkManagementService.java
e63b5fae8d099d2f5d4d5a5cf7a8d5a86266c0fe 19-Sep-2014 Yohei Yukawa <yukawa@google.com> Work on issue #17506095: Plumb a new configuration to IMMS

This CL makes a plumbing from SystemConfig to IMMS.

Change-Id: Ia70b870723acf647e0c27f24aff91b40d6f85543
ava/com/android/server/InputMethodManagerService.java
6e53b7476e9a1b1ecc30488252e183cff114ad0b 20-Sep-2014 Jeff Brown <jeffbrown@google.com> Merge "Decouple turning screen on from waking up in policy." into lmp-dev
1ecada8582e03311b64c53b229a1eeb298464f12 20-Sep-2014 Jeff Brown <jeffbrown@google.com> Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev
000e464f304fc98def247c1452ee7829de1460a8 20-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev
f3eb843665d0e52729a7063442f1c229568c3118 20-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...

...value in L

Only do the new logic when the task is a document.

Change-Id: I4664b94a3fe86ea266c2feb4e889c14c06751a15
ava/com/android/server/am/ActivityStack.java
cf456e3c225fa736914cca1f51eb5311fa16fb88 20-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17574819: Chrome browser process is killed in background..." into lmp-dev
cfb67ee40cd749b16ed2f8bc292ec03b796ff448 20-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #17381033: Program icon and shortcut disappear after..." into lmp-dev
0ed82e2c21f861ac4e1e6ae3f3fa821886a55a41 20-Sep-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17381033: Program icon and shortcut disappear after...

...running monkey test overnight [FACTORY ROM BLOCKER]

Add surface tracing to debug output.

Change-Id: I65f7fc90c51b0805f7e0090141c33d6b60ccb3b4
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
43c50293490ba7efb0f97a1e45b07c92aeafa61e 19-Sep-2014 xinhe <xinhe@google.com> Fix for empty RSSI triangle after boot

After device bootup, the signal strength triangle is empty although there is
both voice and data connection. This is due to when TelephonyRegistry doing call
back listen register, some APP use mDefaultSubID. However, when the reigister
happen, the mDefaultSubId does not exist. Althouhgh it can be update later, if
the update event comes too late (especially after the steady state), no
ServiceStatechange event can be received anymore. Thus the service is always not
available and the signal stength trangle has no chance to be updated anymore.
This is a risk condition.

Bug:17472622

Change-Id: I772d29e6dd9da212b78fd0d4438b8273e3318dba
ava/com/android/server/TelephonyRegistry.java
eae9216770f96a60dd8642ffd127ed998259cd9f 20-Sep-2014 Christopher Tate <ctate@google.com> Logspam is spam

This turns out to happen a lot in normal usage, but we're logging
copiously about it each time. It's reporting "oh hey we're already
in this state" -- and so the log is not useful anyway.

Logspam is spam.

Bug 15169507

Change-Id: Ie2d01ff1b0b3600dd9c15ccf83d60875558f1dc2
ava/com/android/server/pm/PackageManagerService.java
0fe3c2565833914b7e30df1dc82e3e26fa6de978 20-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17574819: Chrome browser process is killed in background...

...due to dying renderer process

Don't kill processes if they are bound to a service but not impacting
oom adjustment.

Change-Id: I1cc44e633feaeaad6e996b79a6cfd7b386c04095
ava/com/android/server/am/ActiveServices.java
89c2cb6f31cddb926dea3498f8adf01a8cc1426a 14-Sep-2014 Michael Wright <michaelwr@google.com> Monitor MediaRouter for remote display connections.

Since we're reusing the cast tile for screen sharing we need to make sure there's only ever one
mirroring presentation going on at a time.

Bug: 9905068
Change-Id: I249932d0f8853880dd453eb57c2a258e6ae952b0
ava/com/android/server/media/projection/MediaProjectionManagerService.java
79572afb33955ce4570b855521c67caf3e1e3a9f 19-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Add new activity dumpsys command to persist all data." into lmp-dev
804d37fd5706d35680116dbf3ee7acc931b0e42b 19-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Fix bugs when system apps reclaim permissions." into lmp-dev
36c4db8bd3bd7dad4b6cb8abd9cdc1a627fe3bbc 19-Sep-2014 Jeff Brown <jeffbrown@google.com> Decouple turning screen on from waking up in policy.

This allows us to ensure windows are fully drawn before unblocking
screen on while dozing.

Bug: 17516245
Change-Id: Ibe63c212b8db855ce26a34a8169f33764b266ee6
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/power/Notifier.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/wm/WindowManagerService.java
606e4e8c98304daf756f7e89d47005573288f72a 19-Sep-2014 Jeff Brown <jeffbrown@google.com> Ensure that the screen on blocker is applied while dozing.

The screen on blocker is used to keep the screen blank while the
system is drawing new content to prevent the user from seeing a
flash of stale content while the screen is being turned on.
This patch ensures that the screen on blocker functionality
is also applied while dozing.

Bug: 17516245
Change-Id: I77c2d0f2b99476a59ad212099f44c63aa2ef9c34
ava/com/android/server/display/DisplayPowerController.java
ce0fd7665f297c5693ee23b3d6daf26baeed4e9d 19-Sep-2014 Dianne Hackborn <hackbod@google.com> Add new activity dumpsys command to persist all data.

Very useful for testing persisting/restoring, to make sure
that all pending changes have been written.

Change-Id: I0e3b7cd3af8afb0b6e751e086081566ab00b76c9
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/TaskPersister.java
4bc92b064b1f23c67b06a8ed34d11335dd9a8b4f 19-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev
f6b46cb8b108cc8feee8ae68b979271fd6f72bf5 19-Sep-2014 Jason Monk <jmonk@google.com> Fix crash in PacManager

The PacManager would clear the pac url by setting it to null, however
everywhere else, pac url is cleared to Uri.EMPTY. This sometimes leads
to an NPE when PAC is set and cleared rapidly and take down the whole
framework.

Bug: 17581527
Change-Id: I84ce215f4f6a8a7e804372fc0a1e20ac609a21f1
ava/com/android/server/connectivity/PacManager.java
bfed9f34c0cf7cdf7d25e6a7677e03f5a3d87e0e 19-Sep-2014 Jeff Sharkey <jsharkey@android.com> Fix bugs when system apps reclaim permissions.

Recently we started letting system apps always take precedence over
third-party apps when defining permissions. This change fixes that
logic to claim the permission immediately, instead of delaying until
after the next reboot. (Permissions are always reevaluated after
each install.)

We also tighten the constraints slightly to prevent two system
apps from fighting over a permission definition; the first system
app to claim the permission wins.

Bug: 17526617
Change-Id: I49686407f5e99322bc511795c653c5d702becd9d
ava/com/android/server/pm/PackageManagerService.java
bc46c83073967d790653883b8d8544928a237f36 19-Sep-2014 Christoph Studer <chstuder@google.com> Merge "Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()" into lmp-dev
c1cdd4bda3b0dea48424276021261fef8a81e40a 19-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Only revoke ownerless grants when unprivileged." into lmp-dev
29b2516012cf69022ebe33409223095fb3c99405 19-Sep-2014 Jeff Sharkey <jsharkey@android.com> Only revoke ownerless grants when unprivileged.

Recently we relaxed revokeUriPermission() to allow apps to revoke
Uri permissions that had been granted to them, but this uncovered
bugs in apps that had been relying on the previous no-op behavior.

To mitigate this, only revoke ownerless Uri permissions when in the
unprivileged state; an active owner indicates that another component
of the calling app still needs the permission.

Bug: 17554268
Change-Id: Icc412933b29041ffb699d20136a623440ecc71ec
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/UriPermission.java
f9ee0e50545ba5e592147037f67155a29b3130ca 19-Sep-2014 Paul Jensen <pauljensen@google.com> Remove needless locking of mRulesLock that caused deadlocks.

The locks were added in c006f1 when underlying functions weren't performing
locking. In d2a4587 the underlying functions were changed to perform locking
but the higher level locking wasn't removed. The higher level locking can
now cause deadlocks with the new NetworkAgentInfo locking. This change
removes the needless higher level locking. Now all mRulesLock locking
only guards simple accesses to the appropriate two data strucures so there is
no chance of a deadlock. I verified that all accesses to the appropriate
two data structures are guarded by mRulesLock locking.

bug:17569997
Change-Id: Id9f4e3d19d6895876925ae32f12460db30359368
ava/com/android/server/ConnectivityService.java
7bfa35742a2ac204c71a35801fd4068a2b6ce4a9 19-Sep-2014 Paul Jensen <pauljensen@google.com> Merge "Fix to make repeated lingerings work." into lmp-dev
365e4c38d58d38bb61d1fdd870346f2f594825fd 18-Sep-2014 Christoph Studer <chstuder@google.com> Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()

When services call Service.stopForeground(), remove
FLAG_FOREGROUND_SERVICE from the notification that was supplied
to Service.startForeground().

This enables services to post notifications that become user
dismissable when they switch to being a background service.

Restrict this to targetSdk=L apps to reduce the risk of breaking
existing apps.

Bug: 17551106
Change-Id: Iff8541e5bb2a23ad1fbc9ad80df5fd6eb683148b
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ServiceRecord.java
ava/com/android/server/notification/NotificationManagerInternal.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationRecord.java
aad42d1204a0ef17d3b27319c17294a92d6fd362 19-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev
ace27915d2cc5073bcbe9cc151a5c61683bdcd1a 19-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17564607: Apps in the managed profile can send any intent...

...to the primary user, even if it was not whitelisted to be forwarded.

The path where getActivityInfo is called for the ResolverActivity
would not correctly apply the requested user ID to the result, so
it wouldn't run under the correct user.

Change-Id: I1da47c54bbed26091832a28236d0b06762c92437
ava/com/android/server/pm/PackageManagerService.java
51938c205f41da95486b17ea645fd0ce2a73be82 19-Sep-2014 Mike Lockwood <lockwood@google.com> Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev
8ebac231966e27364e5d463b63540a0527d40c4b 19-Sep-2014 Michael Wright <michaelwr@google.com> Respect intent-filter priority for system keyboard layouts.

Bug: 17573945
Change-Id: Id357e199b37ef771c4362c2a5c4ae762071f0042
ava/com/android/server/input/InputManagerService.java
6920feedb59899373040447e351c35909ffa1b45 19-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Don't count finishing activities as effective activities." into lmp-dev
4767f4b3a97ce468c6ef9abf8fb06e0b8051dba1 19-Sep-2014 Craig Mautner <cmautner@google.com> Don't count finishing activities as effective activities.

They were being counted as effectiveRoot even though they were
finishing.

Fixes bug 17550936.

Change-Id: Iaf7201e6150095e55f88344e4b257e4ae8f19a2b
ava/com/android/server/am/TaskRecord.java
8f2152c0215d769c9372e71538f6fdcbc52334f3 18-Sep-2014 Adrian Roos <roosa@google.com> Merge "Additional check to determine insets for recents animation" into lmp-dev
bc3126f859f626938810889cdc58b217c78caef5 18-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Remove activity icon bitmaps from system process." into lmp-dev
648f69b95ce7fc95f551f6e08a2408d6e57dbab9 18-Sep-2014 Craig Mautner <cmautner@google.com> Remove activity icon bitmaps from system process.

When a TaskDescription is sent up to the system process, the Bitmap
contained in the mIcon member is immediately flushed to disk and the
name of the file replaces it in the TaskDescription. Thereby saving
mucho RAM for better uses.

Fixes bug 17527308.

Change-Id: Ifac63ea5d12ed091d1eb03e178b8b847a827f940
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/TaskPersister.java
ava/com/android/server/am/TaskRecord.java
547f97ac93476589db39a1bef527f48bf7002018 18-Sep-2014 Christopher Tate <ctate@google.com> Merge "Log alarm delivery only when localLOGV" into lmp-dev
2ff5a73c3c39d144ef4195928000d5666d04c947 18-Sep-2014 Christopher Tate <ctate@google.com> Log alarm delivery only when localLOGV

Logspam is spam.

Change-Id: I3bb63f3026fc6222eb8e1496b3a5db4cdf3c7f57
ava/com/android/server/AlarmManagerService.java
103b143ecd347dd0f4894209188fd6afa561c9a3 18-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Don't remove active stacks from window manager" into lmp-dev
397157ce9cf73762170e0289f04a0788f4e50691 18-Sep-2014 Winson Chung <winsonc@google.com> Additional check to determine insets for recents animation

Bug: 17555722

Change-Id: I1474de7960dfebbdd32f159ace6677019a6b87a5
ava/com/android/server/wm/WindowManagerService.java
0cf001db60bd97bca26049d76723c5d99d4c5cac 18-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Protect from null Intent" into lmp-dev
b610b18a8a4de957e0845f1cc5fc96a0526ecd95 18-Sep-2014 Tsuwei Chen <tsuwei@google.com> Merge "Allow carrier specific requirement on GPS features to be specified through a dedicated configuration key. Currently, carrier requirement is specified through CAPABILITIES key, whose original purpose is to indicate the capability of the hardware, not to enable/disable features in GPS HW. With this fix, carrier requirement on GPS features can be specified properly without messing up with the real capability. This will satisfy VzW, Sprint and USC's requirement on SUPL mode, without sacrificing the capability of HW geofence." into lmp-dev
47b20ba8f667a0cf3ed9a1e34c93dcfdfd50eacb 18-Sep-2014 Craig Mautner <cmautner@google.com> Protect from null Intent

No bad intentions.

Fixes bug 17482657.

Change-Id: I0234787eb5e39cbdb548fb219341635cddd8b5d9
ava/com/android/server/am/TaskRecord.java
f3b47e95b14d040c4239b9188a10a4befb607459 18-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Use unified Tethering Permission Check" into lmp-dev
edb47668f072ba82ca389a1b78b1a2024ac31663 17-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Use unified Tethering Permission Check

The BT and Wifi mechanisms for enabling Tethering did their own
permission checks. This set of changes unifies the check into
a ConnectivityManager function so they can be kept in sync.

bug:17435527
Change-Id: I8c157a5acf56ffbddd349cb6a45160ae7be8541b
ava/com/android/server/ConnectivityService.java
88924b62fc63ecaf6410f1a1d76e9c54cab0ebef 18-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17536024: The am start's wait option doesn't..." into lmp-dev
462bcd8194cfbcf5ecbed893b19f1a21f721e1ed 17-Sep-2014 Tsuwei Chen <tsuwei@google.com> Allow carrier specific requirement on GPS features to be specified through a dedicated configuration key.
Currently, carrier requirement is specified through CAPABILITIES key, whose original purpose is to indicate
the capability of the hardware, not to enable/disable features in GPS HW. With this fix, carrier requirement
on GPS features can be specified properly without messing up with the real capability. This will satisfy
VzW, Sprint and USC's requirement on SUPL mode, without sacrificing the capability of HW geofence.

Bug: 17423585
Bug: 17288144

Change-Id: I71173722d4b12bfc17562f7b5444d22b01ff4590
ava/com/android/server/location/GpsLocationProvider.java
6025770e6b8e19f2fd9f5099ec30f59bc439b48e 18-Sep-2014 Craig Mautner <cmautner@google.com> Don't remove active stacks from window manager

Background:

In ag/406771 we stopped deleting empty stacks in activity manager
and window manager. This fixed a problem where dormant tasks were
being added back to stacks later.

In ag/476888 we introduced a callback to inform the ActivityView
holder that the embedded task was complete. This callback was made
from the new method ActivityContainer.onTaskListEmpty().

In ag/483035 onTaskListEmpty() was expanded to detach the stack of the
ActivityView and also removed the stack from window manager. There
was a mistake in that CL that causes it to remove any non-home stacks,
not just ones in ActivityViews.

That mistake left us with an empty stack in activity manager and no
corresponding stack in window manager. As a result, when trying to
bring back a task that used to be in this stack window manager threw
up an exception.

This fix limits the stacks detached by onTaskListEmpty() to those
on VirtualDisplays.

Fixes bug 17469145.

Change-Id: I85a4452e8e85625e657d88e4cb9f366fd4026441
ava/com/android/server/am/ActivityStackSupervisor.java
dd63245097dd6e49709c2579d51cd4f38a61d37d 18-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #17506095: Add ability to lock IME for specified apps" into lmp-dev
dcbe8356138bfba3f4bad31c1a7ad036b86f47f4 16-Sep-2014 Paul Jensen <pauljensen@google.com> Fix to make repeated lingerings work.

Previously PendingIntent.getBroadcast() would match an existing Intent
which had the wrong token. Fixed by distinguishing Intents by action.

bug:17482680
bug:17509008
Change-Id: Ib15bb006888850683cc47ca09920962f0707b351
ava/com/android/server/connectivity/NetworkMonitor.java
bb8aa5a1e9513d27700c9ac9f81d263c7a9ceeb1 17-Sep-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17506095: Add ability to lock IME for specified apps

Add a new configuration to speciify apps that partcipate in the
feature.

Change-Id: I8f5139b5ea09e758bff4472b2294df8becc74614
ava/com/android/server/SystemConfig.java
6cfbb718905210d146fbe8fb18c8e124f24845ec 17-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17536024: The am start's wait option doesn't...

...give time in some cases

This switch to multiple stacks broke the check to determine if it
should actually wait for a new activity to be shown. The new check
now also requires that the top activity be resumed, which means
we may get some false positives where we decide to wait and shouldn't,
but that is better than consistently not deciding to wait in some
cases when we should. (And we will always finish waiting then next
time something becomes visible).

Also add another time, which is how long it took from the startActivity
call to return with the result. And fix when we decide to report that
we are done so that, in the case where we are bringing an existing
activity to the foreground, we don't wait until its animation is complete.

Change-Id: Id38ca0070f04e7bf8c73e131fb055808553a0e2f
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStackSupervisor.java
36e793c73beb376c6c97275717a9ca4f848c9b51 17-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Eliminate misleading warning." into lmp-dev
fabab90d1e3b723db64ccb0cf4564971edd361d8 17-Sep-2014 Craig Mautner <cmautner@google.com> Eliminate misleading warning.

Remove token from deferred list of tokens to be removed once token
is removed. Leaving it in the list leads to logging messages like
"WindowManager: removeAppFromTaskLocked: token=AppWindowToken{...
} not found" when an attempt to remove it a second time fails.

Discovered in logs from b/17512377.

Change-Id: Ic83d81841b9b74ae5c4c433d1086d3bbda8e1d64
ava/com/android/server/wm/DisplayContent.java
63f10904a17db79cc8da08ff904d45d6d1cf0862 17-Sep-2014 Craig Mautner <cmautner@google.com> Add optimizations to keep TaskPersister queue small.

CTS tests cause the TaskPersister queue to fill faster than it can
drain. Since it contains screenshots this can consume massive
memory. Monkey may also cause the queue to back up.

Several optimizations are added to drain the queue when it gets
large:
- High water mark to recognize when queue gets too deep. Queue is
completely drained at this point so that obsolete files can be
removed from storage.
- Use Thread.yield() to give the TaskPersister write thread some cpu
cycles.
- Remove images from write queue when TaskRecord is removed from
recents.

May fix bug 17177273.
May fix bug 17381033.

Change-Id: If21c03c8f380e5f6816cf4701a40fcfe34ace3f1
ava/com/android/server/am/TaskPersister.java
c1e1550bf489b5fafff70154232c24bc5026b7df 17-Sep-2014 Jungshik Jang <jayjang@google.com> Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev
1a6be6ed3962735f12dbd5ce1bca758120c8fb8d 16-Sep-2014 Jungshik Jang <jayjang@google.com> Adjust volume bar visibility in HDMI-CEC system audio mode

When HDMI-CEC system audio mode is activated.
1. Hide volume bar when volume button is pressed in TV
2. Show volume bar when TV receives volume notification from
Audio Receiver.

Otherwise, (system audio mode off) follows normal TV's behavior.

Bug: 17347499

Change-Id: I1f5bc14285d60d8626a8fbbef9e1959cae7d193b
ava/com/android/server/hdmi/HdmiControlService.java
da6e9f10d0d828aa34dcf2b13a0c4333ac3be2c1 17-Sep-2014 Yuncheol Heo <ycheo@google.com> Remove MHL related code.

Bug: 17479050
Change-Id: Id4a76ccf7325c78817d1b3c3460e5dc40e23831b
ava/com/android/server/hdmi/MhlConstants.java
603537986568e6be03d167a431505739e9357ed5 17-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17507017: took ~3 seconds to move an app to the foreground" into lmp-dev
1a526f582b2c97a93324b68ae11492f2e25ab571 17-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev
e73cc4646bed3926024c9f54ca59e3a82a97b56c 08-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Add NetworkAgent event for ExplicitlySelected

Lets Wifi tell us when the user selected this AP vs auto-connected.

bug:17396168
Change-Id: I6e067ab62ed49040629aa31fe07ff880d3d542f0
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
7922882189a5c1cc62de7e91b067f90d9a3e2f2b 16-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #16662560: SingleTop activity is getting instantiated multiple time

Introduce a concept of a "root affinity" to a task -- this is the
affinity of the initial activity in the task. Use this instead of
the current affinity in findTaskLocked(), where we look for an
existing task to use for a NEW_TASK intent.

This changes the semantics of the new "relinquish task identity" mode
so that it doesn't relinquish the root affinity of the task. This
means when we are in the old style application-based recents matching
of findTaskLocked(), we will never count these tasks as the same as
the application's tasks only because they have relinquished their
identity to that application. This is probably okay, it is basically
putting a different line between new document-centric recents and
old application-centric recents when they are mixed together.

Change-Id: I73a22ead9bd08e98bf67ad035a017f828c6a6715
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/pm/PackageManagerService.java
b4f601cb840ddc03b6368328d4d0ffe1af339bea 17-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Report Network status to NetworkAgent." into lmp-dev
9c6b5b729bd83b1d1e00428f8a76f272b609c97e 16-Sep-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Re-connect the session on package update.

When TIF client tries to connect a session while TV input is being
updated, updateServiceConnectionLocked() may fail to bindServiceAsUser()
and the session state may remain indefinitely until a client tries to
create another session to connect the service. Reconnect the session by
calling updateServiceConnectionLocked() when package is updated.

Also, remove the session state when client dies before onSessionCreated().
This was causing the stale session in the above scenario (without
reconnection) to be connected to TIS even when client no longer exists.

Bug: 17518751
Change-Id: I5484df0d80c71649d22438521adf182ab59a6ce4
ava/com/android/server/tv/TvInputManagerService.java
ce4a0cf9cee73a2d6b1444d15d663e564a12593a 15-Sep-2014 Adrian Roos <roosa@google.com> Properly redispatch systemUiVisibility flags

Fixes two bugs introduced by change
I7bd32531130d199c0734ffcb800194e77b7e16c3:

When the system window insets consumed by DecorView
change as a result of changing flags, the insets must
be redispatched to the hierarchy.

Also fixes a bug where, as a result of removing the wrong
implication of the SYSTEM_UI_FLAG_LAYOUT_STABLE flag by
FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, the status bar was
being forced to black when returning from recents.

Bug: 17489047
Bug: 15046646
Change-Id: I127b0ff3b17c4873a7c28d67020f84298ed09db2
ava/com/android/server/wm/WindowStateAnimator.java
41f766394d07d09113d2e64a6917d069d41026c6 16-Sep-2014 Yuncheol Heo <ycheo@google.com> Merge "Make the playback device pass CEC CTS." into lmp-dev
89ec14e48f4a1bdf291cda9fba7b8172f55a2447 16-Sep-2014 Yuncheol Heo <ycheo@google.com> Make the playback device pass CEC CTS.

- Clear the logical address on the hotplug event.
- Don't reset mIsActiveSource flag on the hotplug event.

Bug: 17517438
Change-Id: Id129a9cce30323090ce21bbfc188b955bd32755b
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiControlService.java
dc524b714ee67dcd1aca42c49125f443f0e8f699 16-Sep-2014 Tsuwei Chen <tsuwei@google.com> Merge "Set user agent for XTRA download according to carrier specification. Bug: 17056380 Change-Id: Iacb90d4780f35fa6875702889d4a5f02610768b7" into lmp-dev
602d17c35343a7418e025932688d43158877f67c 16-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Quick fix issue #17514851: dumpsys package <package-name> includes..." into lmp-dev
f1317857cdf815b95822db16621a566fb12baf20 16-Sep-2014 Dianne Hackborn <hackbod@google.com> Quick fix issue #17514851: dumpsys package <package-name> includes...

...irrelevant install state at the end

Quick and dirty impl just doesn't print any of that data when filtering
by package name. In the future that part of the dump should be smarter
to know how to filter by package name. (Probably also moved to a place
earlier in the dump, so the key information -- the overall package
data -- is still at the end.)

Change-Id: I094f7c2f25401438a68a6aa00d10b19c19eb7c7d
ava/com/android/server/pm/PackageManagerService.java
95465200b0f652c48d40ca1028238763dd647900 16-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17507017: took ~3 seconds to move an app to the foreground

This is because of the 5 second timeout from when the user can bring
home to the foreground until regular third party apps can launch an
activity on top of it. Activities launched from notifications look
like they are being launched by the app, so get impacted by the timeout.

Fix this be also looking at the actual caller to see if they are
allowed to pop in front regardless of the timeout.

Change-Id: I63fbc2bcabf585e6d2810a2309f0613fdf91fdf5
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
f86f0e18c3bd0d81fe71445959ecf401cd7d2702 14-Sep-2014 Tsuwei Chen <tsuwei@google.com> Set user agent for XTRA download according to carrier specification.
Bug: 17056380
Change-Id: Iacb90d4780f35fa6875702889d4a5f02610768b7
ava/com/android/server/location/GpsXtraDownloader.java
63d991f28c1b6f37e19af94dd579bfa7c26a8067 15-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Add config option for permanent dpad presence." into lmp-dev
a59e62341ceb4f27aa1dc8a664efba42d00d668c 14-Sep-2014 Michael Wright <michaelwr@google.com> Add config option for permanent dpad presence.

Since all TV devices are required to have a DPad as a form of
navigation we should suppress any configuration instances where it
claims one doesn't exist just because it isn't currently connected.

This prevents applications from going through a configuration change
and potentially an app restart when a remote disconnects to save
battery.

Bug: 17493314
Change-Id: Ice87b7056984afe02917ccba9196fdbcac9985fc
ava/com/android/server/wm/WindowManagerService.java
b6eaa86440ab450e48bebdac8ad517d4eba0326b 15-Sep-2014 Matthew Williams <mjwilliams@google.com> Merge "Remove a minimum wake-up time for a job" into lmp-dev
720407ad06dbf4486ef6d724280640990d2fcd2a 15-Sep-2014 Jungshik Jang <jayjang@google.com> Fix cyclic mute

Bug: 17502271
Change-Id: I837315afce8193ac1948fffed66cbb8c755968e2
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
6b096d349b8ea879ee152a50df66427c919adaba 12-Sep-2014 Jungshik Jang <jayjang@google.com> Remove unnecessary warning.

Bug: 17501260

Change-Id: I5e7edd6d1fc179c00306d745adc99bebdcb65316
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/RequestArcAction.java
95686694f70a12978bbc4bc5eba2d59b88efd3c9 15-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "A little more work on issue ##16907799." into lmp-dev
24c98e8cf88f6edc3d5bdf2ce40a51f158f36884 15-Sep-2014 Dianne Hackborn <hackbod@google.com> A little more work on issue ##16907799.

I got distracted in the middle of it, and forget to finish
up with the test to not kill processes if they aren't using
an auto create binding.

Change-Id: Ieecfe97fa3208e50cb91ba94be2a8659d128b0de
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/AppBindRecord.java
ava/com/android/server/am/IntentBindRecord.java
f075330db4d0831588b45a1206467da03c0d906f 15-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #16907799: Processes containing bound services..." into lmp-dev
d8c36a7b60e29bb0581014eae243f201c4ca5eef 14-Sep-2014 RoboErik <epastern@google.com> Merge "Route volume commands whenever media stream is in use" into lmp-dev
465fa3963534e41ead0dce1273b71fd50c58c973 14-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #16907799: Processes containing bound services...

...are killed over eagerly.

When the current foreground activity is moving to the background,
it was briefly going through the CACHED_ACTIVITY state before the
correct LAST_ACTIVITY state, allowing its bound service processes
to be killed (because they went in to the cached list). To solve
this, as long as a process has stopping activities, it won't go
lower than LAST_ACTIVITY.

Also fixed a problem where we could put a process in CACHED_EMPTY
instead of CACHED_ACTIVITY_CLIENT. There were a number of cases
in the binding flow and also the client process state transitions
where we would not correctly updateing the bound client activity
state.

And add some sanity code so that if a process hosting a
service is killed, and a client process of that service is in the
cached state, we kill the client process. This avoids situations
where we can start thrashing around in the cached list because we
are restarting process for no reason -- since they will just
continue to be cached.

Finally, tune the process LRU list to allow twice as many cached
activity processes (from 8 to 16), so we can make better use of
the RAM we have available these days.

Change-Id: Ib0cdf78c321cbb035259fc9dd6ee27b5ba1f90c5
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/ProcessList.java
94c716ea2927cf7d16c66d8846b976f06bcb6460 14-Sep-2014 RoboErik <epastern@google.com> Route volume commands whenever media stream is in use

Found a regression in volume handling. Previously we handled
volume commands as long as the media stream was active but we were only
handling them when there was an active session on L. This adds a check to
make sure we handle volume if anything is playing on the media stream.

bug:17498479
Change-Id: Iddd745c8a762cf7ebedb37f1b26fc934db01fba0
ava/com/android/server/media/MediaSessionService.java
7ca1161e302ea415a2f4696514967f126dfa86fa 14-Sep-2014 John Spurlock <jspurlock@google.com> Merge "Saver: PowerManager call to set low power mode." into lmp-dev
e7d6816fd1f329a326539e966b7912f424f3c45e 14-Sep-2014 Ramanan Rajeswaran <ramanan@google.com> Merge "Fix creation issue of stack trace dump directory" into lmp-dev
645df3e3e473f0b7a095a61cb9947c7919f23036 14-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Correctly propagate SW_CAMERA_LENS_COVER_BIT" into lmp-dev
8d4e6cb06005a2ce994360340a6191f0690db8f4 14-Sep-2014 John Spurlock <jspurlock@google.com> Saver: PowerManager call to set low power mode.

- Add an explicit power manager call to set the low power mode state,
instead of trying manage everything around a single setting.
- When low-power mode is triggered by falling below the configured
threshold, it does not update the setting.
- The "is-enabled" api returns setting || below configured trigger.
- Move the snooze management into the new api call.
- Callers (sysui + settings) updated to use the api instead of the
setting.
- Handles the case where the level does an unpowered leap out of the
low battery level. (Possible if powered in-between while the device
is off)

Bug:17460535
Change-Id: Ic030504c9cad9868a7137abbe837b170da37852b
ava/com/android/server/power/PowerManagerService.java
f1f886f3ae58fc3b3bd50cc0dce806bb42582dbc 14-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Add null checks for quickly disappearing Displays" into lmp-dev
9e10d25732518f3d5740b5ede88f43cb28f51a14 14-Sep-2014 Michael Wright <michaelwr@google.com> Correctly propagate SW_CAMERA_LENS_COVER_BIT

Bug: 16034563
Change-Id: I3402d42056cda47fddadd09f838b1082d93fb00d
ava/com/android/server/input/InputManagerService.java
ee2ec05ed7c0d3cb9115f4ddd7c3613269c4a57b 14-Sep-2014 Jae Seo <jaeseo@google.com> TIF: Turn debugging off

Bug: 17476383
Change-Id: I28ff54a635bf6468c231efe776dbc8e35460d542
ava/com/android/server/tv/TvInputHal.java
ava/com/android/server/tv/TvInputManagerService.java
07ab0871eea8e307f412f3d7433016bff4c275aa 14-Sep-2014 Christopher Lane <lanechr@google.com> Merge "Handle null values in registerService" into lmp-dev
a0e0c0dfadf54ea7ba0eb1cfc5225c9887d3150a 07-Aug-2014 Jing Ji <a5705c@motorola.com> Fix creation issue of stack trace dump directory

Use the dirname instead of the filename to create the directory

Change-Id: I16e49303b2ff5e2592ed60eab766db32d02262fe
ava/com/android/server/am/ActivityManagerService.java
49f63fbed4cd84f5da182c85e8b999037dc64f3b 13-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Report Network status to NetworkAgent.

Currently just valid/invalid based on NetworkMonitor findings.

Changed NetworkMonitor to start out in default state since starting in Offline causes
a spurious invalid report at creation time.

Added some logging.

bug:17395269
Change-Id: I9ae650b561834d8f8979033744d97df852e76df9
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkMonitor.java
13f3c9344ff8358af4cfc9419e2178afb8bec762 14-Sep-2014 Adam Lesinski <adamlesinski@google.com> Merge "Fix issue with lifecycle of Activities launched from Lockscreen" into lmp-dev
1a70a16b64620e416ae8353960c6af6c40274e7a 13-Sep-2014 Craig Mautner <cmautner@google.com> Add null checks for quickly disappearing Displays

If a display is removed right after it is added we will get null
when trying to retrieve it from the DisplayManager. Check for that
null before commiting to using that display.

Fixes bug 17478906.

Change-Id: I89ae8cc7387729d678b9b1ed5b1797a93cdde3f9
ava/com/android/server/am/ActivityStackSupervisor.java
0f35cdd862fba23e9bcc5344403426ae74fec55c 13-Sep-2014 Christopher Lane <lanechr@google.com> Handle null values in registerService

Bug: 17491971
Change-Id: I0443a9accd86ab70510d16456a03912845718ca9
ava/com/android/server/NsdService.java
ef9f6f957d897ea0ed82114185b8fa3fefd4917b 13-Sep-2014 Tyler Gunn <tgunn@google.com> Renaming Telecomm to Telecom.

- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
ava/com/android/server/notification/ZenModeHelper.java
54eab3b35d798ce9ab061c53ac8219526132ac2d 13-Sep-2014 Adam Lesinski <adamlesinski@google.com> Fix issue with lifecycle of Activities launched from Lockscreen

ActivityManager still thinks the device is going to sleep, so
any Activity started while the lockscreen is showing is immediately
stopped. When Keyguard calls ActivityManager.keyguardWaitingForActivityDraw(),
then we must make sure that the ActivityManager thinks we are not sleeping.

Bug:17459745
Change-Id: I5c45c88e3a72e1f08e1b32101d0d0b4675f7a5ff
ava/com/android/server/am/ActivityManagerService.java
4b5c2d3cfc8aec4ab90097734a3556a0d0c0e68d 13-Sep-2014 Yuncheol Heo <ycheo@google.com> Change the property name to pass selinux.

- Added the prefix 'persist.sys.' to pass selinux and to make the
properties persistent after reboot.
- Shortened the name to fit the length to 31.
- Got together the properties in the near place.

Bug: 17491732
Change-Id: I051f1bacc51ee372806077159020600ffeb30f48
ava/com/android/server/hdmi/Constants.java
2175e9c366998ed7bd1a4501b94a02f4f49b932c 13-Sep-2014 Jeff Brown <jeffbrown@google.com> Add support for dozing after screen off.

On some devices, we want the screen off transition to complete before
we start dozing. Added a new config.xml attribute config_dozeAfterScreenOff
to configure this behavior.

Defer starting dreams until the display is ready.

Fixed some minor issues in the system UI doze service when setting the
display state.

Bug: 16187655
Change-Id: Ib1bc60de5457166f4b4880732db5df989dda67a4
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/power/PowerManagerService.java
c0595a7d7d2e3c893452168296c41b4f38989bac 13-Sep-2014 Matthew Williams <mjwilliams@google.com> Merge "Fix NPE in JobServiceContext" into lmp-dev
7ac52d5bf6652883e204ba322069f6960f58f611 12-Sep-2014 Matthew Williams <mjwilliams@google.com> Fix NPE in JobServiceContext

BUG: 17485390
The VERB_BINDING timeout that is set to wait for onBind() to complete
wasn't being cleared when onBind() returns false, i.e. that the service wasn't
available to be bound to.
This led to an NPE when the stale timeout expired. Fix is to clear the timeout
when onBind fails.

Change-Id: I318ca5ce1f3e12b170f7f256608ea7e28f3f120a
ava/com/android/server/job/JobServiceContext.java
a9f993cb40815f582780e40110d1ddf34de01a63 11-Sep-2014 Matthew Williams <mjwilliams@google.com> Remove a minimum wake-up time for a job

BUG: 16407786
The alarm manager doesn't impose restrictions about how soon an alarm
is allowed to be set in the future, so neither will the JS.
This behaviour should be the default, but filing under above bug
b/c this needs to happen to make CTS easier to write.

Change-Id: I55b53de5faac84f01e2ac3ce5458bfa19d73df68
ava/com/android/server/job/controllers/TimeController.java
6225dd239f6dcffb49bd1e1f33fdbb00623f378a 13-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Rework the task affiliate chain validation" into lmp-dev
ad50a1fed01e7c24531ad26d9de70c7b0127ea76 05-Sep-2014 Paul Jensen <pauljensen@google.com> Update Inet state when NetworkMonitor re-evaluates a network.

Previously the Inet state (the little exclamation mark beside the WiFi
and Cellular bars) only transitioned from bad to good once. With this
change it can transition back to bad (and later to good again) if a network
re-evaluation is triggered, say by ConnectivityManager.reportBadNetwork.
Also, avoid triggering re-evaluation in two unwanted cases.

bug:16214361
Change-Id: I7856724249ffcbb0945276dcf45019876231fdaf
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkMonitor.java
2ade126e626d5d6d2d2e82fce4060458a0ca21c5 12-Sep-2014 Craig Mautner <cmautner@google.com> Rework the task affiliate chain validation

The old chain was problematic. It started verification at the end of
the chain and then went no further. Then it went back down the
chain to the beginning with no checks. It also removed entries and
tried to add them back past the end of the ArrayList during boot
which caused the system process to shut down.

This method uses the ordering imposed by taskIds which is the same
order that the tasks were created. It fixes up and notes dropped
links and then reconstructs the list correctly.

Fixes bug 17467284.

Change-Id: I746ec2cdcc7ac6403278cfefc7a6db9b5549d226
ava/com/android/server/am/ActivityManagerService.java
61642ce8c3c604a5b4d101a1b5460069b82666b9 13-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Better handling of unvalidated networks." into lmp-dev
39b278798e541c25eb4133b3b0cb0886dfa8eac4 13-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17479850: AppOpsManager.checkPackage() allows..." into lmp-dev
0fcef84cca23724c13ecfe775b90dec3614cc3e3 13-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17479850: AppOpsManager.checkPackage() allows...

...root or shell to claim any package name

Re-arrange so checkPackage() doesn't go through the path where
the package name will be forced for root and shell uids.

Change-Id: I450cd6ac8148afd75b526724afdf46ab63de4c43
ava/com/android/server/AppOpsService.java
ae69f9fdb315a4929a71cc757fe0255120cb02c8 13-Sep-2014 Tsuwei Chen <tsuwei@google.com> Merge "Handle user privacy properly during network initiated requests. Bug: 16131208" into lmp-dev
514c58045980998909883bfed5810c9508fd2f7b 13-Sep-2014 Guang Zhu <guangzhu@google.com> do not allow monkey to flip OEM unlock flag

Bug: 11435021
Change-Id: I3a6865bc6c9fde245d8f4af3230716eac4a3f1b1
ava/com/android/server/PersistentDataBlockService.java
7c485bf66a2f9c2ca0ce54e624ce48d39c568b97 11-Sep-2014 Tsuwei Chen <tsuwei@google.com> Handle user privacy properly during network initiated requests.
Bug: 16131208

Change-Id: Ic6f83fcf24eef9e0e26e303bb652651f0dc2970a
ava/com/android/server/location/GpsLocationProvider.java
99f4c7d0c9c9c29ced22da0a8af4d1a04b0ef186 11-Sep-2014 Chris Wren <cwren@android.com> Invalidate the people cache on Contacts provider changes.

The Contacts database only seem to notify that a change has happened, not
which row was changed. We simply invalidate the whole cache on changes.

Added an info log for even 100th invalidation, so we can see how often it happens.

Bug: 17466975
Change-Id: I9988ea8db776c88afd835a4b3c50b9a982a309d0
ava/com/android/server/notification/ValidateNotificationPeople.java
37ccf18b841afacba5d20e427eb9fec0065f6ecf 12-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Fix lock inversion in PackageInstaller." into lmp-dev
71ac935526d29097891664af40c54c96d6de02e6 12-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Bring install and install-multiple into parity." into lmp-dev
2161a8ea123134ee3f9a10c0f8f56aabd8289f69 11-Sep-2014 Paul Jensen <pauljensen@google.com> Better handling of unvalidated networks.

Give unvalidated networks penalized scores and allow them to satisfy
requests.

Previously unvalidated networks were never allowed to satisfy
NetworkRequests and so never caused CONNECTIVITY_ACTION broadcasts.
Previously if there were no other networks present an unvalidated
network would still be made the default. This change formalizes
this behavior using our existing network score logic by assigning
unvalidated networks a highly penalized score.

bug:16358003
bug:17364306
Change-Id: I28fcd6f5ac4b52a4d1c234c472cfa8ba998bcc6f
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
a6c52ac6244d2666c48f51a999c78d588b0328f5 12-Sep-2014 Cheuksan Wang <edwang@google.com> Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev
820b70da0245bb2bc48d7b91f7207348514ee61d 12-Sep-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Refresh ManagedServices on user switch" into lmp-dev
cbf47916b3e7a971c3a61035eb2633f96fc043cb 12-Sep-2014 Jeff Sharkey <jsharkey@android.com> Fix lock inversion in PackageInstaller.

In a small handful of cases individual sessions call up into the
installer while holding their local locks. Defend against this by
treating most InternalCallback events as async. For sealed events,
perform the upcall outside of the session lock.

Bug: 17482676
Change-Id: I265d981c98c8928a0fced09d8b029ca16eb650d9
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
135ce76a26b94e6725c48abd87806946b0d4bc81 12-Sep-2014 Chris Wren <cwren@android.com> Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev
b53dfd4faeb57a51b6cdfc6bde6a441ef9a7ec31 12-Sep-2014 Christoph Studer <chstuder@google.com> NoMan: Refresh ManagedServices on user switch

Fix a bug where ManagedServices didn't unbind from obsolete and
bind to new services after switching the current user.

Bug: 17477093
Change-Id: Ica28978a01f84ba17bdd93e2feaf68547e837bcc
ava/com/android/server/notification/ManagedServices.java
ava/com/android/server/notification/NotificationManagerService.java
3b9309a01c9aa0544f97b2ec6abe7b254d829336 12-Sep-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Stub MHL Device

Replaced HdmiMhlLocalDevice with stub implementation,
and removed other MHL classes.

Bug: 17479050

Change-Id: I08880b0703eb4a94ae5e8aa973886a15f8160a38
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiMhlControllerStub.java
ava/com/android/server/hdmi/HdmiMhlLocalDeviceStub.java
a94417a51646a2560e44974c99435cb00bd96201 12-Sep-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Refactoring for MHL

This helps MHL code clean-up.

- Factored MHL constants out to a new class
- Renamed some methods

Bug: 17479050
Change-Id: Ia39f8bb51ce552ac10f587e6ee0431951f2f494b
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/MhlConstants.java
d4a94db1cd44a536d535de890a0a14919a39a0dc 12-Sep-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Bug fixes for vendor-specific command handling

- Add sendStandby()
- Respond with <Feature Abort>[INCORRECT_MODE] when the listener
is not ready

Bug: 17379243
Bug: 17358887
Change-Id: I26a4157a70f11206978763fbbe69e4190e3e1d5c
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
753fcc8a8a25b2a8625957b2edcad0af77dfd5e5 12-Sep-2014 Yuncheol Heo <ycheo@google.com> Merge "Handle <Menu Status> message." into lmp-dev
29b3e79dc3b98cc5239d6b0f267f3fd0615f4997 12-Sep-2014 Yuncheol Heo <ycheo@google.com> Merge "Respond <Feature Abort: Invaild operand> for the invaild messages." into lmp-dev
929d5ac5759e5d620e8b1d72208e68ed737f1845 12-Sep-2014 Griff Hazen <griff@google.com> Merge "Fix a NPE in NotificationManagerSerivice.cancelNotificationFromListener" into lmp-dev
184b124ec22a796327642e3546d366179e693f07 12-Sep-2014 Yuncheol Heo <ycheo@google.com> Handle <Menu Status> message.

- Just accept the message, not to response <Feature Abort>.
- Added the CEC message validation info.

Bug: 17382771
Change-Id: I0c1ba870b0acfcd0414f0a3e7bb6c41483879116
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageValidator.java
4c212897813d6c23b2e7ffba4a4c01e13a41b1fa 12-Sep-2014 Yuncheol Heo <ycheo@google.com> Respond <Feature Abort: Invaild operand> for the invaild messages.

- Previously it responsed <Feature Abort: Unrecognized opcode>, for the
invaild messages, but 'Invaild operand' is more accurate response.
- It'll not response <Feature Abort> for the invaild source and the destination.

Bug: 17382769
Change-Id: I4c5a146a57cc64f54224fa86810a777c232f4c9b
ava/com/android/server/hdmi/HdmiCecMessageValidator.java
ava/com/android/server/hdmi/HdmiControlService.java
b3ecb72af8cbbd4f6f8089d0dc22289f6e2588f6 11-Sep-2014 Jungshik Jang <jayjang@google.com> Use async polling for HPD action

Since Device polling holds whole IO thread while it's running,
other sending requests would be blocked until it's finished.
Usually polling takes more than 1 seconds and some action might
be timeouted.
This change sends polling message asynchrousely for
each device address.

Bug: 17381548

Change-Id: I2f47931c5882649d6ac56092986d34d1da48f710
ava/com/android/server/hdmi/HdmiCecController.java
5c0ed94debe51a2954cf9409b5477cfbcc03d7f0 12-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Consistent clean up of failed installs." into lmp-dev
e980804df16c968c14a56b8853886bf5f049f46e 12-Sep-2014 Jeff Sharkey <jsharkey@android.com> Bring install and install-multiple into parity.

This ensures that both are using (almost) identical logic when
deciding what installs to proceed with. Installs from "pm" for all
users now run as OWNER, and rely solely on INSTALL_ALL_USERS to
express intent. This keeps install session notifications simple.

Since installer UID can vary from installer package name, start
persisting the UID. Also parse some missing flags for install
sessions.

Bug: 17469392
Change-Id: I6d89b1a787aa2024cc4bebf6b9c29317c358e147
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
aeb88ed612d44576f53dbdfb89dfe74793a2d8dc 12-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #17477510: Time change notifications sent too often" into lmp-dev
d7f460936cd5ef8fb5443b303856a36acf6adb33 12-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17377423: Frequently see 500ms latency on app open..." into lmp-dev
20d97e1ce20a4db23fb1b9799f29744878ecee22 12-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Add null checks to WindowState.getStack() calls." into lmp-dev
998e608ddde20be32b79466963a285009525b3d2 12-Sep-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17477510: Time change notifications sent too often

Record the number of time change events seen by the alarm manager.

Change-Id: I154e7e068626c71f76ee7b26f3e38a885025e0fa
ava/com/android/server/AlarmManagerService.java
68ab6cf0ea4dce600728a433323ab73a956ec900 12-Sep-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Replace the MHL register name 'scratchpad' with 'vendor'" into lmp-dev
cbc771f50e998ec307c7e92009425c730cde49c5 12-Sep-2014 Craig Mautner <cmautner@google.com> Merge changes Ia6fe9724,I682b9acb into lmp-dev

* changes:
Show all windows from activity that hides keyguard
Make sure FLAG_DISMISS_KEYGUARD brings up bouncer
b3fbf9dbe8d41d91efbac2118b676af74592257b 12-Sep-2014 Jinsuk Kim <jinsukkim@google.com> Replace the MHL register name 'scratchpad' with 'vendor'

Bug: 17479050
Change-Id: If6fe2949d17ad2d407df5b797c1915eb0e9bf421
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiMhlControllerStub.java
41a7b7911eb7f1253c9037e70a6ffca9c535898d 12-Sep-2014 Craig Mautner <cmautner@google.com> Add null checks to WindowState.getStack() calls.

Fixes bug 12786011.

Change-Id: I7fed856f8c96eec47df0912cea9bce705ecf690a
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
7d7808fcf8e6a1c27d52375210f9da2705d5f590 12-Sep-2014 Craig Mautner <cmautner@google.com> Show all windows from activity that hides keyguard

Popup windows from the activity hiding the keyguard weren't being
shown. This change retrieves that activity from PhoneWindowManager
and applies the show or hide call to the windows that match the
activity.

Fixes bug 16479813.

Change-Id: Ia6fe97240aec85c5233eee9038138f7d48095a6e
ava/com/android/server/wm/WindowAnimator.java
9d52f791b94bbf03739bdee4ccdd3ecb514c8eeb 12-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17377423: Frequently see 500ms latency on app open...

...even for apps in cache

64 bit devices are cool, so they get to use more RAM for their
caches.

Shhhh, don't tell 32 bit devices, they get terribly jealous.

Change-Id: Iec9a0c43718a75530555bac50185658a682969aa
ava/com/android/server/am/ProcessList.java
cf79a56c717d29d59d0e585aa9d94eb1238c726e 12-Sep-2014 Amith Yamasani <yamasani@google.com> Merge "Check for singleUser attribute even for persistent apps" into lmp-dev
1208e2718daeae538dc89c37198092ccb32798a2 09-Sep-2014 Michael Wright <michaelwr@google.com> Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY

Bug: 17290118
Change-Id: Iae3866bf3f7ac24f756ec4c183e848a79d1f779b
ava/com/android/server/power/PowerManagerService.java
12a1d81de7c2e76a3eda9b997a8f8842b7ed2ff5 11-Sep-2014 Amith Yamasani <yamasani@google.com> Check for singleUser attribute even for persistent apps

This enables Nfc to start a service on a different user.

Bug: 17462401

Change-Id: I92b2bcc2867a380ee18f77a40032bc43e4672c23
ava/com/android/server/am/ActivityManagerService.java
532e551e68530f986c5e197810a33061b70f159f 12-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Add null check to TaskPersister file list." into lmp-dev
335e1f03df933bb5e4e4d9c00811192b1b19a92e 11-Sep-2014 Griff Hazen <griff@google.com> Fix a NPE in NotificationManagerSerivice.cancelNotificationFromListener

If a provided notification key does not resolve to a Notification Record

Bug: 17473071
Change-Id: Ib4b4156ca91eb9e545274a36722c2dc547aa39a3
ava/com/android/server/notification/NotificationManagerService.java
ee04543d58bf570fd77202d6d2cd861476c3daf6 09-Sep-2014 Cheuksan Wang <edwang@google.com> Send and download MMS via content provider instead of PDU bytes.

Change-Id: Ib5a93d07799c9e14fea8be820c6bd4bc7ae8be3a
ava/com/android/server/MmsServiceBroker.java
a5badf06dd818d67a8cdd2d42803e124be929ab8 11-Sep-2014 Craig Mautner <cmautner@google.com> Add null check to TaskPersister file list.

Ran out of file descriptors and got a null file list. This
checks for null file list.

Fixes bug 17461213.

Change-Id: Ia6d49d0bdb6da98623b76d2b87cd09bc0afa1f27
ava/com/android/server/am/TaskPersister.java
90f86baebdb53f2edb5e2bd2b3f6f43bc802f9a9 11-Sep-2014 Christopher Tate <ctate@google.com> Write new wallpaper files from scratch...

...rather than overwriting the existing wallpaper bitmap file "in
place." If the new bitmap is smaller than the previous one, we wind
up with the previous image's contents as spurious trailing file
contents. Also, it means that if any wallpaper image is particularly
large on disk, then we'll forever be backing up that high-water-mark
amount of data every time the wallpaper is changed.

The fix is to open the "write the new bitmap to disk" fd with
MODE_TRUNCATE.

Bug 17285333

Change-Id: I3d8708d72e316834b7ecec20386153a703efddd9
ava/com/android/server/wallpaper/WallpaperManagerService.java
cde5bb45cc86d181d96ee69da1832e6132162871 08-Sep-2014 Michael Wright <michaelwr@google.com> Change callback methods from add to register.

Also changes intent returning method from get to create. Both changes
are in response to API council feedback.

Bug: 17389882
Change-Id: I3b57e3fc202148e3bbb24ac61229f04e8b4ac41e
ava/com/android/server/display/VirtualDisplayAdapter.java
ava/com/android/server/media/projection/MediaProjectionManagerService.java
91b3566bec73fc7f66c9ea8415392ae8f5a24236 27-Aug-2014 Xin Guan <a18772@motorola.com> Temp enable the log to identify the wake up cause.

Bug: 17276890
Change-Id: I1c2b95807026539d8e5f1e8695019626468c00c1
ava/com/android/server/AlarmManagerService.java
8a16eabfaee2037fc2e41c2d4be4c18168761132 11-Sep-2014 Vinit Deshpande <vinitd@google.com> Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
26f9ea38a5b6030714757834b94dce737aa8d564 11-Sep-2014 Amith Yamasani <yamasani@google.com> Fix build

Import went missing between CLs

Change-Id: I8740b99dbce15b3f3508768ab3e02f551caf673d
ava/com/android/server/pm/Settings.java
2f67e237383ae6e76c44333ab79c6f0d1e3e568d 11-Sep-2014 Svetoslav <svetoslavganov@google.com> Merge "Windows for accessibility with wrong coords on rotation." into lmp-dev
91911fd952b7f11f1b9cef95b7077de0a69ddcc8 11-Sep-2014 Matthew Williams <mjwilliams@google.com> Merge "Add flag to JobParameters for job expired" into lmp-dev
f58e532e015ef31d879ee51aeeb251349784717c 11-Sep-2014 Amith Yamasani <yamasani@google.com> Merge "Apply cross-user restrictions to Shell" into lmp-dev
e107c3eb79be40f1071c4370fd9a3f9e4fd6d6de 09-Sep-2014 Adam Connors <adamconnors@google.com> Remove package level intent forwarding.

Clean up unused methods.

Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
0ecb0c4397445984a5c5db4c31f1210fb9b594a1 11-Sep-2014 Nicolas Prevot <nprevot@google.com> Merge "Fix: always allow getProviderMimeType within the same user." into lmp-dev
b180d7707ffc2671caf494f2110b8942cedb5521 11-Sep-2014 Svetoslav <svetoslavganov@google.com> Windows for accessibility with wrong coords on rotation.

We were handling rotation changes for accessiblity in the window
manager too early, before the rotation animation completes. This
lead to wrong window positions being reported to the accessibility
layer. Now we handle rotation for accessibility when the rotation
changes, if we will not animate, or after the rotation animation
completes.

bug:17457240

Change-Id: Ia772f4886bfdbe0f9bc9003c12f36b2fbd6f45ec
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
19ba61affbc0c4a4454abc6cf09f70ea428d1a62 02-Sep-2014 Chulwoo Lee <chulwoo@google.com> Notify of the update of TvInputInfo

The TvInputInfo is updated when
1. the package is reinstalled.
2. the media on which a newer version of TV inputs exists become
available.
3. the media on which a newer version of TV inputs exists become
unavailable.

BUG: 17349383
Change-Id: I983058b13678bd8ecf7d766dc8bdac5fed7df4a0
ava/com/android/server/tv/TvInputManagerService.java
92d141fbc2f6bfc85dca1056e40512cba6d1dddb 11-Sep-2014 Vinit Deshpande <vinitd@google.com> Don't require CONNECTIVITY_INTERNAL check for protected broadcasts

This change removes requirement that sender has this permission for
protected broadcasts (since they can only come from framework)

Bug: 17409667

Change-Id: I3431c20a4ed28b3ba2bfc3cf53772e63a3424a2c
ava/com/android/server/net/NetworkPolicyManagerService.java
ava/com/android/server/net/NetworkStatsService.java
023b6812abbca465773acd6141ff672d525a83ee 11-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev
547f6e1803f3193b117bb396bfbce8851b85a68b 11-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev
03a4da6e8e92b19c1345016c06694cb3aabbfc27 11-Sep-2014 Matthew Williams <mjwilliams@google.com> Add flag to JobParameters for job expired

BUG: 17424511
Introduce an "isOverrideDeadlineExpired" which will allow clients
to know when they are being run due to an expiry.
Nb that we check deadline expiry by checking that the constraints on
the job are not satisfied at execution time. Really this is the same
thing, as a job will not be run without its constraints being met,
unless the job has expired.

Change-Id: I4b91e5b5eadccabd91296d5a5ca66b859dbfaf5c
ava/com/android/server/job/JobServiceContext.java
ava/com/android/server/job/controllers/JobStatus.java
9b2d26b68347e246e67c588b548e81fca1d29353 11-Sep-2014 Jeff Sharkey <jsharkey@android.com> Consistent clean up of failed installs.

Instead of remembering to add clean-up logic to every install scan
failure case, rely on the fact that we're now throwing for all errors
and use a finally clause to delete data directory when requested.

When clearing data for a package, always try deleting the app data
directories, even if no record of the package exists. This helps
users recover from UID mismatches without resorting to a full data
wipe.

Bug: 17005516
Change-Id: I352863ef4e468c576ecf136549e21cceae2650d5
ava/com/android/server/pm/PackageManagerService.java
8cd28b57ed732656d002d97879e15c5695b54fff 09-Jun-2014 Amith Yamasani <yamasani@google.com> Apply cross-user restrictions to Shell

Even though Shell user is allowed to perform cross-user actions,
lock that path down if the target user has restrictions imposed by
the profile owner device admin that prevents access via adb.

If the profile owner has imposed DISALLOW_DEBUGGING_FEATURES, don't
allow the shell user to make the following types of calls:
start activities, make service calls, access content providers,
send broadcasts, block/unblock packages, clear user data, etc.

Bug: 15086577
Change-Id: I9669fc165953076f786ed51cbc17d20d6fa995c3
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
ava/com/android/server/pm/UserManagerService.java
652973fca83c48d8b4622493f10e656b8d86dd17 11-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17414533: update batterystats occasionally takes a couple...

...hundred milliseconds.

Rework the locking so that no critical paths block on the cpu collection.

Change-Id: Ie615a033f7f8b523b67abee62c581d1a8fce324c
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
192679a7d37d268854f4b17876c702625f9475eb 10-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17428001: Fix revokeUriPermissions

You can now revoke permissions that were granted to you.

Change-Id: I9a1872059edc715b10bbd2d653e45420d43331c3
ava/com/android/server/am/ActivityManagerService.java
ebcd9189e3ec3cc7321883b4a2ca1c76da52eff7 10-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Wait for animation complete before completing boot" into lmp-dev
8c9e975c44d35c111176e4b8c38555121495e7ae 10-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't accept score below 0." into lmp-dev
f1dc6860ffd64f887db13f4655b3c9bf36832df2 10-Sep-2014 Matthew Williams <mjwilliams@google.com> Merge "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager" into lmp-dev
86f0c21417fd78de78e1d56400b84fbc538d1e24 10-Sep-2014 Matthew Williams <mjwilliams@google.com> Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager

BUG: 17359770
Reuse the Manifest.permission.ACCOUNT_MANAGER to protect this receiver,
because when this intent lands it kicks off a sync for every account/provider
on the device.
Semantically this means "if you can't talk to an authenticator to do things like
get a token or add an account, then you can't send an intent to the SyncManager
that the accounts on the device have changed in some drastic way"

Change-Id: I7eccc38e135cb00ebb0aafc69afc802fe1c4f219
ava/com/android/server/content/SyncManager.java
35f7a94c846cfdaa75ed6bc58ec37bdef7a09be8 09-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Don't accept score below 0.

Network Factories are allowed to go below, but networks need to be
constrained. Allowing the network to go below 0 meant that -1 could
sometimes leak through and foul the logic.

The core of 17361330 will be fixed when we stop sending scores for
listens to NetworkFactories, but it exposed this issue too. Summary:

1 - add a network listener. This isn't a request so it's not sent
to networks.
2 - alter your score (ethernet sets score to -1 when the link goes
down) (16:07:39.782)
3 - a bug in ConnectivityService causes score changes to get sent for
all network requests and network listeners causing NetworkFactories
to no see 2 entities. This bug will be fixed by a pending change
(https://googleplex-android-review.googlesource.com/#/c/540840/).
This causes the ethernet NetworkFactory to see two entities, both
served by networks of score -1. (16:07:39.989)
4 - disconnect Ethernet - this only sends 0 scores for known
requests, not network listeners. Had it been sent for both entities
they both would have evaluated that the networkfactory score (-1)
was lower than the request score (0) and both released their
refcount. (16:08:03.147)
5 - this means the listener is tracked by the EthernetNetworkFactory
with a score of -1 while the factory itself has a score of -1 so the
network release isn't called.

bug:17361330
Change-Id: Ife34ca0f9c233dd3c3df80f6fea580af43afcdeb
ava/com/android/server/ConnectivityService.java
6e2f395a86d557d2de4b52dda419a5f3eee00c84 09-Sep-2014 Craig Mautner <cmautner@google.com> Wait for animation complete before completing boot

Defer the boot process in ActivityManagerService,
WindowManagerService and PowerManagerService until the boot
animation has completed.

Fixes bug 16309312.

Change-Id: Ic5e0d627ca4ded3e211c5d2afece89da40d34642
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/wm/WindowManagerService.java
c7c04890beaf459808aeecb7418913939abbd169 10-Sep-2014 Nicolas Prevot <nprevot@google.com> Fix: always allow getProviderMimeType within the same user.

Even if the ContentProvider is locked down.

BUG: 17428869
Change-Id: Id54edcd2589677973b7db538356943d23b250660
ava/com/android/server/am/ActivityManagerService.java
c727fb1fc2a0653f2f1355c2f5aa826a3126dcc4 10-Sep-2014 Adrian Roos <roosa@google.com> Merge "Only unbind agents of the user that is being refreshed" into lmp-dev
f950641e28b72e50505f94d0a1fa895b2cced783 10-Sep-2014 Adrian Roos <roosa@google.com> Merge "Add system trust agents on first boot or when adding user" into lmp-dev
443c2bafd824779a75cd4b922b6839a8df9795e9 10-Sep-2014 Yohei Yukawa <yukawa@google.com> Use public APIs to instantiate InputMethodSubtype

This is a groundwork for subsequent CLs that are
supposed to improve default input method selection
logics.

Historically we have had a @hide constructor of
InputMethodSubtype. However, this contructor is
a bit obsolete because we can not specify some
parameters that were added in recent platform
releases. We should use InputMethodSubtypeBuilder
instead.

BUG: 17347871
Change-Id: I72ad79682a58344e14380eb20e26edf98aee37cd
ava/com/android/server/InputMethodManagerService.java
109526fe4f01a2b7ac90106cf41966b2d872d03a 10-Sep-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Stub MHL Controller" into lmp-dev
732edf098fe9728238bf3b69a3b3cfcb221edf35 10-Sep-2014 Adam Lesinski <adamlesinski@google.com> Merge changes I79ba54d7,I224fb4b6 into lmp-dev

* changes:
Make UsageStats API default on only for the system
ActivityManager shouldn't return null for getCurrentUser
ad5f44a68c70f783fb4be85f089f63bfdd63ec0c 10-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
3870d451f7d3913a05ffa144d03167bde9221adb 05-Sep-2014 Adrian Roos <roosa@google.com> Add system trust agents on first boot or when adding user

While we're in there also call listeners when they're added
so they know the state immediately.

Bug: 17258031
Change-Id: I5f1186314795f3fafd78e1b3e2d5102cdaec65d6
ava/com/android/server/trust/TrustManagerService.java
bc09755e193c2802d2d88871ac3d1f182b260c30 09-Sep-2014 Jeff Sharkey <jsharkey@android.com> Missing manifest error should be NO_CERTIFICATES.

When META-INF/MANIFEST.MF is missing, treat as NO_CERTIFICATES
instead of CERTIFICATE_ENCODING. Also remove redundant layer of
debugging details when wrapping exceptions.

Bug: 15667982
Change-Id: I6e8216d5bf6e42da1feb70c89f991001380305be
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerException.java
ava/com/android/server/pm/PackageManagerService.java
e681c27dc62006358102a250b46726b7a88efe06 08-Sep-2014 Adrian Roos <roosa@google.com> Only unbind agents of the user that is being refreshed

Follow-up to I470261f659a573400b2eb1421eeb953c87e58b66.

Bug: 17416492
Change-Id: If0da5f163049540476d84d147c0e733fab1ae6d5
ava/com/android/server/trust/TrustManagerService.java
97dc52c8579d70a075e9c999f1f244bbcf3e9bc1 09-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev
9ed0292a650eb52becc0c17e4001767065d325ca 09-Sep-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev
806dbae9e12f3875cf0def3da2f3c3c2b768a844 09-Sep-2014 John Spurlock <jspurlock@google.com> Zen: Map transition to ringer-mode silent to "priority".

Instead of "none".

Bug:16875664
Change-Id: I2a425663f08f35854e7e857330afc20eef01ef2e
ava/com/android/server/notification/ZenModeHelper.java
da6e6c888f81d3bd19ff1f3cf9b081b7f9b2a013 09-Sep-2014 Amith Yamasani <yamasani@google.com> Merge "User restriction to disallow outgoing NFC beam" into lmp-dev
0b81adcaea4acd2968947efa516321e6378dd51d 09-Sep-2014 Riley Andrews <riandrews@google.com> Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev
26af829fd70609cf073b56e54e1f78faf83a5e8b 09-Sep-2014 Amith Yamasani <yamasani@google.com> User restriction to disallow outgoing NFC beam

This can be controlled by MDMs via DPM.

Also fixes:
- javadoc for restrictions
- persisting of cross profile copy/paste restriction

Bug: 17387303
Change-Id: Ie148f56189181d2a4c6345c0823d417ab13a94a3
ava/com/android/server/pm/UserManagerService.java
2f439763bd4ce8b38ab66ed45e3d8ed4a31e9a33 09-Sep-2014 Griff Hazen <griff@google.com> Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev
eddeb49a734a524347587e7654025c489fb6331e 09-Sep-2014 Adam Lesinski <adamlesinski@google.com> ActivityManager shouldn't return null for getCurrentUser

There was a race where ActivityManager would return null
for getCurrentUser() when switching between guest accounts.
This is because the Guest account was marked for deletion
while it was still active.

Bug:17290209

Change-Id: I224fb4b6836380e5acb7dbeb8f3343d74505f88a
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/pm/UserManagerService.java
76776943204fa5367d13948dba5b1e3de8916cd9 09-Sep-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev
bc0272754df7a2fb71bf709a2a8a7c852ee69e5c 08-Sep-2014 Wink Saville <wink@google.com> Change suffix UsingSubId to ForSubscriber.

Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
ava/com/android/server/TelephonyRegistry.java
8fd30e4486376b6cf7dd9af14d2e16428b22844f 09-Sep-2014 Griff Hazen <griff@google.com> Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev
bb8c4834613207cf880e8491b33eb495cc268548 09-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Add new wallpaper features for insets and offsets." into lmp-dev
c788487ae5b28bb6f84410fcdb101f0bdfcd467e 09-Sep-2014 Alexandra Gherghina <alexgherghina@google.com> Removing the NO_CROSS_PROFILE flag for intent forwarding

Bug: 17435289
Change-Id: Iffbecd3cf9338a8633bfcc5bc47247bfc50e7546
ava/com/android/server/pm/LauncherAppsService.java
ava/com/android/server/pm/PackageManagerService.java
eea87a3a44b27d849c594f1fcea57013f7c4d2fb 09-Sep-2014 Paul Jensen <pauljensen@google.com> Merge "Stop logging false error when lingering completes." into lmp-dev
fc2c5c919973c1b3c571eadca4bdf0d99167b2d1 09-Sep-2014 Paul Jensen <pauljensen@google.com> Merge "Don't send listening NetworkRequests to NetworkFactories." into lmp-dev
f9b42de2ab33de2eddf0bf25d88e3f4512aaf932 09-Sep-2014 Paul Jensen <pauljensen@google.com> Merge "Implement ConnectivityManager.reportBadNetwork() to trigger network validation." into lmp-dev
7fb614664707f4c67dbbad8320e7d3cc10750df1 09-Sep-2014 Griff Hazen <griff@google.com> Add support for a circular bitmap overlay for round android wear emulator.

Android wear emulators have never had support for enabling both gpu
emulation and also having a round clip overlay present. Fix this by
supporting a drawable overlay when the ro.emulator.circular system
property is set.

Bug: 13415409

Change-Id: I6e0840ebe5c77adb786a7ba7ec6af348308ca46a
ava/com/android/server/wm/CircularDisplayMask.java
ava/com/android/server/wm/EmulatorDisplayOverlay.java
ava/com/android/server/wm/WindowManagerService.java
e04c75eb3899e6a085c419bb92ff423b417ae8f0 09-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Use new device identifier to check if a layout has been set." into lmp-dev
1d13406538b79785d2d0928689b8d5037e851ecf 22-Aug-2014 Riley Andrews <riandrews@google.com> Use surfaceflinger for recents thumbnail rotations.

+ This removes 30ms of latency on app to home transitions
on volantis.
Change-Id: Ia3747b8f8be0d41b9b3d095753edfe1df185c84d
ava/com/android/server/wm/WindowManagerService.java
86aaca682479dea3a4c232edda13cba98e783572 09-Sep-2014 Michael Wright <michaelwr@google.com> Use new device identifier to check if a layout has been set.

Bug: 16486654
Change-Id: If55eacfc6878109b5bcb36ca338eb2cd75a40309
ava/com/android/server/input/InputManagerService.java
067e5f68b9216b233df1c6529db182ff9b2887ab 08-Sep-2014 Dianne Hackborn <hackbod@google.com> Add new wallpaper features for insets and offsets.

Issue #17394151: WallpaperService / Engines need to get notified
of WindowInsets

Issue #17394203 Wallpapers need a system API to be shifted in order
to support burn in protection

Adds a new API on WallpaperManager to set additional offsets to
make wallpapers extend beyond the display size.

Insets are now reported to wallpapers, to use as they may. This
includes information about the above offsets, so they can place
their content within the visible area. And to help with this, also
expose the stable offsets APIs in WindowInsets which is also very
useful information for the wallpaper.

Another new API on WallpaperManager to set a raw offset to apply
to the wallpaper window, forcing it to move on the screen regardless
of what the wallpaper is drawing.

Fix wallpapers when used with overscan enabled, so they still extend
out across the entire screen. Conveniently, the above new window
insets information is very useful for this case as well!

And a new wallpaper test app for all this stuff.

Change-Id: I287ee36581283dd34607609fcd3170d99d120d8e
ava/com/android/server/wallpaper/WallpaperManagerService.java
ava/com/android/server/wm/Session.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
ava/com/android/server/wm/WindowStateAnimator.java
f43f04ed6f20b917e126e8f831ff40a9e9775695 09-Sep-2014 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-dev
9ee5e7e17f7d65620f21d1a42865981e7bc56593 09-Sep-2014 Mike Lockwood <lockwood@google.com> USB string descriptors are not UTF8, so it is not safe to treat them as such.

Add AndroidRuntime::NewStringLatin1() to convert non-UTF8 strings to Java strings.

Bug: 17427781
Change-Id: I7df1d4e94a7beebc8b1a74c0c0a163b794025ae8
ni/com_android_server_UsbHostManager.cpp
e7df34e01d012ace848f4d557a030f5bc9e5157c 09-Sep-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev
58d90c18ec780dd7882a784f47270eb66c32361f 09-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Remove unused variables from UsbHostManager." into lmp-dev
f5e56d41a25b44e28db160350709aef7295e3119 09-Sep-2014 Michael Wright <michaelwr@google.com> Remove unused variables from UsbHostManager.

Change-Id: I68067b69de077667482633cc6ecd97ee94ecb699
ni/com_android_server_UsbHostManager.cpp
781041239f2931ca16c902fb371cd041b057c918 26-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Stub MHL Controller

Replace MHL Controller with a stub impl

Bug: 17259897

Change-Id: Id57bac363441f72b3da3f30d31c68c6d3b502237
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiMhlControllerStub.java
ni/Android.mk
ni/onload.cpp
ff4f6c8859ead7cc94ff0d5ce46c8b346a769523 09-Sep-2014 Tsuwei Chen <tsuwei@google.com> Merge "Manually merge QC's change for SUPL_ES." into lmp-dev
ceb79bc31a91daf3d43156947f6666d2a8887859 05-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> Prevent NotificationManagerService from using bad stream type

When deriving AudioAttributes from a Notification instance,
and having to use the legacy stream type field, make sure
it has a valid value, or use the default notification
attributes.

Bug 17408227

Change-Id: Icd1a122b33b8eceb1f6a177699885b0fb8a99b7c
ava/com/android/server/notification/NotificationManagerService.java
6a73202e00c2cef8f9438c3308f19739101c3d6d 08-Sep-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Fix speedbump with multiple package priorities" into lmp-dev
897b01b39e6fc4478956f649253a1c14330c9fdf 08-Sep-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev
1564b6d8d729eda405975828847841ba35a95735 08-Sep-2014 John Spurlock <jspurlock@google.com> Zen: Remove suppression of untagged vibrations in zen mode.

Bug:17313184
Change-Id: I07d24a7d9ce15160a4990391c53d7d6309a13c3e
ava/com/android/server/notification/ZenModeHelper.java
ff56885db332549d58d4d5f83a50bfac2353e43c 08-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev
6b0ed64fb868e64684031558cbdeedcd94d40713 05-Sep-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Add native bridge post-fork initialization

(cherry picked from commit d7746a8b65ee4690427ed798816f970218578fa3)

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
ava/com/android/server/am/ActivityManagerService.java
100d9471abcd9717046285afd9b84ca8171928eb 08-Sep-2014 Jason Monk <jmonk@google.com> Merge "Update downtime to handle TimeZone change" into lmp-dev
d2a38c78543c913da851d6c377c1890a20516a23 08-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Ignore finishing activities when fetching the top" into lmp-dev
e016605981985b64cc28a8272474ae925801548b 08-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev
77d218e1869e69c8d436b09cd11dcfe45e50b2cf 06-Sep-2014 Jeff Sharkey <jsharkey@android.com> Delayed ASEC allocation, refine progress handling.

For restore use-case, session creation needs to complete quickly, so
delay ASEC allocation until session is opened. When preflighting
size checks, only consider external when we have a known size for the
container. Also relax size checks when using MODE_INHERIT_EXISTING
on external, since we don't know how much of existing app will be
copied over.

Consider session as "active" while commit is ongoing, until we're
either finished or pending user interaction.

Always publish first client needle movement away from 0. Use 25% of
internal progress to reflect ASEC allocation.

Avoid CloseGuard messages about leaking PFDs.

Bug: 17405741, 17402982
Change-Id: I6247a1d335d26621549c701c4c4575a8d16ef8c2
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
3324e954127de3db2b3200fdefca8f4d0400b7bb 07-Sep-2014 Tsuwei Chen <tsuwei@google.com> Manually merge QC's change for SUPL_ES.

Original CL: https://android-review.googlesource.com/#/c/105431

Emergency SUPL

Added emergency SUPL when UE is
in emergency mode.

Bug: 17118312


Change-Id: Id9b77add9bbab139b983a84d5a4c798c9c94df43
ava/com/android/server/location/GpsLocationProvider.java
0175b882b5e021907c307ab0e455bff014ad8784 08-Sep-2014 Craig Mautner <cmautner@google.com> Ignore finishing activities when fetching the top

When the top activity is finishing we don't want to be comparing
it for matches to launching activities. This was keeping curTop
from matching itself when launching a lower task.

Fixes bug 17383648.

Change-Id: I837ac087ef965d99d12c98ab1c779de46716e204
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
aea5ceded8015b45e8372b83a02f184974f52d6e 08-Sep-2014 Craig Mautner <cmautner@google.com> Relax requirements on Activity.requestVisibleBehind

The requirement that the top app be resumed in order to request
background visibility was too strict. In particular when the
background app is pausing the top app will be stopped waiting for
pause to complete. This is an appropriate time for the background
app to request visibility but we were rejecting that request.

Also, there is no need for the top app to have an active thread
except to notify it of the changed state.

Fixes bug 17383876.

Change-Id: I52f910baf6c109565694e053445516e1e5fd1c48
ava/com/android/server/am/ActivityStackSupervisor.java
b3fdbac020f767e36dc3d63887c8f64d809096a9 08-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Lock down window manager while changing opacity" into lmp-dev
6f61204bcaa05ed846f67fd63769f63518e9ae85 07-Sep-2014 Craig Mautner <cmautner@google.com> Lock down window manager while changing opacity

Surfaces were being modified after destroy(). The check for mSurface
being null was not done while holding window the window manager lock.
This change adds locking to the surface modification methods.

Fixes bug 17383628.

Change-Id: I12ebbddc0f2cd7b43659370fac2c4fb053999bb5
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
2e7f3bdcc9ec0b3e95b565b943ecee2210f4b937 05-Sep-2014 Winson Chung <winsonc@google.com> Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)

Change-Id: Ic104876c5fe16997eca00e0a2b3d8644c927120c
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/wm/AppTransition.java
ava/com/android/server/wm/WindowManagerService.java
b31c0636344d8b0888e9ccf726d3f3cf6fc6f9aa 05-Sep-2014 Paul Jensen <pauljensen@google.com> Stop logging false error when lingering completes.

When lingering completes ConnectivityService would log an error message
saying the Network still had NetworkRequests. Fixed by ignoring
listening NetworkRequests which aren't a problem.

Change-Id: Ie78a1f91c47b012eae28a377dd77bee2cfcbde3b
ava/com/android/server/ConnectivityService.java
d7063e66ab03f68a85ec96df2e83e2af551bef77 05-Sep-2014 Paul Jensen <pauljensen@google.com> Don't send listening NetworkRequests to NetworkFactories.

We were doing this when a NetworkAgent updated its score.

bug:17393458
Change-Id: Id19ffc36b942b7112da70dfadd6abd57fcd128bd
ava/com/android/server/ConnectivityService.java
e9aac5f44d7bf8c4a523773e57c30fd8340850eb 06-Sep-2014 Griff Hazen <griff@google.com> Remove reference to StatusBarNotification after the value is accessed.

StatusBarNotificationHolder values are fetched exactly once.

Bug: 15426276
Bug: 16575857
Change-Id: I3d11aba717d17426d31e7b1a07560f6b7e79c4ec
ava/com/android/server/notification/NotificationManagerService.java
a4e102ee580282dc7abeb22f4a025813e53b9431 05-Sep-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17357238: Recents is often slow if not used in a while

Add a new activity attribute, resumeWhilePausing, that allows an
activity specifying it to immediately start running without waiting
for the previous activity to pause. The recents activity is updated
to use this.

The implementation of this is ultimately fairly simple -- if we are
in the path of resuming such an activity, and find that we first need
to pause the existing activity, then within the activity manager we
do the regular pause flow but act like it has immediately finished
pausing right then so that we can immediately go on to the resume.
To make this clean, we tell the activity when asking it to pause that
it should not come back and tell us it is done, because we aren't in
any way waiting for it.

One potentially important change I needed to make here is the pause
callback no longer provides the saved persistent state, because we
now can't count on that callback happening. I don't think there was
really any utility in this anyway -- all modern apps will have their
save state flow happen as part of stopping, not pausing, so we'll
only capture that saved state when the stop is reported back anyway.
And since we do send the saved state back when stopping, it would
always blow away whatever we had gotten at the pause.

Finally, update the documentation for AppTask.startActivity(), and
fix the implementation handling that to be cleaner -- we need to
deal with inTask first before getting in to "oh noes add NEW_TASK
if this isn't coming from a calling activity" flow.

Change-Id: Ia1da0fac90d7bdbaafdda2e34850d795ce17a39f
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ecd827ac0d7a62ea81b8123120be1fe6424c2338 06-Sep-2014 Christopher Tate <ctate@google.com> Fix binder identity use when clearing wallpapers

Don't restore it too soon, because the rarely-needed fallback path
will need to be executed as system, too.

Bug 17394246

Change-Id: Ic5e662d4eae331b016fc91ffd08647bd8d4d6ff3
ava/com/android/server/wallpaper/WallpaperManagerService.java
4021e508611931b63af5eba9b599a7d759ea91bf 06-Sep-2014 Justin Koh <justinkoh@google.com> Merge "Make the image wallpaper component overlayable" into lmp-dev
29c30161281341ec851817534c24f17f91625e52 06-Sep-2014 Justin Koh <justinkoh@google.com> Make the image wallpaper component overlayable

This is necessary for devices that want to have wallpaper but don't have
SystemUi.

Bug: 17394246
Change-Id: I75c2a3a2120fd6600274d44059b3f85569b9a187
ava/com/android/server/wallpaper/WallpaperManagerService.java
fec0f4fc30b9b585284d3c5337266592f0b96723 06-Sep-2014 Tsuwei Chen <tsuwei@google.com> Merge "Properly register all Intent filters. Bug: 17408889 Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152" into lmp-dev
5341f94a191ae57b138f97cd516842bcf04c0609 06-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Separate active state from open/close." into lmp-dev
8f4d42ce00609e95ef1e842953c6d05fc60e991d 06-Sep-2014 Sreeram Ramachandran <sreeram@google.com> Reserve NetIds 1..50 for OEM use.

Also reserve 51..100 for our use.

Bug: 17303534
Change-Id: Id082368b493dc3c5b5c479e51d273458d80ec6aa
ava/com/android/server/ConnectivityService.java
bc7bce38b2e4733a14f6296c75f983bd50f996d1 06-Sep-2014 Jeff Sharkey <jsharkey@android.com> Separate active state from open/close.

Also change name to setStagingProgress() to make it clearer that
system may adjust the range. Start throwing from openSession() in
preparation for ASEC allocation moving.

Bug: 17405741
Change-Id: Id7da51a32d5d89cb512ddafbd7ceaafbcd41cac6
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
48d37f957a9db65bbccf0e4b4bc79e00f88f199e 06-Sep-2014 Tsuwei Chen <tsuwei@google.com> Properly register all Intent filters.
Bug: 17408889
Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152
ava/com/android/server/location/GpsLocationProvider.java
624a205e74c54a1eb510a95dfb84c12f49d2b89f 06-Sep-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Unescape strings properly in NsdService." into lmp-dev
a0c9962388361522257b4ff2f55ac7cea0d559f3 06-Sep-2014 Christopher Tate <ctate@google.com> Merge "Don't crash in addPackageHoldingPermissions()..." into lmp-dev
522f671eb0c939a6f0c3afb79760843ee36a76b7 06-Sep-2014 dcashman <dcashman@google.com> Merge "Fix boolean comparison after sig check." into lmp-dev
30f349d2ef3f2220c1d478b0faff4c38eaadf12c 05-Sep-2014 Christopher Tate <ctate@google.com> Don't crash in addPackageHoldingPermissions()...

...in cases involving uninstalled apps, or apps whose install state
varies across different users.

Bug 17398315

Change-Id: I7297d82f8bf5d49c50a7fd53d795a706bf2d2313
ava/com/android/server/pm/PackageManagerService.java
69dd40d08a164d5c357442733cf291719dfe94e8 05-Sep-2014 Griff Hazen <griff@google.com> Merge "Reduce chance of notification listener dropped messages." into lmp-dev
2de4f9f971b0130449ab90305965963f688d1ed3 05-Sep-2014 dcashman <dcashman@google.com> Fix boolean comparison after sig check.

Bug: 17402843
Change-Id: I0cb5ffba1a93f71a250294a41040011234ce1029
ava/com/android/server/pm/PackageManagerService.java
605e71922e83e887991b2ef2bce1b24358098288 05-Sep-2014 Carlos Valdivia <carlosvaldivia@google.com> Merge "We shouldn't delete accounts when a package is being updated." into lmp-dev
23f58260bd70dc9ca2787f54093ec0369dc3f02c 05-Sep-2014 Carlos Valdivia <carlosvaldivia@google.com> We shouldn't delete accounts when a package is being updated.

Bug: 17158237
Change-Id: Icbf9e672a6a698737b08ed39c78a64c161a7b802
ava/com/android/server/accounts/AccountManagerService.java
7381daa0b99ef5beb224ffd2544a156af40e78d1 05-Sep-2014 Chris Wren <cwren@android.com> remove unused matchesCallFilter(Bundle, int)

Bug: 17402728
Change-Id: I0be7c70597a629ca0bd60b7230ffcc58e8e7aeac
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ValidateNotificationPeople.java
ef12884da7c8844f8dd27cbc9c9980f685b73a2c 04-Sep-2014 Sreeram Ramachandran <sreeram@google.com> Unescape strings properly in NsdService.

NativeDaemonEvent.unescapeArgs() was improperly skipping the terminating
quote in cases like "\\", where the char preceding the quote is a
backslash, but the backslash itself is escaped, so the quote is indeed
an unescaped terminator.

unescapeArgs() doesn't unescape "\xxx" decimal escapes used by mDNS, so
fix NsdService to do that sort of unescaping explicitly (which is only
applicable when it receives a "fullname", in SERVICE_RESOLVED).

Bug: 16983542
Bug: 16986203

Change-Id: Idfa79749336c68424d961bc414f984c525b7e5e6
ava/com/android/server/NativeDaemonEvent.java
ava/com/android/server/NsdService.java
a6863ad62296a5280504165a1fbc70523940a9c8 05-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Allow for event dispatching when in non-interactive states." into lmp-dev
77a634503f75b58309ad7a7cf669df57f8b477e8 05-Sep-2014 RoboErik <epastern@google.com> Merge "send volume button events to adjustSuggestedStream instead of adjustStream" into lmp-dev
272e161c1a200900cb10b5b0cdab8ae1f123cabd 05-Sep-2014 RoboErik <epastern@google.com> send volume button events to adjustSuggestedStream instead of adjustStream

This way the audio system can route the adjustments correctly when a bt
headset is connected.

bug:17281977
Change-Id: Ic41d038e47179baffc86e539562da285446148c7
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
d208c79b3eb86042838700b5191922429571e80c 05-Sep-2014 Jason Monk <jmonk@google.com> Update downtime to handle TimeZone change

Bug: 17344461
Change-Id: Ic18d0c469fac5a4c8973e52dd1e687cea2266b55
ava/com/android/server/notification/DowntimeConditionProvider.java
43a2d06166f9d5aa46371c6496ec99a9fba8df00 05-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Allow badging updates to install sessions." into lmp-dev
ec9bad2015c6d3bc91bab66f0824043c1e24d013 05-Sep-2014 Jeff Sharkey <jsharkey@android.com> Allow badging updates to install sessions.

For the system restore use-case, an installer may need to enqueue
their sessions quickly before badging details, like icons, have been
downloaded. This change relaxes to allow an installer to update
their session badging after the session has been created. Notify
observers when badging changes.

Rename callback registration methods to match style guide. Relax
constraint that observers are home app. Fix bug around internal
progress reporting.

Bug: 17376797, 17389236, 17334199
Change-Id: I5fb88508baea2f08e89a1504fcf5ef972afad4a7
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
fbac21410383e65951cb88ff567ae6bf2dcde82e 05-Sep-2014 Christoph Studer <chstuder@google.com> NoMan: Fix speedbump with multiple package priorities

Bug: 16782616
Change-Id: I747dc981f7974720da9f277ec6e3fba31c21f226
ava/com/android/server/notification/NotificationManagerService.java
c237555c6cb89c347acf13eba45b875946473501 05-Sep-2014 Chris Wren <cwren@android.com> Merge "Keep contact affinities separate across users." into lmp-dev
da4bd209cffad7e47a4bc6e9f02c4bfc333d3d8d 04-Sep-2014 Chris Wren <cwren@android.com> Keep contact affinities separate across users.

Also ignore people extras on USER_ALL notifications.

Bug: 16213960
Change-Id: Ic0341c88d42d4a4f12cac35c0f41c2746aec02ac
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/ValidateNotificationPeople.java
ava/com/android/server/notification/ZenModeHelper.java
7f579fda4b3c83da6013a177e15c927360d37099 05-Sep-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Fix speedbump for PRIORITY_MIN intrusives" into lmp-dev
327bf78a7d1fd0ebf270af04005e9ff2405b59b7 05-Sep-2014 Christoph Studer <chstuder@google.com> NoMan: Fix speedbump for PRIORITY_MIN intrusives

Bug: 16782616
Change-Id: I35fb875bed8cbd90ecd37edc8973c1771be3584d
ava/com/android/server/notification/NotificationManagerService.java
b836ddef159fdd239320a9645f3a5e5ea0ea9e7d 05-Sep-2014 Jason Monk <jmonk@google.com> Merge "Allow downtime to exit from no interruptions" into lmp-dev
839849111c21e4936fec473ab08e21a12cd36736 05-Sep-2014 Brian Carlstrom <bdc@google.com> Merge "Fix backwards arguments to performDexOpt" into lmp-dev
d382be9b220d8f68d095cd5df56c0b900af44f9a 05-Sep-2014 Brian Carlstrom <bdc@google.com> Fix backwards arguments to performDexOpt

Bug: 16696554
Change-Id: I302f8edc8243d3537afd564599cc798708124dbe
ava/com/android/server/pm/BackgroundDexOptService.java
ava/com/android/server/pm/PackageManagerService.java
71cc3b8e84f34c4603da6115193d51336af423db 05-Sep-2014 Jungshik Jang <jayjang@google.com> Merge "Prevent sending <Feature Abort> for some messages." into lmp-dev
70af00abf73160235d4efe114fcf4753007a8ff3 04-Sep-2014 Michael Wright <michaelwr@google.com> Allow for event dispatching when in non-interactive states.

We need to allow for event dispatching in non-interactive states so
that we can enable a richer set of interactions when a device is
dozing (i.e. is in a low power state with an Always-on-Display).

Bug: 17167296
Change-Id: I8ae0f544a8106cb91ff38c2309b8b57cbe2f2c72
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/input/InputManagerService.java
ava/com/android/server/wm/InputMonitor.java
ni/com_android_server_input_InputManagerService.cpp
46edee0994354e828bd6d0bffe60b6036b8c1388 05-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Prevent recursion in resumeTopActivityLocked" into lmp-dev
544efa76639b46e4177b385d498fca60c8b6ded5 05-Sep-2014 Craig Mautner <cmautner@google.com> Prevent recursion in resumeTopActivityLocked

The existing recursion in resumeTopActivityLocked() finally caused
a problem by attempting to pause the same activity twice. By
preventing the recursion with this change we no longer face that
problem.

Fixes bug 17260463.

Change-Id: I0954614fc1a7dc0eeeef9335c1b973a42a7fc345
ava/com/android/server/am/ActivityStack.java
4480efa05aa5dd44f1432c3260be263546daf838 04-Sep-2014 Jungshik Jang <jayjang@google.com> Prevent sending <Feature Abort> for some messages.

This change fixes the following cases.
- <Report Power Status>(0x90)
- When TV receives <Report Power Status> as a reply of <Give Device Power Status>, TV does not send <Feature Abort>. But if a device sends <Report Power Status> actively, TV sends <Feature Abort>.
- <Set System Audio Mode>(0x72)
- <System Audio Mode Status>(0x7E) Directly address message is also defined.
- <Record Status>(0x0A) (We will support One-touch record function at least in Japan)
- <Timer Status>(0x35) (We will support Timer programming function at least in Japan)
- No response for <Record TV Screen>(0x0F)

Bug: 17382769
Change-Id: I8ae355337757710d54b788edfdf37293f96cfa97
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/PowerStatusMonitorAction.java
f4df7656b950ad61124d5f8d856640797bf1995d 05-Sep-2014 Jungshik Jang <jayjang@google.com> Merge "CEC: Revamp volume control action." into lmp-dev
70afe9ee84a41fda72f898716da8485e8dd419d9 05-Sep-2014 Ye Wen <ywen@google.com> Merge "MMS API cleanup (1/4)" into lmp-dev
2e8f1b6399089626b4f0249427626ba6e63a62ef 03-Sep-2014 Jungshik Jang <jayjang@google.com> CEC: Revamp volume control action.

Here is a list of changes
1. Change volume control into event base not level base
2. Hide volume ui if volume change is triggered by CEC
3. Report volume change triggered by CEC in OSD message
4. Revamp HdmiLogger so that normal class uses static method only.
5. Apply format message to HdmiLogger's helper methods.

Bug: 17367215

Change-Id: I9f3cd41f7c66f76919059b463df956ed5176b054
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecFeatureAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageValidator.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiLogger.java
ava/com/android/server/hdmi/RequestArcAction.java
ava/com/android/server/hdmi/RequestArcInitiationAction.java
ava/com/android/server/hdmi/RequestArcTerminationAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/VolumeControlAction.java
fd12f4c9e4985e75b38a8136cf6fdb0a6ce726d6 05-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Hold package cleaning until system is ready." into lmp-dev
7767df3c9c4cffab623f7e9decc99d86d443794e 05-Sep-2014 Amith Yamasani <yamasani@google.com> Merge "Fix crash if package setting is not populated yet" into lmp-dev
8179c2a6e47fca18a12275166065e36790eec083 05-Sep-2014 Ye Wen <ywen@google.com> MMS API cleanup (1/4)

- Hide APIs not approved by API council (b/17189780)
- Change configOverrides in MMS APIs from ContentValues to Bundle to be
consistent (b/17390017)
- Change SmsManager.MMS_EXTRA_DATA to EXTRA_MMS_DATA per API council
review (b/17390977)

b/17189780
b/17390017
b/17390977

Change-Id: If5a43e9ab9e42b6328f1581b39051ddf1a58f0dd
ava/com/android/server/MmsServiceBroker.java
c50e7e847702897b7087bc59cac77c1b78b57f32 04-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17175312: Calendar crashed when tapping on the event notification" into lmp-dev
43789f56147f7d028a5ca1da3a3332adf7542b28 04-Sep-2014 Amith Yamasani <yamasani@google.com> Fix crash if package setting is not populated yet

Bug: 17388687
Change-Id: I441ec37396a3b725a79b933a182c63fbe52d5646
ava/com/android/server/pm/PackageManagerService.java
430f5680b67c585611c24fc342559019198ba361 04-Sep-2014 Adam Lesinski <adamlesinski@google.com> Merge "Add Configuration changes to UsageStats" into lmp-dev
7f61e96db7c90c1f4418359672aa4656aebee500 03-Sep-2014 Adam Lesinski <adamlesinski@google.com> Add Configuration changes to UsageStats

Bug:17354208
Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
ava/com/android/server/am/ActivityManagerService.java
977c5bec526b9e763a8d40b416b1d5e4ea92274a 04-Sep-2014 dcashman <dcashman@google.com> Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev
925e2b335237153648ecad84d5fa280669f4cf1a 04-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17175312: Calendar crashed when tapping on the event notification

mActivities can be null.

Change-Id: I9cc1a08d19d2c38a4ebaaf0ed2168cfbeeaf3b51
ava/com/android/server/am/ActivityStack.java
18aa9f65fd27aa3d5322dd669b52c8cc1c4d9b5a 04-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Add support for SW_CAMERA_LENS_COVER." into lmp-dev
0f6c32af063a44e22af72825f19f51808a2c0cf3 04-Sep-2014 George Mount <mount@google.com> Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev
9e18397112df0ebe49b9e4325d7040498b2afcfa 03-Sep-2014 George Mount <mount@google.com> "Back" with translucent window now sets ActivityOptions.

Also made convertToTranslucent set the canvas opacity.

Bug 16215650

Change-Id: Id4325eaed34cda1269d874f239aeb5f6f82c959f
ava/com/android/server/am/ActivityManagerService.java
0fb810a3fadf783e5866f977e43b98fcf294db94 04-Sep-2014 Chris Wren <cwren@android.com> Merge "Honor per-app sensitivity setting." into lmp-dev
dea8e0112286664a8a176cc9d17bee6774bc62d7 04-Sep-2014 Amith Yamasani <yamasani@google.com> Merge "Allow adb install to work even if unknown sources is disallowed" into lmp-dev
ece305d585a3b8888ec962a5daf7a13bb93ab454 04-Sep-2014 Amith Yamasani <yamasani@google.com> Allow adb install to work even if unknown sources is disallowed

adb installs should continue to work for developer usecases,
but PackageInstaller continues to be blocked for sideloading
via the UI - browser, downloads, etc.

Bug: 13760585
Change-Id: I4f8c1445448584c17e5acf77b399579c2643f333
ava/com/android/server/pm/Settings.java
7ccd3dfd53d8d45c447398ff137f052865dfd3b3 29-Aug-2014 Paul Jensen <pauljensen@google.com> Implement ConnectivityManager.reportBadNetwork() to trigger network validation.

Network traffic used to perform the network validation is billed to the UID of
the caller of reportBadNetwork. This change does not change the actions taken
upon validation failing or succeeding: NetworkMonitor will show the sign-in
notification if a captive portal is found. NetworkMonitor will inform
ConnectivityService if a network tests functional. NetworkMonitor will not
take action if a network lacks any connectivity.
Also, remove an unused Thread that was confusing bandwidth billing.

bug:17326268
Change-Id: I7fea23480af54211004a0a1c535a71c2793f21bb
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
ava/com/android/server/connectivity/NetworkMonitor.java
3ad4e3a45bbe44129b14c4d391431e44f1e04f0c 02-Sep-2014 Chris Wren <cwren@android.com> Honor per-app sensitivity setting.

Settings are stored by NotificationManagerService in the policy file,
and are communicated to NotificationListeners via a hidden API on the
RankingMap object.

Bug: 16324353
Change-Id: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/PackageVisibilityExtractor.java
ava/com/android/server/notification/RankingConfig.java
ava/com/android/server/notification/RankingHelper.java
acb8dfe0a692883d56a787171cf350c24549beff 04-Sep-2014 Jason Monk <jmonk@google.com> Allow downtime to exit from no interruptions

Since the user can specify it to exit from no interruptions, it
needs to actually exit.

Bug: 17331112
Change-Id: I9a8412e5b42af17e79798f5ea4bcf3e19924cc93
ava/com/android/server/notification/ConditionProviders.java
4c4e7964447ab75d80803ceca8bed8b951c134b5 04-Sep-2014 Kenny Guy <kennyguy@google.com> Merge "Use context for user when calling notifyAsUser" into lmp-dev
ebb42e18e8a9c31c92ef4bca0b38d2447afc5558 04-Sep-2014 Brian Carlstrom <bdc@google.com> Ensure that BackgroundDexOptService can still perform dexopt

Bug: 16696554
Change-Id: Id5877618ec9620112fa31dd69016c060bb26b2a7
ava/com/android/server/pm/PackageManagerService.java
436e264e87dcbcebfd9c123685505ce547744b7f 20-Aug-2014 dcashman <dcashman@google.com> Add upgrade KeySets check to permission pruning on install.

Bug: 16564805
Change-Id: I80393eec3c6e1e861a9ec2ae27fe37027311948d
ava/com/android/server/pm/PackageManagerService.java
b541f09be309f5f314760ff832bda245e6ec9cdd 04-Sep-2014 Christopher Tate <ctate@google.com> Merge "Fix crash in KeySet dump" into lmp-dev
6441bc7e5366610771b587a8cb6ff04c2861b7a5 04-Sep-2014 Christopher Tate <ctate@google.com> Fix crash in KeySet dump

This was unfortunately DOSing some important parts of the Package
Manager's dumpsys output.

Change-Id: I228f23e8e26820b40a8d8772cd5f5b04ee8317d9
ava/com/android/server/pm/KeySetManagerService.java
aa6a67a3e1d1095ee5b25c91cb2dd524775c0e89 04-Sep-2014 Yuncheol Heo <ycheo@google.com> Merge "Invoke the callback only when DeviceInfo is available." into lmp-dev
8364885a7d256de783a670c102baebdc25d45bf0 03-Sep-2014 Marco Fucci <mfucci@google.com> Merge "Disconnect TrustAgent when not active." into lmp-dev
6c25708eb5b1980445213b7b30cc9d6dad16b7f1 03-Sep-2014 Julian Odell <juliano@google.com> Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev
31ef14d4f00b90e13a9755ecfa6cbe8aa7466da7 26-Aug-2014 Julian Odell <juliano@google.com> Bug 17262099: MMS API changes (multi-project).

Move MMS api to using content provider rather than byte[] to pass MMS message contents.
Rebased and merged into TOT.

Change-Id: I3509b2774b1cb30a1c8100bb25d283140c963b6b
ava/com/android/server/MmsServiceBroker.java
e7a21386353d3d89d17af9a505480438a64c319a 03-Sep-2014 Brian Carlstrom <bdc@google.com> Merge "Restrict lazy dexopt to eng builds only" into lmp-dev
4e68f11672bdb2d11b0da5cef942cfc9bfabd696 29-Aug-2014 Marco Fucci <mfucci@google.com> Disconnect TrustAgent when not active.

Bug: 17191952
Change-Id: I470261f659a573400b2eb1421eeb953c87e58b66
ava/com/android/server/trust/TrustManagerService.java
1f0ce3382132d02981193a1fa27306a6c7baaf50 03-Sep-2014 Paul Jensen <pauljensen@google.com> Merge "Use alarm rather than delayed message to end lingering." into lmp-dev
230561eef41047f04dac1a10949f4bcb43915017 03-Sep-2014 Brian Carlstrom <bdc@google.com> Restrict lazy dexopt to eng builds only

Bug: 16696554
Change-Id: I56bb63ce534842994a70df6b09843b4e3153c845
ava/com/android/server/pm/PackageManagerService.java
5bdc16974a49e162654259ba5875ec4bcac3203c 03-Sep-2014 Matthew Williams <mjwilliams@google.com> Merge "Add timeout when waiting to bind to JobService" into lmp-dev
75fc5258b73b4b9b079a9383420a1d6b88575d72 03-Sep-2014 Matthew Williams <mjwilliams@google.com> Add timeout when waiting to bind to JobService

BUG: 17322886

bindService() to an invalid service might never actually result in
onServiceConnected being called , for e.g. if the client service doesn't
actually implement JobService. This wastes an execution slot as we end
up waiting forever.

Also made the javadocs clearer for the JobScheduler class.

Change-Id: Ie15ebbe18c0b7579f2ab77dd46428d354ef632c3
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/JobServiceContext.java
327f7ebc01e5e6389327d094bcdb0ef87b34ea3e 03-Sep-2014 Jason Monk <jmonk@google.com> Merge "Add lock task checking to moving tasks to back" into lmp-dev
db606d2b286d62f0ebbf57e0203775734b9bb1cb 03-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Unconditionally move stack to front." into lmp-dev
a7a61594df2f0b6ee9e3577f3d928e5f01ab4a75 03-Sep-2014 Jason Monk <jmonk@google.com> Add lock task checking to moving tasks to back

Chrome seems to use this method of moving itself to the back on
back presses, causing it to escape lock task mode.

Bug: 17365048
Change-Id: I2e8bc614f771951ed96cfc36f9789d12b1742e70
ava/com/android/server/am/ActivityManagerService.java
02a4aa261c28df2466234106d61282289276b462 03-Sep-2014 Craig Mautner <cmautner@google.com> Unconditionally move stack to front.

Recents was depending on using moveTaskToFront() to also move the
task's stack to the front. But that only works if the task is
actually in the stack because moveTaskToFront() doesn't do the
stack movement if the task is no longer in the stack. This change
calls ActivityStack.moveToFront() in addition to moveTaskToFront().

Fixes bug 17361027.

Also logs callingUid when starting an activity.

Change-Id: I023f956bafae00f45c58757ff5707ce520f02b55
ava/com/android/server/am/ActivityStackSupervisor.java
cc1f2c08e3f7d0223ff8a2fb042863e6b03d98db 03-Sep-2014 Jason Monk <jmonk@google.com> Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev
7c5d31ea93d6f6770c34f7a2a364522d8cc4b5d8 03-Sep-2014 Yuncheol Heo <ycheo@google.com> Invoke the callback only when DeviceInfo is available.

- There is possibility that DeviceInfo can be null when unplugging MHL cable,
if the capability register event is missed. and we should not invoke
the callback in this case.
- In addition, we'd better use the portId of HdmiMhlLocalDevice directly,
not one of DeviceInfo.

Bug: 17366541
Change-Id: I40d71e27d82c5f3a4c7aabda32119856c0bde83d
ava/com/android/server/hdmi/HdmiControlService.java
e21b564168a5383756d386b3ce6c56cd418751d1 03-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Kill the NetworkInfo(int type) constructor. IT'S A TRAP!" into lmp-dev
a42c0de977fcd06e6c7a5be5b072fd661101ac58 03-Sep-2014 Dianne Hackborn <hackbod@google.com> Add more slow execution logs.

This time *without* mixing in an bunch of unintentional reverts!

Change-Id: Iab4cb9eb6d475d9fe5ebe16e9ea4be24c6f312e8
ava/com/android/server/am/ActivityManagerService.java
39a59eb1afc4dc6b58ae08ef3fb215afcf933eef 03-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Revert "And yet more logging for slow execution."" into lmp-dev
1257e82b94f2de290f78955ea9ed507ed098b9a5 03-Sep-2014 Dianne Hackborn <hackbod@google.com> Revert "And yet more logging for slow execution."

This reverts commit 113390ac113083884b6f498424b3f6afa2df4ebc.

Change-Id: I16fdb08f83ad31c10d943862bae639f622542339
ava/com/android/server/am/ActivityManagerService.java
42f0a36eceb051f1f06491855598222f97f93f79 03-Sep-2014 RoboErik <epastern@google.com> Merge changes Id38bcf7c,I54f156d9 into lmp-dev

* changes:
Update MediaController comment to mention notification listeners
Don't play a sound when adjusting volume while telephony is active
7a18cb5672127bf12c8edac8a327f9b706b79ff7 03-Sep-2014 RoboErik <epastern@google.com> Don't play a sound when adjusting volume while telephony is active

bug:17106215
Change-Id: I54f156d91440ce777e5a4d473cdd47927479d084
ava/com/android/server/media/MediaSessionRecord.java
84a00ea9e3df3ff051d3e86945d2befea32072ee 03-Sep-2014 Griff Hazen <griff@google.com> Reduce chance of notification listener dropped messages.

The existing code for notification manager/listeners uses a oneway
binder api to deliver messages. One problem with this is that
notification objects can sometimes get fairly large, and can bump
into the oneway binder transaction buffer if many happen at once.

To reduce this issue, flip the service into a oneway delivery of
a status bar notification holder, whose wrapped content is then
immediately fetched upon receipt of the one-way message. This moves
the meat of the fetch to be over a two-way interface without changing
the properties of which object is actually sent (a tickle solution
with lookup key would have changed this)

Further research: attempt to chunk notification objects themselves.
They can sometimes transfer hundreds of KB over a binder transaction.

Bug: 15426276
Change-Id: Ib1a1f4ff848c16f80bcf2ae4dfd2b87a9091f0b2
ava/com/android/server/notification/NotificationManagerService.java
526b642290eb81674d7772f85ced967c19714b68 03-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "And yet more logging for slow execution." into lmp-dev
089ea995ba5183879dd7af098a8d645293798c4b 03-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev
980d466342f2c4271ac3fee6751a6da7c3c35c4f 02-Sep-2014 Craig Mautner <cmautner@google.com> Merge "Account for scaling effects when cropping" into lmp-dev
78505d8d096af2981fb39f1a03f9025fd04add77 02-Sep-2014 Craig Mautner <cmautner@google.com> Account for scaling effects when cropping

When a scaled window inherits the crop from an attached animating
window the scaling must be accounted for or the crop will obscure
the scaled window.

In the case of the bug that this CL fixes, the SurfaceView containing
a video was scaled down from 1920x1080 by a factor of 0.562 to fit in
1080 width. The crop applied to the window was 1080 but this was passed
to surfaceflinger which ended up cropping the width to 608 due to the
scaling.

Applying the scaling factor to the crop rectangle fixes this bug.

Fixes bug 16334217.

Change-Id: Iafefe43d3696d9fbff01a3666096348468a41e1a
ava/com/android/server/wm/WindowStateAnimator.java
36927a3600520686495cba4f3fc19e1445f8a64c 02-Sep-2014 Dianne Hackborn <hackbod@google.com> And yet more logging for slow execution.

Change-Id: Idd485d3b4339e22a38fd688cbd435818ca38d233
ava/com/android/server/am/ActivityManagerService.java
7237972bffba11fcb5588e8cb0c98e9e7add7871 02-Sep-2014 Shri Borde <shri@google.com> Bug 17243357: Remove MessagingConfigurationManager

It is replaced with SmsManager.getCarrierConfigValues

Change-Id: I560a53427b08746f2a7ed2e540ecb2c978b7ebd0
ava/com/android/server/MmsServiceBroker.java
3818c9261ceaa3a700ff984fbcd245faeede38d7 02-Sep-2014 Michael Wright <michaelwr@google.com> Add support for SW_CAMERA_LENS_COVER.

This allows for magic cover type accessories to launch the camera application.

Bug: 16034563
Change-Id: I0a46ef885737d964a1482c99f41145053d559faf
ava/com/android/server/input/InputManagerService.java
ava/com/android/server/wm/InputMonitor.java
ava/com/android/server/wm/WindowManagerService.java
4dc653aaa2c10c0f98d7e42229a2bc7903271fc4 02-Sep-2014 Jorim Jaggi <jjaggi@google.com> Merge "Fix outdated time when turning on screen" into lmp-dev
d09def75110ea9833e3985ce33a878a471a8a0dc 02-Sep-2014 Jorim Jaggi <jjaggi@google.com> Fix outdated time when turning on screen

Force a synchronous update of the clock view when turning on the
screen. Also wait for the Keyguard window to be drawn when turning
on the screen.

Bug: 16904617
Change-Id: I38f78a38cfe35ccd067cd420d2bad626bd955ad6
ava/com/android/server/wm/WindowManagerService.java
f71edcaa1446c54956ea5d29a44343361a668755 02-Sep-2014 Jason Monk <jmonk@google.com> Enforce permissions on start/stopLockTaskModeOnCurrent

Bug: 17308601
Change-Id: If3c941e206236023108a55360a627d24ca8ba608
ava/com/android/server/am/ActivityManagerService.java
c8838dfbec12d17cdf89a03bd4512d13e93ae910 02-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17322903: Crash in systemUI while launching an app from recents tab" into lmp-dev
ca27d452c14f8a275cf2b7d0e59080690e0dc5c1 02-Sep-2014 Jeff Sharkey <jsharkey@android.com> Hold package cleaning until system is ready.

Package cleaning is going to check things like external storage
state and spin up external services like DCS, so hold it until after
system ready. (There are a handful of cases where we clean packages
during early boot scan.)

Bug: 17152982
Change-Id: I240b1f16679f421d0b416e576ff87713dc01276a
ava/com/android/server/pm/PackageManagerService.java
1611c21dfdf102fa4eadd3cab4c7bd5fda061826 02-Sep-2014 Tsuwei Chen <tsuwei@google.com> Merge "Reload GPS configuration after carrier info is available. Bug: 17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e" into lmp-dev
e93e6c81f2ec2588ca3a2878ac2b53776aa4845f 02-Sep-2014 Christopher Tate <ctate@google.com> Merge "Don't rewrite package restrictions unconditionally in findPreferredActivity()" into lmp-dev
02aa75a08303796801ffd74b9c0bd2f8079248af 02-Sep-2014 Michael Wright <michaelwr@google.com> Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev
6906771d76f9625078c2842c0e82a9da16446bc8 02-Sep-2014 Svet Ganov <svetoslavganov@google.com> Merge "Magnification bounds not always animated on a looper thread." into lmp-dev
2cdcc7d360c9ca592a656cdd3aef3da0614ab1aa 02-Sep-2014 Amith Yamasani <yamasani@google.com> Merge "Make it possible to remove current user" into lmp-dev
b4558e7e5f33ee4964c5395b2dc017509ebf3f1a 02-Sep-2014 George Mount <mount@google.com> Merge "Update window always on convertTo/FromTranslucent" into lmp-dev
1096cf8664963a136a325b2bc511c8f381b9ba77 01-Sep-2014 Robin Lee <rgl@google.com> Delete locksettings files for toplevel users only

Fixes an issue created by change:
I7941707ca66ac25bd122fd22e5e0f639e7af697e

Bug: 16233206
Change-Id: Ia905d153e94303acd611178333adc77c68933711
ava/com/android/server/LockSettingsService.java
75ee9fcde4d9e1be3883eba6c8d193db4375b052 02-Sep-2014 Michael Wright <michaelwr@google.com> VirtualDisplay.Callbacks -> Callback

Also, rename methods to be onPaused instead of onDisplayPaused, etc.

Bug: 17008630
Change-Id: Id9ead22a42d36ac338309f0f021ba341ed991144
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/VirtualDisplayAdapter.java
192ba20d2a120356d8c046e92c80065f89e2eac2 02-Sep-2014 Yuncheol Heo <ycheo@google.com> Disable the debug flag in HdmiLogger.

The flag was enabled by mistake in the previous CL.
And this can cause the log-spam on HdmiCec.

Change-Id: Ie705eba8718e9dfe1750726278b6dce6bd872eb9
ava/com/android/server/hdmi/HdmiLogger.java
dfd2874e4ff1cf03f6b50dd9c300e8fdf9a9643e 02-Sep-2014 Yuncheol Heo <ycheo@google.com> Merge "Reallocate the logical address on the hotplug event." into lmp-dev
b502186ab34a4de40f1d98591a0c5d8b4eac76e2 02-Sep-2014 Yuncheol Heo <ycheo@google.com> Reallocate the logical address on the hotplug event.

Bug: 17337451
Change-Id: I4117638e96c64eabd64edfef3359a0f12cf110f6
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiLogger.java
c70726750559c299d7ca0e8890eeb2181d550acb 02-Sep-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Fixes bugs in routing control" into lmp-dev
b21df801f43a979290092b0f50011370fa1b6ac0 02-Sep-2014 Svet Ganov <svetoslavganov@google.com> Magnification bounds not always animated on a looper thread.

In display manigfication mode we are showing a frame around the
magnified region. Showing and hiding this frame is animated. In
some cases the code calling into the display magnifier is not
running on a looper thread which leads to a crash when interacting
with the property animator. Now the animation is explicitly handled
in a dedicated handler that runs on the window manager's handler
looper thread.

bug:15506701

Change-Id: I3fada775c9fac8820599dd31ac80720021c70cb3
ava/com/android/server/wm/AccessibilityController.java
4b4b940c69d22304eb0734ed2432fc70ebadd462 02-Sep-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Fixes bugs in routing control

1) HdmiControlService#inInDeviceList was passed the parameters in
a wrong order. Fixed here. Turned the method to private as well.
2) Passed path not port to Routing control when handling active
path removal to update the active path correctly.
3) adb dumpsys hdmi_control outputs the status of the connected
CEC devices for debugging.

Bug: 17344892
Bug: 17346869
Change-Id: I289d980a2534a6159b12286dd43f159e1b4134d4
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
dbbe73ea42c4ab196edfcd5b6ff9e2ed8ab846c7 01-Sep-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Disable SQLite stats DO NOT MERGE" into lmp-dev
1572ee379e1d070c7ad1c37a626ed25db5341a3e 01-Sep-2014 Adrian Roos <roosa@google.com> Trust: Look at the security unlock method of the right user

Follow up to Ic9e93862c722ebc529f5b2010b9cea941f569ce7.

Bug: 17107213
Change-Id: I8f3c19aedeaca3f265c98a4fb60ab74b115fca47
ava/com/android/server/trust/TrustManagerService.java
07ad8dc2087aa02da48353acc19ba82e62d99f82 01-Sep-2014 Kenny Guy <kennyguy@google.com> Use context for user when calling notifyAsUser

Create a context for the user the notification is
being posted for when using NotificationManager.notifyAsUser.

Bug: 17002733
Change-Id: Ie41d27bbb781ca38cc9bc910bd4410b8862edee1
ava/com/android/server/accounts/AccountManagerService.java
ava/com/android/server/content/SyncManager.java
03084aba241d3e77d5413ed5786f14dab0981a9e 01-Sep-2014 Christoph Studer <chstuder@google.com> NoMan: Disable SQLite stats DO NOT MERGE

Bug: 16777910
Change-Id: I3df8a147e07bf088420769d86bfb766885488506
ava/com/android/server/notification/NotificationUsageStats.java
8591fb27c01f340edb390e689658a9a4591a52e7 01-Sep-2014 Wonsik Kim <wonsik@google.com> Merge "Bind hardware TIS at startup" into lmp-dev
080fa34577ea4d461c91631986ede4a25877b305 01-Sep-2014 Yohei Yukawa <yukawa@google.com> Fix illegal cast in a logging code

This is a follow up CL for I19ad8542659bc092b92ee13eb9,
which introduced a ClassCastException error in the logging code
of MSG_SET_USER_ACTION_NOTIFICATION_SEQUENCE_NUMBER handler.

With this CL, the protocol in question looks like:
- what: MSG_SET_USER_ACTION_NOTIFICATION_SEQUENCE_NUMBER
- arg1: sequence number to be passed to
#setUserActionNotificationSequenceNumber(int)
- arg2: not used
- obj: ClientState

BUG: 16238154
BUG: 7043015
Change-Id: I08d52d4564bae9e042a2eff359e92549a66e837b
ava/com/android/server/InputMethodManagerService.java
1df1473008c24487701c5bc15f39ed9f9697f421 30-Aug-2014 Amith Yamasani <yamasani@google.com> Make it possible to remove current user

Due to the async nature of switching users, it's not possible to
switch and remove immediately. So mark the switch target user as
soon as the user switch is requested, so that a remove will proceed
without failing at stopUserLocked().

Also, fix a similar problem with deleting the current guest and
switching to a new guest. It was attempting to remove the current
user which will result in a failed stopping of the user.
Added a way to mark the current guest
for deletion so that a new one can be created, switched to and the
old one deleted. If runtime fails, old guest is already marked for
deletion and will be cleaned up on restart.

Bug: 17321533
Change-Id: I4be0fb956227e0bb95588b5b1f2867fb1e655c0d
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/UserManagerService.java
f271eacba7997d2751c336153634fac53bc4d660 29-Aug-2014 Wonsik Kim <wonsik@google.com> Bind hardware TIS at startup

Bug: 17336654
Change-Id: Ia1354305ee83c7c15afb7647f000c8b023c4648d
ava/com/android/server/tv/TvInputManagerService.java
17e7e9757d9fe304351dc566fd12b8c03196cee2 30-Aug-2014 Lorenzo Colitti <lorenzo@google.com> Kill the NetworkInfo(int type) constructor. IT'S A TRAP!

This constructor does nothing, including doing nothing with its
only argument. This causes it to return a NetworkInfo for
TYPE_MOBILE no matter what was passed in.

Bug: 16610051
Change-Id: I4ccd5ec050f7824fb06496c00fcd7901defeb7bd
ava/com/android/server/ConnectivityService.java
d67a78db88d11a58691082ced6ab6bbc48976188 30-Aug-2014 Christopher Tate <ctate@google.com> Don't rewrite package restrictions unconditionally in findPreferredActivity()

We've been forcing a rewrite of package restrictions when doing preferred-
activity lookups in most cases, even when the lookup was not actually making
any changes to the bookkeeping. Now we only do so when something has
actually changed. Flash drives everywhere rejoice.

Bug 17334180

Change-Id: Id8f20723002b7bbcc1d82ccde55df6ef727b64ba
ava/com/android/server/pm/PackageManagerService.java
52617bbff8607cdc208ba107ec111bd1471433cb 25-Aug-2014 Tsuwei Chen <tsuwei@google.com> Reload GPS configuration after carrier info is available.
Bug: 17110478
Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e
ava/com/android/server/location/GpsLocationProvider.java
ni/com_android_server_location_GpsLocationProvider.cpp
962d535464eb79b11c346236f6889ad76a966e56 30-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17322903: Crash in systemUI while launching an app from recents tab

We now do sane things when adding a NEW_TASK to a task that already
has activities in it.

Change-Id: I965d6d44f9523e6199b1d90293f61ae5b8c352a4
ava/com/android/server/am/ActivityStackSupervisor.java
efb1f36f09cdada7c3b2677e6628492d8f256729 30-Aug-2014 dcashman <dcashman@google.com> Merge "Address KeySet API Review" into lmp-dev
bccf6f03236216f161b62675ff98ecf3faa70e23 30-Aug-2014 Robin Lee <rgl@google.com> Merge "Keep managed profile keystores in sync with owner" into lmp-dev
7f91c335dc2bb1b146f7c38c409f710eadec6637 30-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "More debug for issue #17310019: pause when launching settings" into lmp-dev
828bd38a074ae62e9363267ad62214796d94e0de 30-Aug-2014 Dianne Hackborn <hackbod@google.com> More debug for issue #17310019: pause when launching settings

Dang, I missed a lot of opportunities to log!

Change-Id: I566597269fe73b0f798df4f00ad26d062021081d
ava/com/android/server/am/ActivityManagerService.java
bd6937841983230bd65dc08548367caa7d409238 30-Aug-2014 John Spurlock <jspurlock@google.com> Merge "Add a hidden system method to check call filter." into lmp-dev
2b122f4c2e691f0319e4f9ea5873989792bb56a6 27-Aug-2014 John Spurlock <jspurlock@google.com> Add a hidden system method to check call filter.

As a stopgap for dialer, add a NoMan method to check
whether or not contact extras meet the current notification
interruption filter, if phone calls are allowed at all.

Bug:17299986
Change-Id: I4d7e04b974d878504ef4e3a73cb6b602cdd2f73e
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/RankingHelper.java
ava/com/android/server/notification/ValidateNotificationPeople.java
ava/com/android/server/notification/ZenModeHelper.java
f0246a8a14d69680d1776620e75a485cf963e574 13-Aug-2014 Robin Lee <rgl@google.com> Keep managed profile keystores in sync with owner

Fixes setting a keyguard password for keystore in a multi-user setup
while we're at it.

Bug: 16233206.
Change-Id: I7941707ca66ac25bd122fd22e5e0f639e7af697e
ava/com/android/server/LockSettingsService.java
b48be6e8588e763c938bdc1b0dc778f6de82242e 29-Aug-2014 Amith Yamasani <yamasani@google.com> Merge "Clean up apks installed for a removed user" into lmp-dev
e167eb52c90fc3c93feece4d8dfe759c5138db3d 29-Aug-2014 Christopher Tate <ctate@google.com> Merge "Expand job scheduler dumpsys a bit" into lmp-dev
c0a6c03cf24848b796e3e9874d2e601f07510020 29-Aug-2014 Michael Wright <michaelwr@google.com> Merge "Use a linear spline if there's a non-monotonic brightness curve" into lmp-dev
8c94d9fb95d933d1e98befe61ffdb4d92086a01b 29-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17329066: Crash in ActivityManager" into lmp-dev
3e9a13438dce2f4a7a437e9b5bbd222128c39d52 29-Aug-2014 Michael Wright <michaelwr@google.com> Use a linear spline if there's a non-monotonic brightness curve

Some devices may contain things like transflective displays where
they actually want the backlight brightness to decrease in the face
of high ambient light scenarios. In the interest of time, just use a
linear interpolation based on the brightness control points for these
cases but in the future we should consider adding a non-monotonic
cubic spline.

Bug: 15611140
Change-Id: I8fcee061b18c8ae9cc9a1b38d8b850aaec4478ce
ava/com/android/server/display/DisplayPowerController.java
b8708c01dfbe76d9e235fb21474b625a28b34ad8 29-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17329290: NPE during ContentProviderRecord.dump()" into lmp-dev
f973a7b17135535528ae6e792d38d4bf081b44c4 29-Aug-2014 Christopher Tate <ctate@google.com> Expand job scheduler dumpsys a bit

Now it actually says what jobs are active.

Bug 17322886

Change-Id: I1a0fe0bf8d4cb2988cc89a11793981037157ee07
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/controllers/JobStatus.java
3133c401cd34e3c75b25320b50566c93494310a7 29-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17329290: NPE during ContentProviderRecord.dump()

Don't NPE.

Change-Id: I5e59583e97b969b1739fc39a1520bd1930302313
ava/com/android/server/am/ContentProviderRecord.java
2c924fb2c7dfba69d2913943598cbc61945d4f1d 29-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17329066: Crash in ActivityManager

Change-Id: Ib59b7a8d65b3abece82bc58897e21600af4d73f5
ava/com/android/server/am/ActivityStackSupervisor.java
d627eac286e377aec5c8f66d4746850c3eff8ff8 29-Aug-2014 Craig Mautner <cmautner@google.com> Merge "Don't use anim background for translucent windows" into lmp-dev
dda003ffa84f986bfaba4344124eafa533f5039d 29-Aug-2014 Amith Yamasani <yamasani@google.com> Clean up apks installed for a removed user

When a user is removed, enumerate through all installed packages
to see if any of them are not installed for any user. Delete the
package if no user has it "installed".

Added a pm option to install an apk for a specific user.

Fixed a crash in UserManagerService when executing the above
cleanup - dying users generate a null UserInfo.

Bug: 15426024
Change-Id: I571decde1ae1c257d0da6db153b896aad6d6bcb4
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/UserManagerService.java
b57edc5ae999abd9c7310833f4f10bbacbc469d7 23-Aug-2014 Lorenzo Colitti <lorenzo@google.com> Pass the socket mark for DNS queries to dnsmasq.

This makes tethered clients use the correct DNS servers when
tethering to non-default networks like the DUN APN.

Bug: 16357676
Change-Id: I8933b6de198a92c2aaf0291931ace8966ddba275
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/connectivity/Tethering.java
b82bc785c966b59621a3a2523ba7cdf84a73697b 20-Aug-2014 Christoph Studer <chstuder@google.com> NoMan: Allow listeners to specify notification trim

Bug: 16574195
Change-Id: I116080df8b73d73040cf9dbc751e25ee118641d7
ava/com/android/server/notification/NotificationManagerService.java
f8a823b05a9db8b307817461b58bc0dda896241b 29-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Fix system audio mode failure in boot up" into lmp-dev
97bf45464c056abecfef50a7cc52617344b22de1 29-Aug-2014 Terry Heo <terryheo@google.com> Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev
a7221ce87683fab16603290378408ce92f02e88a 28-Aug-2014 Jungshik Jang <jayjang@google.com> Fix system audio mode failure in boot up

This bug happens because <Set System Audio Mode> is arrived
before <Give System Audio Mode Status>'s send result callback
is called in service thread. We do set internal state
on callback resut.
This change sets state when we send command.
Along with this, add more debug log to help future debugging.

Bug: 17309726
Change-Id: I0e41f684372a4c8891a90f724944227fc689e053
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecFeatureAction.java
ava/com/android/server/hdmi/HdmiLogger.java
ava/com/android/server/hdmi/SystemAudioAction.java
3d073952060db203170b62c447c783a73506a83c 29-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Debug issue #17310019: pause when launching settings" into lmp-dev
ecf1cda068c95c58d296d508d34706d659e4a1ae 29-Aug-2014 Dianne Hackborn <hackbod@google.com> Debug issue #17310019: pause when launching settings

Let's log!

Change-Id: Icaf42d46aff6e74ee5fc98611dd77083a5d5052e
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ProcessList.java
e545035e0ece992941047d7676a53d090c81448d 29-Aug-2014 Alex Light <allight@google.com> Remove obsolete pruneDexCache

Bug: 16875245

(cherry picked from commit 09107db4916913912e61bfe592643b9c4c50b500)

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
ava/com/android/server/pm/Installer.java
ava/com/android/server/pm/PackageManagerService.java
371bee50f9b2e2f293bb1e1e11872ef1bd69d155 29-Aug-2014 Dongwon Kang <dwkang@google.com> Merge "TIF: cosmetic changes for consistency." into lmp-dev
fd8aa02d73ed43fb90bf44dbe4d65d378261d905 28-Aug-2014 Dongwon Kang <dwkang@google.com> TIF: cosmetic changes for consistency.

- Remove uncessarry logic in buildTvInputListLocked().
(No longer needed because we removed availability.
Verified the bug case, b/15738607, does not happen without this logic.)
- Rename member variables in XXXState classes.
- Define SessionCallback for consistency.

Change-Id: I49642c909ad7f77d97d1d90670c7bb7c2b12cda8
ava/com/android/server/tv/TvInputManagerService.java
1ad99155b37c0cb0b7d95f084a2bff0cbfc8e12d 29-Aug-2014 Craig Mautner <cmautner@google.com> Don't use anim background for translucent windows

When a translucent window transitions in or out the activity behind
it does not animate. In such cases if a background color is specified
for the translucent window animation then the background will obscure
the static window behind the animating window for the duration of the
animation. This change eliminates the background color for
translucent windows.

Fixes bug 16219830.

Change-Id: I5834595afa5beae95ac2fcf8f2bad1a59271e08a
ava/com/android/server/wm/AppWindowAnimator.java
921db7e1de9d52fb3cb2b8956e09f67b93ea480a 29-Aug-2014 Diego Pontoriero <diegs@google.com> Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev
350be2e1c2e4ad8b1a1386a55b40c123f148e94e 28-Aug-2014 RoboErik <epastern@google.com> Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev
3625bf72cb8bcf3c7f8f8cd8d708d7206824cc62 28-Aug-2014 RoboErik <epastern@google.com> Update to MediaBrowser APIs per council feedback

Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.

bug:17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
ava/com/android/server/media/MediaSessionRecord.java
3892fc0349a91097f53152eaf2801dfebb2066ca 28-Aug-2014 Diego Pontoriero <diegs@google.com> Change TelephonyManager method name to accurately reflect functionality.

Bug: 17163860
Change-Id: I4390d79c49831454146a42b89520a16984c5f260
ava/com/android/server/ConnectivityService.java
12b500959dba868202d703be71df620ea0814ccb 28-Aug-2014 Chris Craik <ccraik@google.com> Merge "Force translucency for inset windows" into lmp-dev
2db754ac6e2cddf01801c450bb8200b01cddf410 28-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev
8bd5d6900827c465f0770290776ec52753dc9622 28-Aug-2014 Winson Chung <winsonc@google.com> Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev
45c0d5838f0a26dd69a0ee28d688b36f2fbcdc2f 28-Aug-2014 Christoph Studer <chstuder@google.com> Merge "NoListener: Factor out ZEN mode API" into lmp-dev
7e7f9a3f7c8ed6d17e1295cd1c61b4fc1ac98ec1 28-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev
d7c9289f935992f4ae2fc032747f9e04bb86a7d0 28-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17289876: startActivityFromRecents appears to launch the wrong task

It would be good to actually bring the task to the front.

Also, make the flow when inTask is provided better match what happens when
we go looking for a task on our own.

And this includes another fix that was supposed to be part of a different
change but I forgot this class is part of the framework project now.

Change-Id: I3cf05f2e585c0fd7a0dbb7c7cf9fb1655764dd93
ava/com/android/server/am/ActivityStackSupervisor.java
85a384b4256121eb85b7e72bcd50f3348f365d41 27-Aug-2014 Christoph Studer <chstuder@google.com> NoListener: Factor out ZEN mode API

Bug: 17255109
Bug: 17295014
Change-Id: I7e1f6e29b8a23b8e59a8615a8012a86bd5dd22d7
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenModeHelper.java
48a10a56e98b008ac55b9d50aee1ad33b377e367 27-Aug-2014 Winson Chung <winsonc@google.com> Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)

- Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904)
- Simplifying the Recents code between start & configuration change

Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
2836dbb9536263a8d4e33a751fb41efc5a58186e 28-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Clean up Connectivity Logging." into lmp-dev
959d2db12c7c6a06465af1251bc4cece580a72a3 28-Aug-2014 Terry Heo <terryheo@google.com> CEC: Implement dump() of HdmiControlService

In addition, use hexadecimal address representation in HdmiPortInfo.toString()

Bug: 17310007
Change-Id: Iaba8f718f86a18a23b50f983053c7589dcdcfaf8
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
9c165d6e9a2f085fbdc87b9221f2d52d851b2652 25-Aug-2014 Jae Seo <jaeseo@google.com> TIF: Enable applications to register custom content rating systems

A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.

Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
ava/com/android/server/tv/TvInputManagerService.java
7d9eefd871f1cdc5ebc36fa92dae48a737ae2928 28-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #16953886: History and batterystats checkin summary...

...start timestamps are in 1970s

Look for the wall clock time being very small, and try to update
it to a better value if we see one.

Also handle time change events to update the current time we a re
tracking.

Change-Id: Ifbae2b8c43ab5baa75ee4f672a752a542e23b52d
ava/com/android/server/am/ActivityManagerService.java
af410a5145d7c06b0c27f6e749541118694a54ab 28-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: return non-null MHL controller when not ready" into lmp-dev
162fa7f41b1aa5b3c91b168bc27d1886dec166b1 28-Aug-2014 Dongwon Kang <dwkang@google.com> Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev
b4558af745047631d27697460efd8fc6e7a7cf38 28-Aug-2014 Michael Wright <michaelwr@google.com> Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev
868d74536e60914acb4f63d11e2d32417b78382e 28-Aug-2014 Chris Craik <ccraik@google.com> Force translucency for inset windows

bug:17289912

Change-Id: Ic800f07bce78e0a3538a6afd7ec293d9f8ddad9d
ava/com/android/server/wm/WindowStateAnimator.java
219857b900e2a15464c6254d8d64b68db7d548c0 28-Aug-2014 Michael Wright <michaelwr@google.com> Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY

Also add docs to PowerManager.WakeLock#release(int)

Bug: 17290118
Change-Id: Ibcbc4279efdd0f275808042356e6ff843958e23f
ava/com/android/server/power/PowerManagerService.java
fc0c6890c675494b15cd847b20c5a5ede491fc3c 27-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Clean up Connectivity Logging.

bug:17285109
Change-Id: I61b98aa636996f8d4915fd954d49a22c20cfe9ab
ava/com/android/server/ConnectivityService.java
b655e756a091bda0ebecdeb2f6f6e26d7db74e31 27-Aug-2014 Sascha Prueter <saschap@google.com> Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev
53dc7eac05324261a51443059b5fb5d468f33594 27-Aug-2014 Craig Mautner <cmautner@google.com> Add null check to cleanupRecentTasksLocked.

If during boot, the package manager broadcast occurs before
TaskPersister has restored the recents list then mRecentTasks will be
null and an NPE will occur. This checks for null mRecentsTasks and
returns before the NPE happens.

Fixes bug 17300409.

Change-Id: I1588ad3a3c0d04bc6f273630ef5dadf6821e5710
ava/com/android/server/am/ActivityManagerService.java
85b764e22babfe5508286fbad5d7fee12345704f 27-Aug-2014 Craig Mautner <cmautner@google.com> Update window always on convertTo/FromTranslucent

Previously we would only update the window if the activity's
translucency was changed. That meant that if the window was
opaque for a translucent activity, transitioning to translucent
would not change the window to translucent. This change forces
the window to follow the convertToTranslucent and
convertFromTranslucent calls.

Also fix for setting background on enter and exit transitions.

Partial fix for 16215650.

Change-Id: I86ea68e4bbf604d0cc60cc6e34bf8090199525d6
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/wm/WindowManagerService.java
a9bdc43ec2b8862db579aaced357184b7496468f 27-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "Recreate lib symlink after deleting app data." into lmp-dev
d1caf731e400a052bee2a7251bf0b985081227c3 27-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "Clear pending operation flag when move failed." into lmp-dev
c5212217403696f81d2db220a1d9b22872600275 27-Aug-2014 Jeff Sharkey <jsharkey@android.com> Recreate lib symlink after deleting app data.

Bug: 16739202
Change-Id: Ie8dccf67feaf6dfa474d52a3cda0862b952e6762
ava/com/android/server/pm/PackageManagerService.java
032402cff1fe5dc3a6b2adae3d4c13fb771cd91f 27-Aug-2014 Amith Yamasani <yamasani@google.com> Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev
e084039dd29f63f6e56c91615bc0da6d638c6ea9 27-Aug-2014 Amith Yamasani <yamasani@google.com> Fix incorrect reading of multichoice app restrictions

Clear the list of choices values before putting new ones in.

Bug: 17299310
Change-Id: I01051d1703adcbdd7d0b5fb4ee423404f98489e8
ava/com/android/server/pm/UserManagerService.java
d4b325a82bfa11685b40a940b9622171e3f812ea 27-Aug-2014 Craig Mautner <cmautner@google.com> Merge "Revert "Debug for 13924095."" into lmp-dev
1c9edafef8b3841e3b0017b8f6ef5f46277e8646 27-Aug-2014 Jeff Sharkey <jsharkey@android.com> Clear pending operation flag when move failed.

Bug: 17298448
Change-Id: I7a4af0f31d3909a9bfb5a2dd7d168015786024e3
ava/com/android/server/pm/PackageManagerService.java
d266368435ea2e8b59f918b0f3f8154d991dfce7 27-Aug-2014 Craig Mautner <cmautner@google.com> Merge "When adding an apptoken skip over removed ones." into lmp-dev
4e1b6a4e59a198c3b984ff3fb4dcda2538aef795 27-Aug-2014 Craig Mautner <cmautner@google.com> Revert "Debug for 13924095."

This reverts commit 76309cd761a0f9d9e44435ba9a4bde8363ba9f7b.

Logspam no longer useful, just annoying now.

Change-Id: I826d383101077cc1bb341d4a3186ef98ed7e0c00
ava/com/android/server/wm/WindowManagerService.java
01f79cf91610ec9f85345ea6eeae50ea2f28578f 27-Aug-2014 Craig Mautner <cmautner@google.com> When adding an apptoken skip over removed ones.

App tokens are passed from the activity manager to the window
manager along with a list insertion position. That insertion
position presumes that all removed tokens are no longer in window
manager's list. However, when removal of a token is delayed due
to ongoing animation the insertion position was pointing to the
wrong location. This fix skips over tokens that have been marked
for removal when inserting new app tokens.

Fixes bug 15751591.

Change-Id: Ib484c591e2bba9f46ad8e47d60ef05c7bfda0a12
ava/com/android/server/wm/Task.java
4c499be0edc24eb2e2b9705dba52a2059823e4aa 27-Aug-2014 Jorim Jaggi <jjaggi@google.com> Fix that Keyguard didn't always get onActivityDrawn call

Bug: 16481924
Change-Id: I299645c940c71820aa7dc70985e41da869f1368a
ava/com/android/server/am/ActivityStack.java
f7f49ddade34744d5386f9bf52ab9ba4f981fce7 27-Aug-2014 Dongwon Kang <dwkang@google.com> TIF: fix callback cleanup logic in removeSessionStateLocked().

Adding DeathRecipient to callback instance is enough. removeSessionStateLocked()
can be called in normal session release case, and the current logic will remove
valid callback instances.
Also, ConcurrentModificationException in abortPendingCreateSessionRequestsLocked()
is fixed.

Bug: 17212681
Change-Id: I42cacfa33086bf9182b061553ff52c0e25d94d9b
ava/com/android/server/tv/TvInputManagerService.java
473119fdc36340f833e4b755ae7f50a6914e0a24 27-Aug-2014 Jungshik Jang <jayjang@google.com> Allow broadcast for <Set System Audio Mode>.

AVR may broadcst <Set System Audio Mode> to start system audio mode.
But we do handle direct message case.

Bug: 17292360
Change-Id: I9111f8122d58b31f3801e4e78f283db65e79330b
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessage.java
038c8601c330f71a219a64bba7813eced92bc9e8 27-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Add more debug message to HdmiControlService" into lmp-dev
948397a4531e9dc8eb90f3fe98463b2c68624b2c 27-Aug-2014 Svetoslav <svetoslavganov@google.com> Merge "Print services setting changes not handled for managed profiles." into lmp-dev
c94ac5cffc982898bc4f7a5d97d8fad5520ff444 27-Aug-2014 Jungshik Jang <jayjang@google.com> Add more debug message to HdmiControlService

Bug: 17291374
Change-Id: I9568dd12b0e5864c50f81bacc2729b82242187c4
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecMessage.java
ava/com/android/server/hdmi/HdmiLogger.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
5232271a41323594ae406be7476b6ca2f08af3d8 27-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17146552: system anr

Add a safe path for Slog.wtf that doesn't acquire an activity manager
lock or block in any way.

Change-Id: I8fef8251a0cb85081442cae55d85063944248d15
ava/com/android/server/am/ActivityManagerService.java
80e29b66c5966f6af77e7404ab4b6321ef5cf23b 27-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev
852975d5377bfe5f4abc9d2a28e301aa2fa99994 23-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17179314: Make recents limits consistent

The max limit is now 100 (or 50 on svelte devices), and that is
what everyone used.

Re-arranged things so we have a big expensive "fix the world!"
function for recents that we go in to at only select points:
when first initializing the system, when external storage comes
and goes, and if we detect something wrong with the recents
structure.

With that, now getRecentTasks() and addRecentTaskLocked() are
generally much simpler, doing very little work in most cases.
This will help a lot with scaling up to many more recents
entries.

Change-Id: I7b5ae89edc06568f68c8af54a4420aff7635581c
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskPersister.java
ava/com/android/server/am/TaskRecord.java
d22a6677312d17d23da3b655a2e9b12533dfff76 27-Aug-2014 Jim Miller <jaggies@google.com> Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev
6c79454cfc59c07af94289faceb87598aa570616 27-Aug-2014 Jae Seo <jaeseo@google.com> Merge "TIF: Remove the registered callback when the client process has died" into lmp-dev
f34e6075cb9cc559da776ba7360505a76f0c404d 27-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Fix a bug that the HdmiCecLocalDeviceTv sends <User Control Released> message for unsupported keys" into lmp-dev
fea8dd45f4955b4b4b6536bf51453e19288deba2 26-Aug-2014 Jae Seo <jaeseo@google.com> TIF: Remove the registered callback when the client process has died

Also make error messages more consistent

Bug: 17276418
Change-Id: Ib87e13e1383db4ff623de2e9b68ae9ff4309360a
ava/com/android/server/tv/TvInputManagerService.java
b64c2ba05bf64bb8015444fdcd706fa3238cb96c 26-Aug-2014 Dongil Seo <seo@google.com> Fix a bug that the HdmiCecLocalDeviceTv sends <User Control Released> message for unsupported keys

Bug: 17170954

Change-Id: I0ad624eb3a1301b24865228164d8dd5a97452329
ava/com/android/server/hdmi/HdmiCecKeycode.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
86b1df234397802895771fe14cd8f2813fa43415 21-Aug-2014 Svetoslav <svetoslavganov@google.com> Print services setting changes not handled for managed profiles.

We keep per user settings for enabled print services which are
observed to update the print manager service state. We were listening
to all user changes but the handling code was not updating the state
of the user whose settings changed, rather the current user.

Added hidden APIs in content observer to know which user changed
and now the print manager serivce handles content changes for the
correct user.

bug:16977006

Change-Id: I71ec88c8f3f38cb405844c13ab83695c2029eb79
ava/com/android/server/content/ContentService.java
70613dbff74544c6f537cc3a84392e07ad70859c 27-Aug-2014 Dongwon Kang <dwkang@google.com> Merge "TIF: clean up pending createSession requests when a package is removed." into lmp-dev
426c9a4008b75b93cbfea15aa4b8c47c5fdb49b9 26-Aug-2014 Dongwon Kang <dwkang@google.com> TIF: clean up pending createSession requests when a package is removed.

Pending createSession request for the package removed led to the tune request
with invalid channel URI. This change prevents crash from invalid URI by cleaning
up the pending requests on the package removal.

Bug: 17214114
Change-Id: I26fdf9eb45a5fec9032926a1c2994831c07b4fbe
ava/com/android/server/tv/TvInputManagerService.java
5d0ec89d55f0e986a0704ce1c8ea5c1a604c4cb2 27-Aug-2014 Jae Seo <jaeseo@google.com> Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev
7dbfbc7d6b3ce046f81d3c5785101b7c0bdc66d3 27-Aug-2014 Craig Mautner <cmautner@google.com> Merge "Show IME over keyguard if IME target is showing" into lmp-dev
fc836f6684f6e142fe53dc16e1552ffd19bd95bc 27-Aug-2014 Jae Seo <jaeseo@google.com> Revert "TIF: Temporarily disable permission check for parental controls"

This reverts commit 9d197941afcef7853578fcd2d704d6f97dde0902.

Change-Id: Ib376f3d4deddf72b94a5195f7aeafafd3ed189e8
ava/com/android/server/tv/TvInputManagerService.java
2b8e9504df3c7e4438b5a317741ba056c664389b 27-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Add null-check for system audio mode change event." into lmp-dev
99b69286f1e22575aa4807d63f01662477baedd5 27-Aug-2014 Craig Mautner <cmautner@google.com> Show IME over keyguard if IME target is showing

IME was being hidden by keyguard even if the window it was attached
to was showing. This change shows the IME if the window it is
attached to is hiding the keyguard.

Also fix an NPE that was crashing systemui.

Fixes bug 16457525.

Change-Id: If587eefa7b1e0ae26713906a76c0766ebaae69a6
ava/com/android/server/wm/WindowAnimator.java
e30735c7dc574ac6b40d871d2bee99eb8ecd3000 27-Aug-2014 Paul Jensen <pauljensen@google.com> Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev
1b012d302b56b4adf950035136d1d191a1936d5a 20-Aug-2014 Jeff Hao <jeffhao@google.com> Add sample profiling option to am.

Also bundles all profiling options into a class.

Bug: 17040932
Change-Id: I85d675ee1494bdc7308caffdf94145d27c996e9d
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStackSupervisor.java
cd4adf8b5ef9ac1f90fdddbb405404e173aedc87 19-Aug-2014 Christoph Studer <chstuder@google.com> NoMan: Fix inconsistent notification comparator

Switch second phase of notification sorting to lexicographic
string comparison in order to enforce a consistent comparison.

Note that this slightly changes the logic: Within groups we
previously fell back on authoritative rank comparison when
one of the notificiations didn't have a sort key. Now we
just replace missing sort keys with " ".

Bug: 16626175
Change-Id: I91f4f4afeeb2c8edda6cd2668011a7367795086c
ava/com/android/server/notification/GlobalSortKeyComparator.java
ava/com/android/server/notification/GroupedNotificationComparator.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/RankingHelper.java
f50d82a1e4eed3507309036205e3880974752390 26-Aug-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Cancel children when update removes summary" into lmp-dev
264a5f5b34d8c1169e81da4136e263344115e02d 26-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "Treat moving app as installing in new location." into lmp-dev
5b62d263a70ad7dceba7a488b11478ad3eaf3f45 26-Aug-2014 Paul Jensen <pauljensen@google.com> Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev
4610545dd28ebf316704e119572521e97dbbd6bd 26-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev
d68f83cc478a8ec501d0a5a08a2a737355bee89a 26-Aug-2014 Calin Juravle <calin@google.com> Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev
1771d39ebf9d0696f7c3deb7eb477056e49834ff 26-Aug-2014 Amith Yamasani <yamasani@google.com> Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev
5c1b42e4f5d7307ad09d0d7ad094adf34650fb62 26-Aug-2014 Winson Chung <winsonc@google.com> Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev
89ad456ea49cb62615ebdcac83a2515743bbe5fa 25-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #16311398: Limit number of documents a process can open

In application processes, monitor for when we start getting close
to the Dalvik heap limit, and ask the activity manager to try to
prune old activity instances in that case.

Add an explicit API for apps to ask that they have their own
activity instances cleaned up, if they want.

Fix some bugs in launching activities that were not correctly
applying the "multi task" behavior in the appropriate situations
of document-centric recents.

Clean up the activity manager's process removal code to all share
a common path.

Add a new "Spam" option to ActivityTests, which continually creates
new tasks, checking that the activity manager will now prune old
tasks rather than letting the app run out of RAM.

And while I was was doing this, I found problems with the path
for bringing an empty task to the foreground -- it could make
a new task instead of re-starting the root activity in the
existing task. This is fixed, and some code in the recents
UI for working around the bug is removed.

And as long as I am doing that, we now have nice hooks in to
the activity manager for AppTask to give some APIs for better
managing the task, so add those along with more tests for these
APIs in ActivityTests.

We should look at also having the activity manager try to prune
old tasks when it sees app processes being killed, to better balance
memory use across multiple processes when some processes may host
many documents. That however is for another CL...

Change-Id: I2bb81c3f92819350c868c7a7470b35817eb9bea9
ava/com/android/server/Watchdog.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/PendingIntentRecord.java
ava/com/android/server/am/ProcessRecord.java
ffc596bd22f946fda718ca48414af9a00b1ad6f2 26-Aug-2014 Georgi Nikolov <geonik@google.com> Merge "Add maximum time-out to sync operation" into lmp-dev
1877924da01e0fc35e6d703f0dce4a9f2d4f1b6f 26-Aug-2014 Georgi Nikolov <geonik@google.com> Merge "Don't back-off ALREADY_IN_PROGRESS syncs" into lmp-dev
e7b1a0b68c5dd529f5d0ec180b3aeb589f645655 26-Aug-2014 Craig Mautner <cmautner@google.com> Merge "Remove redundant call to window manager addTask()" into lmp-dev
381d94b712605112b35d7f70064b0d18bd877877 24-Aug-2014 Jeff Sharkey <jsharkey@android.com> Treat moving app as installing in new location.

Moving apps to/from SD cards has historically been neglected, meaning
it can easily break. This happened most recently for split APKs,
64-bit native code, and multiArch support.

To make this easier to maintain, treat move as a no-op upgrade,
following the inheriting code path that split APKs depends on.

Also clean up scary places where different flavors of flags were
being combined, and remove unused flags. Fix media broadcasts to be
sent based on existing app storage location.

New API to abandon install session without opening it.

Bug: 17158495
Change-Id: Ia33bf8f6fdaae099124dfe534f0e320b37bc8e16
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageManagerService.java
f3054ea8e0bca0c04650cef92f7a1ed0f1d31640 26-Aug-2014 Amith Yamasani <yamasani@google.com> Fix SetupWizard crash when creating Guest or Restricted profile

Delay the launch of Home until after the USER_INITIALIZE broadcasts
are delivered, to make sure that any disabled HOME activities are
enabled.

Bug: 15709297
Change-Id: I796a40131f82989782cf5699bcc2e1da2cafbc6b
ava/com/android/server/am/ActivityManagerService.java
83bb610fad994b9046acc3feeba9d9a5264fd918 12-Aug-2014 Nicolas Prevot <nprevot@google.com> Preventing apps from granting uris to any other user.

And adding some javadoc.

BUG: 16996334

Change-Id: I02b03e513050e2704c28da8e17c2c977d858627b
ava/com/android/server/am/ActivityManagerService.java
f286b4d86b4b2ac91edb88d0336810e46d9a16ce 26-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: return non-null MHL controller when not ready

Refactored the service and MHL controller so that non-null instance
is returned even when MHL is not ready.

Bug: 17234291

Change-Id: Id86444a20f64c2d3c470133487938c9524693474
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiControlService.java
44bb3a5bd630cfe0a4813586e840d59b9cbc9f64 26-Aug-2014 Jungshik Jang <jayjang@google.com> Add null-check for system audio mode change event.

Bug: 17270923
Change-Id: I23fa593893591f6032105ff936b8eee10d8c0cfa
ava/com/android/server/tv/TvInputHardwareManager.java
339227da7cf025ce4ae0c85ddc52643d63972321 25-Aug-2014 Jungshik Jang <jayjang@google.com> Fix several bugs in HdmiControlService.

1. Fix HdmniLogger null pointer exception
2. Should check arc enabled port for arc requests
3. Disallow ARC action coming from indirect AVR device.
4. Check original opcode of feature action
5. Add bitmasking to all parameters of cec message.

Bug: 17243701, Bug: 17238394, Bug: 17241401
Change-Id: Iff0da78b0de9a29fb00e683c261528e0baea66af
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiLogger.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/RequestArcAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/VolumeControlAction.java
ea75fddbb452638f286c2fcdbddff145ee1a85cb 12-Aug-2014 Dan Sandler <dsandler@android.com> Allow listeners to fetch current notifications by key.

Bug: 16574195
Change-Id: I269dbcc7fc8912d84229f6a3d950b0015625ae7a
ava/com/android/server/notification/NotificationManagerService.java
5df4bec50495914b47b6a2f73f20d2bd24a9f9ea 26-Aug-2014 Paul Jensen <pauljensen@google.com> Fix to allow removing sign-in notification when network removed.

When the NetworkMonitor is told a network disconnected and a sign-in
notification has been shown to the user, the NetworkMonitor requests
the notification be removed. This request goes to the
ConnectivityService who may have already removed the NetworkAgentInfo
from mNetworkForNetId so we cannot look up the NetID in there.
There is no harm in allowing notification hiding for networks that
are disconnected as the notification logic does not effect the
Network state (like the validation message that caused the addition
of the Network liveness check).

bug:17261757
Change-Id: Id0a299e230ae37e641ac2faeebc45550e27c1fa4
ava/com/android/server/ConnectivityService.java
92a1c09aa467f03dad78472098d40992303937fb 26-Aug-2014 Matthew Williams <mjwilliams@google.com> Add maximum time-out to sync operation

BUG: 16219182
We have seen cases where run-away syncs keep going for a very long time.
The default behaviour is that a sync can run for as long as it wants once
there is nothing else waiting.
This CL will change that, and impose a maximum time-limit of 30mins on
each sync, after when the op with be cancelled and the adapter will go
into back-off.
This behaviour will only take effect for syncs that are not initializations,
or user-initiated.

Change-Id: I1731270ca2a6500b19fc125186aa0b0cd81d1126
ava/com/android/server/content/SyncManager.java
ava/com/android/server/content/SyncOperation.java
a4ccb86ddc8f9f486aee25fb836f4aff97bf7679 23-Aug-2014 Winson Chung <winsonc@google.com> Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)

- Reverting changes to the existing thumbnail transition to prevent breaking applications
that currently depend on that transition. As a result, we need to create a new, hidden,
aspect-scaled thumbnail transition, and instead use that thumbnail to animate the
recents header so that we don't have to wait to do that inside the Recents activity.

In order for this to work, we also have to ensure that the thumbnail surface destruction
is synchronized with the application that is currently closing (when going down to
recents) or opening (when coming back up). The current thumbnail is destroyed when the
animation ends, but that can be at least 1 frame before the surface for the animating
window is destroyed. We change this by deferring destruction of this thumbnail window
to the animation that is being closed.

Especially on the way up, not having to wait for us to hide the header before doing the
transition up can save us the duration of that first animation (> 100ms).

- Other optimizations:
* No longer creating a new stack view on each transition to calculate the target rect
* Removing unnecessary call to get the thumbnail when transitioning up/down (the actual
window does its own animation.
* We reduced numerous system calls per task by adding a flag to ignore home-stack tasks
and caching the activity label and icon (and task description icon). These caches
follow the same eviction schemes as the thumbnail and icon cache.

- Also tweaked the touch slop for the nav bar swiping gesture to prevent conflicting with
tapping on home (Bug 17109581)

Change-Id: Ica697aad788051a9203edd9351c583e1cb038a71
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/wm/AppTransition.java
ava/com/android/server/wm/AppWindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
3c8a42ddd9482ebc8541f7af6f15afdf3b3ec151 26-Aug-2014 Matthew Williams <mjwilliams@google.com> Don't back-off ALREADY_IN_PROGRESS syncs

BUG: 16219182
The issue is that some adapters get into a bad state where
SyncManager assumes them complete yet they are still going. This
result in ALREADY_IN_PROGRESS coming back from the adapter, the
default retry-time for which is about 10s.
Subject ALREADY_IN_PROGRESS to exponential back-off to avoid waking
up SM every ~10 seconds

Change-Id: I6cef787366436c678bac762ec6daf6212f04badc
ava/com/android/server/content/SyncManager.java
1adbf228613bfa5a194ad5ef681287c551aa0eff 26-Aug-2014 Craig Mautner <cmautner@google.com> Merge "Update API per council requests" into lmp-dev
79323120dd1faf139c4d881e2d817d1b8085d252 26-Aug-2014 Craig Mautner <cmautner@google.com> Remove redundant call to window manager addTask()

If there are activities in persisted tasks then calling addAppToken()
will automatically call addTask(). If there are no activities then
calling addTask() is a nop. In either case the call to addTask() is
unnecessary. It was actually worse than unnecessary because in the
former case we ended up with two identical tasks in the Window
Manager.

Fixes bug 16958544.

Change-Id: I2dc4b50aa94668873c1a783c47e0c696d62616f0
ava/com/android/server/am/ActivityStackSupervisor.java
4cce1de9fe95ffc3b968de87579a543a461f96bb 26-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #16366571: UIDs for work and normal Chrome processes are the same" into lmp-dev
739d6dbf9bb11a84652d5a5b7127192c1f9a6806 26-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove listen requests properly." into lmp-dev
4456cf3ff0aa5fbd4a9a08c0987360b61fd38fa8 25-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Remove listen requests properly.

https://googleplex-android-review.googlesource.com/#/c/527772/
correctly stopped adding listen requests to the mNetworkForRequestId
sparse array, but when we remove requests, if it's not getting
serviced by a network, we don't remove it from the network. That
means that when we go to send a notification for that network we have
a request affiliated with the network, but don't have data for the
request and hit this NPE.

If it's not a request, don't do the optimization and remove it only
from the network servicing the request, but instead scan all networks
and remove it from each, if found.

bug:17239054
Change-Id: I49165ed08c224ef20f703469f9ce39df5f21b163
ava/com/android/server/ConnectivityService.java
d38eeb5512016a2709ae99695678e5ca46f24d7f 26-Aug-2014 John Spurlock <jspurlock@google.com> Merge "QS: Wire up screen casting to tile/panel." into lmp-dev
78b8c8fbde12b214314cc2ab2644350b5d5189a5 25-Aug-2014 John Spurlock <jspurlock@google.com> QS: Wire up screen casting to tile/panel.

Use MediaProjectionManager to determine whether or not
screencasting is active, when it changes, and to stop
casting.

Also:
- Implement hashCode/equals on MediaProjectionInfo
- Fix unintentional recursion in the service.

Bug:16488053
Change-Id: Icd1a88f23bbdf1d4c1915b30cb2508f8fe9d6d7e
ava/com/android/server/media/projection/MediaProjectionManagerService.java
3b2cd1d59fd894ac67a044c6c540fa69360a34a2 25-Aug-2014 Craig Mautner <cmautner@google.com> Update API per council requests

launchTaskBehindBackgroundAnimation => launchTaskBehindTargetAnimation
visibilityMode => transitionVisiblityMode
makeLaunchTaskBehindAnimation => makeTaskLaunchBehind
launch_task_behind_background = launch_task_behind_target

Fixes bug 16958544.

Change-Id: I3b7c791fc0671b8071a5377cf6fa878bd5861f70
ava/com/android/server/wm/AppTransition.java
c2a8d151dcd8e04dd67e5adbdf68b9795932ad82 25-Aug-2014 Amith Yamasani <yamasani@google.com> Improve user switching interstitial

Layout and string changes.

Bug: 16661752
Change-Id: Ie24fe4683b91923ff357be054b7440fd1fc86ebb
ava/com/android/server/am/UserSwitchingDialog.java
0784eeab28da094a87437ed454fe3dca01b1f9f2 19-Aug-2014 Paul Jensen <pauljensen@google.com> Implement VpnConfig.addAllowedApplication().

bug:17109588
bug:13651397
Change-Id: Ibb944794627117728373f0105e24f196f3eeb9e9
ava/com/android/server/connectivity/Vpn.java
69ef75c952a0e756a488be4136dc9bd9b568a9f4 25-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Update the http proxy on LinkProperty change." into lmp-dev
177cd38b00c7c61c13bad65c8a4e3fc859335162 25-Aug-2014 Paul Jensen <pauljensen@google.com> Merge "Remove captive portal sign-in actions." into lmp-dev
2220f6f8a60a9aaf9be1fc3e5ce53ce410efb08e 25-Aug-2014 Jae Seo <jaeseo@google.com> CEC: Log the current time instead when the timing information is empty

Bug: 17237045
Change-Id: Iaa59167c23ce5b460ccfefcf31b6f579f8dda98a
ava/com/android/server/hdmi/HdmiLogger.java
ac0d62a1181bde3724f9a794cc4a96b2a4a90587 25-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Use common language code in hdmi service." into lmp-dev
37cf9907d201e39ecf8a8de934c44e3eaf04b6db 24-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "Installing splits into ASECs!" into lmp-dev
885fbe5c070cf1579c96ab8e150449af00e16501 24-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #16366571: UIDs for work and normal Chrome processes are the same

Use uid as main key for determining which app tasks a caller has
access to.

Change-Id: Ibbe3f0f64197671d279c3fc519edfc720d442938
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/TaskRecord.java
b98c59896cf93f019155ba95ceb2a301cea7513f 23-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Update the http proxy on LinkProperty change.

bug:16308315
Change-Id: Ie44634a9223f289903c09653f77a998d3a344654
ava/com/android/server/ConnectivityService.java
306908f235f9a53e8b68136ccd83cef5aad07fd2 23-Aug-2014 Matthew Williams <mjwilliams@google.com> Merge "Implement API review feedback for JobScheduler" into lmp-dev
76b9b8b0ca537bad6c4da388d77a9e5dee023856 23-Aug-2014 Jim Miller <jaggies@google.com> Limit grantTrust() duration to DevicePolicy-imposed limit.

Fixes bug 17046034

Change-Id: I5c512c2d05e7e0ed81eaf0dcafacc6f62a5c5937
ava/com/android/server/trust/TrustAgentWrapper.java
79dbce8661f0ab3c345858b0bc69e0eae147dcde 23-Aug-2014 Jeff Davidson <jpd@google.com> Merge "Restore legacy VPN stats dialog." into lmp-dev
a96a3c1b65acd2b54a15fe98964208fa00ded96a 23-Aug-2014 Jeff Brown <jeffbrown@google.com> Merge changes I9bd3a235,I9c4dbdef into lmp-dev

* changes:
Improve adaptive brightness in very dark rooms.
Hide PowerManager methods that third-party apps can't use.
d7761be23d30b5e9ca9c07998af27e704d2a7ae2 23-Aug-2014 Jeff Brown <jeffbrown@google.com> Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev
de25dc0708bcc949f6e8b5ffdca0d95a76546935 23-Aug-2014 Jeff Brown <jeffbrown@google.com> Merge "Require DEVICE_POWER permission for DOZE_WAKE_LOCK." into lmp-dev
90b1b9f985a91fb54254705515f822b09c68ac26 22-Aug-2014 Jeff Davidson <jpd@google.com> Restore legacy VPN stats dialog.

Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.

Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
ava/com/android/server/connectivity/Vpn.java
941a8ba1a6043cf84a7bf622e44a0b4f7abd0178 21-Aug-2014 Jeff Sharkey <jsharkey@android.com> Installing splits into ASECs!

Sessions can now zero-copy data directly into pre-allocated ASEC
containers. Then at commit time, we compute the total size of the
final app, including any inherited APKs and unpacked libraries, and
resize the container in one step.

This supports both brand new ASEC installs and inheriting from
existing ASEC installs. To keep things simple, it currently requires
copying any inherited ASEC contents, but this could be optimized in
the future.

Expose new vold resize command, and allow read-write mounting of ASEC
containers. Move native library extraction into the installer flow,
since it needs to happen before ASEC is sealed. Move multiArch flag
into NativeLibraryHelper, instead of making everyone pass it
around. Migrate size calculation to shared location.

Separate "other" package name in public API, provide a path to a
storage device when relevant, and add more docs.

Bug: 16514385
Change-Id: I06c6ce588d312ee7e64cce02733895d640b88456
ava/com/android/server/MountService.java
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
d1c06753d045ad10e00e7aba53ee2adba0712ccc 22-Aug-2014 Matthew Williams <mjwilliams@google.com> Implement API review feedback for JobScheduler

BUG: 17005336

Took the opportunity to clean up some back-off logic

Change-Id: Ibc8ae34d1d44dd064ba071e4cbad17872f7e38cf
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/JobStore.java
ava/com/android/server/job/controllers/JobStatus.java
d4efaac5d54cdb3735b032bb76a5639949f33216 15-Aug-2014 Jim Miller <jaggies@google.com> Update TrustAgentService API after review.

Also documents timebase on related DevicePolicyManager API.

Fixes bugs 16401527 and 17046034

Change-Id: I8ee6d0055ab6f52ec71630344d3232f7875d9c1d
ava/com/android/server/trust/TrustAgentWrapper.java
7653a30ea0232ab8323ec51ddcba8d8054ca8a2f 23-Aug-2014 John Spurlock <jspurlock@google.com> Merge "Display notification effects suppressor in the volume panel." into lmp-dev
b4782526f5600d9759baac64b23e0c0cd05e2050 22-Aug-2014 John Spurlock <jspurlock@google.com> Display notification effects suppressor in the volume panel.

Bug:16958514

Change-Id: I0eac173875e8af62e3c6b39001722c3fda4517de
ava/com/android/server/notification/NotificationManagerService.java
6dd08fdd9104faa75a2cea83e81eae31993c7392 22-Aug-2014 Amith Yamasani <yamasani@google.com> Merge "Show a user switching dialog before starting the user switch" into lmp-dev
12eec2341db422ad5792e674a0b820da68b75f64 22-Aug-2014 Matthew Williams <mjwilliams@google.com> Merge "JobScheduler only run jobs for started users." into lmp-dev
d9a218d499c47399ee185faa0eeca45eed1ca1a4 22-Aug-2014 Svetoslav <svetoslavganov@google.com> Merge "Fix jank in when drawing magnification bounds" into lmp-dev
250bf41b8ee61c7b5707fefad1456634c7e73bbb 22-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev
7805a10c86a2de9fb5ddf41d63075eef342a59ea 22-Aug-2014 Amith Yamasani <yamasani@google.com> Show a user switching dialog before starting the user switch

switchUser() now first shows a dialog and the dialog calls
startUserInForeground to do the actual switch.

Bug: 16661752
Change-Id: Ie4e2e9eec8bf7c2116694072ea8555b8254a0e13
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/UserSwitchingDialog.java
28d6247b3d1085558775f5b4c8e4b330b270f4ad 22-Aug-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Turn off aggregated stats" into lmp-dev
9e3618c28f6dbaf1605ac25e4e709b45fe4f6ec9 22-Aug-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Add flag to turn off aggregated in-mem stats" into lmp-dev
7505e3315cb997165035f3bcc736d9d257b1fe3c 22-Aug-2014 Svetoslav <svetoslavganov@google.com> Fix jank in when drawing magnification bounds

There was an off-by-one error in computing the invalidated
rectangle when drawing the magnified region border.

bug:17199352

Change-Id: Id0a1af092b7124bbdca316534c035ed9af829326
ava/com/android/server/wm/AccessibilityController.java
0a31453864282afdada45cd371d03969ad1b1cb7 22-Aug-2014 Christoph Studer <chstuder@google.com> NoMan: Turn off aggregated stats

Aggregated stats can grow unboundedly and shouldn't be enabled
for prod builds.

Bug: 16777910
Change-Id: I1c9303fc3aab93fd75f4dfbbf2e3de467a72f99e
ava/com/android/server/notification/NotificationUsageStats.java
856b2b81357ddc29c782f3827a877dc1a4aac7f9 22-Aug-2014 Christoph Studer <chstuder@google.com> NoMan: Add flag to turn off aggregated in-mem stats

Bug: 16777910
Change-Id: Ic5baa910988f027c82ba16d713a44cc5d55b8333
ava/com/android/server/notification/NotificationUsageStats.java
c44caa9b841df604a66834df495710e354c7e018 22-Aug-2014 Christoph Studer <chstuder@google.com> NoMan: Cancel children when update removes summary

When a notification update causes a group summary to be
removed (e.g. because the group summary is updated to be
a non-grouped notification), cancel group children.

Bug: 17143007
Change-Id: Ic295a5fc6ee5fe7efb8e71fe8bd1b2c0159461aa
ava/com/android/server/notification/NotificationManagerService.java
717d95161a9812aa0f5b40585a4b1ef1117a8ffc 22-Aug-2014 Jeff Davidson <jpd@google.com> Merge "Allow NetworkRequest release from the system process." into lmp-dev
feb193085adbdc379ee70dbb7dc6ae4c9f2971dd 21-Aug-2014 Calin Juravle <calin@google.com> Pass vmSafeMode (manifest attribute) to installd.

The flag is used to enforce --interpret-only flag when running dex2oat.

Bug: 12457423
Change-Id: Ifdafcc1afa32996577fa44c5682eeb58c79772ac
ava/com/android/server/pm/Installer.java
ava/com/android/server/pm/PackageManagerService.java
076e72554d4367a0377047fe7eb2e3ea73c5baec 22-Aug-2014 Adrian Roos <roosa@google.com> Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev
a68d21350266a6abc16aeb3fec84eafd85b77cc8 22-Aug-2014 Paul Jensen <pauljensen@google.com> Remove captive portal sign-in actions.

This reverts commit e0101cd and removes the related NetworkMonitor code.
The thinking is the broadcasts are not robust enough as they rely on apps
working together and are not sufficiently tested.

bug:17115050
Change-Id: I433032867cc4fea7191a1b13842b16825dc74df4
ava/com/android/server/connectivity/NetworkMonitor.java
79a08051c5588d8420656813b21993d490e93dd0 21-Aug-2014 Paul Jensen <pauljensen@google.com> Use alarm rather than delayed message to end lingering.

Ending lingering is critical to good battery life. Delayed messages
are not delivered when the device is in a deep sleep, alarms are
however.

bug:17140462
Change-Id: I07e905479f316217d816b36e8c4d96d5daed0047
ava/com/android/server/connectivity/NetworkMonitor.java
1bfd0f463e279e3ac3f133c5e0ad11ccfd73eed5 22-Aug-2014 Jeff Brown <jeffbrown@google.com> Improve adaptive brightness in very dark rooms.

Added config_screenBrightnessDark to configure the minimum value
that will be used for auto-brightness adjustment. This value is
expected to be less than unadjusted minimum auto-brightness level
to provide some range for the user to make the screen dimmer
in dark rooms.

This configuration value is set to the lowest possible level
by default (1). Individual devices may need to override this value
in their framework resource overlay depending on their backlight
characteristics.

Change-Id: I9bd3a2355c65f894dff89aeaf7661cdf38f4a6ee
ava/com/android/server/display/DisplayPowerController.java
f67113f7abd536cc3eb888344bf925762aa5278e 22-Aug-2014 Jungshik Jang <jayjang@google.com> Use common language code in hdmi service.

Bug: 15844859
Change-Id: I12945f743730ee234b25a40543ea44345abf43fa
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
dbe6b45545dcd28e6aaf46986ed694196eb94de0 22-Aug-2014 Jungshik Jang <jayjang@google.com> Add spam-safe logger.

This change introduces a new helper class, HdmiLogger,
which prevents spammy log for same error message.

Bug: 17179667
Change-Id: Ia55808408e0a92b0370cd627361f80754b2f1018
ava/com/android/server/hdmi/HdmiCecMessageValidator.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiLogger.java
0a571123544058578b4ef1558c276a4050519652 22-Aug-2014 Jeff Brown <jeffbrown@google.com> Poke interactive hint from userActivity and add @SystemApi.

Previously we only poked the interactive hint for input events that
were dispatched through the regular input system. However, when
using a car dock in projection mode input events are directly
delivered to apps by other system components, bypassing user activity.
So now we poke the interactive hint on all user activity.

Added an @SystemApi version of userActivity.

Added a new signature|system permission called USER_ACTIVITY
to allow system apps to poke userActivity. For now it seems
prudent to keep DEVICE_POWER signature only.

Bug: 17043684
Change-Id: Ia84bd03083065b8938a9853c08901fbf71b2e56b
ava/com/android/server/power/PowerManagerService.java
63859536047e907fbcde87f12511ec3b35bf53dc 22-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Implement interfaces for MHL scratchpad command" into lmp-dev
72671fbb2036e13fccb0b8eeb98be606de1819dd 22-Aug-2014 Jeff Brown <jeffbrown@google.com> Require DEVICE_POWER permission for DOZE_WAKE_LOCK.

This wake lock is only intended to be used internally.

Change-Id: I8d109c492605673616cf7f4f31f082a42fb1d912
ava/com/android/server/power/PowerManagerService.java
9ae3dbeefcd6bc139c74bfe3d51de823e3be4b4b 21-Aug-2014 Matthew Williams <mjwilliams@google.com> JobScheduler only run jobs for started users.

BUG: 12876556
Minor changes to test app to make persisting an option.
Change-Id: I1b40347878ec5ca44cd717ebfeb544f6c58473b5
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/controllers/JobStatus.java
e258de6f9e4eae028fd6c09d76ea440d4fc169e8 22-Aug-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Rework the per-network URL API." into lmp-dev
f424932cfb1b16b01a37500d09e295912700a51d 21-Aug-2014 Jungshik Jang <jayjang@google.com> Implement interfaces for MHL scratchpad command

1. Add sendScratchpadCommand to IHdmiControlService interface,
which is used to send scratchpad command.

2. Add IHdmiMhlScratchpadCommandListener to handle incoming
MHL scratchpad command.

Bug: 17146522

Change-Id: I8e8e743dc08a18c80867be470997ce79d3292c15
ava/com/android/server/hdmi/HdmiControlService.java
1bfc75fc047d69968f0f5ec217270bf751293d7f 22-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev
9f1274b7e43d14c7e3a42148ebfda3905fec8b06 21-Aug-2014 Lorenzo Colitti <lorenzo@google.com> Rework the per-network URL API.

This addresses API council comments.

Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0
ava/com/android/server/connectivity/NetworkMonitor.java
096f36b8db3e513687b78da3e1dd0197fce148a3 21-Aug-2014 Winson Chung <winsonc@google.com> Minor tweaks to recents thumbnails.

- Reducing the size of the recents thumbnails
- Skip persisting if we never update the last thumbnail
- Don't bother loading the last thumbnail file descriptor if we have it in memory
- Fixing warning in getting drawable from resource

Change-Id: Ieddaeac75a5e5d80876a9b6b1d50f7cc84c7d6fd
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/TaskRecord.java
6f4d61ff2e3143bea37bbc1a7a2a0ab415b2c88a 22-Aug-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17011123: Hit Back/Recents button when in Recents...

...without interacting with any of the Recents items should not bring
Home back to top

Up navigation needs to be smarter about multi-document and in the case
of being at the root of a document know to re-construct a task for
the app.

Change-Id: Ief874e46e9a9897379dda1010bcce4c5b03d82f1
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
d530719b169c8a10dccaefc413261e1b127cee63 22-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Skip routing control/internal source selection conditionally

This is necessary for TV woken up by <Text/Image View On> to override
initial TV source selection/routing control, since the input change
will immediately come from external device.

Bug: 17189114
Change-Id: I4aa1ac31bc7f6ab554e29a9e6065e534e15abd58
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
6f91390f1a1ebef4e45ebaa78259f866cebc976f 22-Aug-2014 Jeff Davidson <jpd@google.com> Allow NetworkRequest release from the system process.

Otherwise attempts to release that are triggered by the binder death
receipient will be rejected.

Bug: 17187437
Change-Id: If3924d82dba69c572708e04c11d17ed25ae6870d
ava/com/android/server/ConnectivityService.java
0104503c50623cb5b1e92cc5fb706263df1891f2 21-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #16683269: system_server still leaking memory" into lmp-dev
56a9ed858c73a8483c34c56dd77665b13e100a74 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Change the NetworkInfo for disconnected types." into lmp-dev
b1a8a89697fbe714c0fa447fec2a73628555a656 21-Aug-2014 Dianne Hackborn <hackbod@google.com> Work on issue #16683269: system_server still leaking memory

Fix a small temporary leak of app crash dialogs, which weren't
removing their timeout message.

Change-Id: Iee90b5fa2be700e3006388f32145ce4b14baa2ec
ava/com/android/server/am/AppErrorDialog.java
bafeeb98135a7580cbcdd657818cd78f7bda35d8 08-Aug-2014 Matthew Williams <mjwilliams@google.com> JobScheduler needs to flush queue on charging

Also make it illegal to schedule a job with no constraints.
BUG: 16877705
Change-Id: Iae57286bc4f73163a7e3c9d2d531623fd50f1f72
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/StateChangedListener.java
ava/com/android/server/job/controllers/BatteryController.java
5c270bf41c0499d0ff41b71e77cc17c5fdfc27d7 21-Aug-2014 Riley Andrews <riandrews@google.com> Merge "Use the crop function in the surfaceflinger screenshot api." into lmp-dev
1889c5c36df8cd027f1f3f69aa227a6bdad17849 21-Aug-2014 Jason Monk <jmonk@google.com> Merge "Show lock to app request on all users" into lmp-dev
fffe00dfda10fa2c121f955bcfd84a4886c2dd32 21-Aug-2014 Nicolas Prevot <nprevot@google.com> Merge "In startActivityAsCaller, changing the way we get the userId." into lmp-dev
63f29d9d7cab8c714f54db520eebd3047977d19c 21-Aug-2014 Jason Monk <jmonk@google.com> Show lock to app request on all users

This way secondary users can see it. To avoid it being displayed
on the wrong user, clear it on user switch.

Bug: 17151184
Change-Id: I1699f85d2d90cbc0e17f39f9971f20d90637b38f
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/LockToAppRequestDialog.java
a0b805715a12391b6b06c0be8a85db51d6785343 21-Aug-2014 Jeff Sharkey <jsharkey@google.com> Merge "Clear identity before calling out to PackageHelper" into lmp-dev
e812d9096915ad165de125520ed7371009587d1f 21-Aug-2014 Robin Lee <rgl@google.com> Clear identity before calling out to PackageHelper

PackageHelper.resolveInstallLocation expects the binding user to be
equivalent to the calling user. If this is not the case, it may fail
and throw an exception preventing anyone but user 0 from installing
anything.

Bug: 17175251
Change-Id: Id5615738c7b4e1234a548c7b4a410282d14c9ee3
ava/com/android/server/pm/PackageInstallerService.java
b91bd653c95593f1bd00faa6ca93bf731c1a8cbd 21-Aug-2014 Winson Chung <winsonc@google.com> Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev
e16a24559f8e3192a2262c592a055d9fd74a6706 21-Aug-2014 Paul Jensen <pauljensen@google.com> Merge "Send captive portal broadcast as user CURRENT." into lmp-dev
198d9286155dec930a1193e644e823a3369bdb1c 21-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev
bdb1bdf57b8c4348a02fc085b05b7b0f57abe7b5 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Change the NetworkInfo for disconnected types.

Don't send out NetworkInfos with UNKNOWN state for disconnected
networks - use DISCONNECTED.

bug:17095670
Change-Id: I863bebadc1f9a666572958b49d5e62809f485e5d
ava/com/android/server/ConnectivityService.java
a945c352730b2e43d0d6ea3af4c14994a340b3e8 21-Aug-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Fix findConnectionTypeForIface." into lmp-dev
bd7723637b14d1895c043c2257f1cd9560322d4e 02-Aug-2014 Naveen Kalla <nkalla@codeaurora.org> Invoke shutdownMobileRadios Telephony APIs from ShutdownThread

shutdownMobileRadios API shuts down multiple Radios on MSIM devices and
also gracefully shuts down Radios and SIM cards on single SIM and
MSIM devices. Use this API instead of the old setRadio APIs.

Add RIL_REQUEST_SHUTDOWN to RILConstants. Message is sent to notify
RIL that the device is shutting down.

Bug: 9773278
Change-Id: I6afa9e810cefc7855f7ae42e51f39cc51fa2aa6e
ava/com/android/server/power/ShutdownThread.java
07f82b79422c4c1e4bc789775c72d3ef04fbb041 19-Aug-2014 Jason Monk <jmonk@google.com> Don't stack toasts for every user press

Showing a toast on every press was adding up to a long list of
toasts to clear out of the display, now cancel the last so we
don't have that problem.

Also fix unlock strings to not use insertions because of problems
translating the context.

Bug: 16892731
Bug: 16366701
Change-Id: Ia523469089c9f8dd1f3e466a9d4ea901a376d1bc
ava/com/android/server/am/LockTaskNotify.java
ava/com/android/server/am/LockToAppRequestDialog.java
da115ebe700f334ca9f7c8fc4e9debd77c625a82 21-Aug-2014 Nicolas Prevot <nprevot@google.com> In startActivityAsCaller, changing the way we get the userId.

BUG: 17170098

Change-Id: Ie7fbd547b664a9982895b77da1fbb28df139ce52
ava/com/android/server/am/ActivityManagerService.java
55298581a0750505bc7da0539fe94255f95326a4 20-Aug-2014 Paul Jensen <pauljensen@google.com> Send captive portal broadcast as user CURRENT.

Previously this was sent without a qualifying user.

bug:17138439
Change-Id: I6345f2375fee168f86c0611e76f869e7377befbe
ava/com/android/server/connectivity/NetworkMonitor.java
f860be88a9c8fca910f2d97694d102f627d06c71 21-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev
2626958c4b5a284abb0a342933d79135e0b9d8d0 21-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Fix a bug not sending <Set Stream Path>

Passes the right flag to manual routing switching method for TV
to send out <Set Stream Path> to the newly selected device(path).

Bug: 17169555
Change-Id: I4a14925e366a433f36b28170e37d041053c0060d
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
6800cddd6f5b3c4699ab8cab3aec85e4f9e01a83 21-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev
14355950d5ce42b8043cfb96d192f1c76b93d496 20-Aug-2014 Jae Seo <jaeseo@google.com> API Review: android.media.tv

TvContentRating:
- The XML file: attributes should have android: prefix and should allow
string resource references for labels.

Bug: 17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
ava/com/android/server/tv/TvInputManagerService.java
e9f6ed3b11fb8ebae5e73db1e4736b86cae272d9 20-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Invoke input change for RAP request from MHL device

Transform RAP[ContentOn/Off] to input change event.

Bug: 17141884
Change-Id: Ic2d8e305f482ebb4f4f3b3e167f726a66dc174cf
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiControlService.java
aec68bb89fe614181a20eb97340149406218ce2f 21-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17038762: Add API to add entries to the recents list

New API Added to ActivityManager for adding an entry. See docs
there.

Repercussions:

- I hit a bug in system UI where if the thumbnail has alpha, it tries
to modify it, but thumbnails are loading immutable so crashes. Fixed
this by loading the bitmaps to be mutable.
- Improved dump output of recents; there was a lot of stuff missing.
Also split the recents dump output from the rest of the activity
output, since it can be really large.
- Added tests to the lovely ActivityTest app.

Bonus: new method on AppTask to control the exclude from recents flag.

Change-Id: I01e543db4d15320ee1701e95872fef73c116526c
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/TaskRecord.java
3bad5cc0f5b8ac3018e413ce480692e40039027c 20-Aug-2014 Winson Chung <winsonc@google.com> Fixing issue with inconsistent icon filename. (Bug 16992882)
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/TaskRecord.java
827296b7dd6689c14df1340f21a85e1f2f8d6844 21-Aug-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Update state to failed if the VPN fails to connect." into lmp-dev
fd6989cd025ceb4c6c2c2aafc7bd98800173bbaa 20-Aug-2014 Riley Andrews <riandrews@google.com> Use the crop function in the surfaceflinger screenshot api.

- By having surfaceflinger crop the screenshot instead of
WindowManagerService, this greatly reduces the size of
of temporary screenshot buffers that tablets have to
allocate.
- App to home, App to recents times are improved noticeably.

Change-Id: Iff889cc8c57b157778fb16993a71546fd9abfc00
Bug 17006948
Bug 16987565
ava/com/android/server/wm/WindowManagerService.java
438406092ed71c658bf5a4e6ae2e7282fc4fab4d 21-Aug-2014 Lorenzo Colitti <lorenzo@google.com> Update state to failed if the VPN fails to connect.

Without this, the VPN settings dialog stays in "Connecting..."
forever.

Bug: 17140195
Change-Id: I4771be464384b62114839523fb2a6b36aa6520ee
ava/com/android/server/connectivity/Vpn.java
4b9e324b6f59f49a8ca4bc4cd8b38a5ea005a6b2 20-Aug-2014 Adrian Roos <roosa@google.com> Only run TrustAgentServices for users with secure keyguards

Bug: 17107213
Change-Id: Ic9e93862c722ebc529f5b2010b9cea941f569ce7
ava/com/android/server/trust/TrustManagerService.java
1c3a35bcff2deeef8aa064a3e44bdd68aa18994e 20-Aug-2014 Lorenzo Colitti <lorenzo@google.com> Fix findConnectionTypeForIface.

This is used by the VPN to notice when its underlying connection
has gone away. I'm fixing this using network types and not
NetworkCapabilities because

1. I don't know of a way to use the new API to get callbacks for
a specific network. You can get them based on capabilities,
but it's not clear how to construct a NetworkCapabilities
object that will only match a specific network, or only match
the default network.
2. It's a smaller change.

Bug: 15070628
Change-Id: Id6a6a183da83636c0859db4c954093bd684c01ea
ava/com/android/server/ConnectivityService.java
c8f0ffa297d1d5d51c6fa60e7d7cd56a8bc91d1d 21-Aug-2014 Jeff Davidson <jpd@google.com> Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev
05542603dd4f1e0ea47a3dca01de3999a9a329a9 11-Aug-2014 Jeff Davidson <jpd@google.com> Less intrusive VPN dialog and other UX tweaks.

-The ability to launch VPNs is now sticky; once approved by the user,
further approvals are not needed UNLESS the connection is revoked in
Quick Settings.

-The old persistent notification has been removed in favor of the new
Quick Settings UI.

-The name of the VPN app is now pulled from the label of the VPN
service rather than the app itself, if one is set.

Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Vpn.java
ava/com/android/server/net/LockdownVpnTracker.java
3f38f72a1b629f8887787415129615c506f89621 21-Aug-2014 Diego Pontoriero <diegs@google.com> Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev
d26bfec44bc7537ba1697af44562a51912d1c8f7 20-Aug-2014 Nicolas Prevot <nprevot@google.com> Merge "Allow the system in other users to call startActivityAsCaller." into lmp-dev
5ef7e19a0e1656a7dc6af8cf785d75ddc319cd8c 20-Aug-2014 Nicolas Prevot <nprevot@google.com> Allow the system in other users to call startActivityAsCaller.

BUG: 17148852

Change-Id: I4c9811b7da90b5705e72001dd36bf67d559cb189
ava/com/android/server/am/ActivityManagerService.java
abc2358778b13137b2d49b0f2d10ac0b9bf277d2 21-Aug-2014 Jason Monk <jmonk@google.com> Merge "Lock task doesn't always end properly." into lmp-dev
835495c1175cd159635997ecff4281eb51e72fe6 20-Aug-2014 Jason Monk <jmonk@google.com> Lock task doesn't always end properly.

This can result in the keyguard not being re-enabled, the status
bar being in a bad state, and various other weirdness. When a task
is going away, it needs to send the standard lock task ending
messages so that exiting the state can be handled properly.

Bug: 16010327
Change-Id: Id7ee632f4765af0af209b70fb69dd75f2e541820
ava/com/android/server/am/ActivityStackSupervisor.java
550bd55257d08030641e164982bfa7192e3b9850 20-Aug-2014 Adrian Roos <roosa@google.com> Merge "Allow SystemUI to control Bluetooth for secondary users" into lmp-dev
ed118e1e9f4da6ccab248983343a851e504ba000 20-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "More progress towards split APKs in ASECs." into lmp-dev
bb7b7bea19223c1eba74f525c7fe87ca3911813b 20-Aug-2014 Jeff Sharkey <jsharkey@android.com> More progress towards split APKs in ASECs.

Teach DefaultContainerService to install split APKs, which will be
needed when moving to/from ASECs. Also support forward locking for
testing purposes, even though its deprecated.

Move native library unpacking code to NativeLibraryHelper location
where it can be shared by both DCS and PMS. Also update footprint
calculation logic to mirror the later unpack codepaths.

Immediately persist sealed sessions. When resolving install
locations, prefer location of any existing install of that
package. Lightweight parse requesting certificates now always
verifies that all contents are signed correctly.

Bug: 16514385
Change-Id: Ida1c4eb0f95b065104dd971e19126d4085ebf1f0
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
0c9a62dc8db7b39d5236aba70f14d4e99d38a194 20-Aug-2014 Michael Lentine <mlentine@google.com> Reduce shutdown animation duration.

Change-Id: Idb58e8ff9a7e05c6f3d6964970b32a6aa69615c1
ava/com/android/server/display/DisplayPowerController.java
bd9a9a53ed09ca355eb0911d2aeee526b964aa7b 18-Aug-2014 Adrian Roos <roosa@google.com> Allow SystemUI to control Bluetooth for secondary users

Bug: 15818610
Change-Id: I9eaeaffc73f7675957ed3cd6a896ea83a79d6cff
ava/com/android/server/BluetoothManagerService.java
0fc2ff7b8a70a7066b484e1519daa17e2dd2f147 20-Aug-2014 Justin Koh <justinkoh@google.com> Merge "Add check to allow notification listener packages to post >50 notifications" into lmp-dev
38156c504e49e685b67b5f003a11876438157c4f 04-Jun-2014 Justin Koh <justinkoh@google.com> Add check to allow notification listener packages to post >50 notifications

Bug: 13433398
Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68
(cherry picked from commit 2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d)
ava/com/android/server/notification/NotificationManagerService.java
35228d72e12ce7bdf39c4f6b09600cc4e1c3e0c1 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Avoid reusing a currently active NetID." into lmp-dev
1bbcaa0fc4e514baf8242b147f5ad40782d9f801 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix listening NetworkRequests to listen for all networks." into lmp-dev
c671c8ded607302caba67b6a238d87569c77ac69 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Add missing break statements to avoid unnecessary network validation." into lmp-dev
0d39e6722b77a6ee7872c377fea8453f0102f2bf 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix CS/NetworkMonitor race." into lmp-dev
60061a6ebf4ef758c4a47d210de0e5be2484be5b 05-Aug-2014 Paul Jensen <pauljensen@google.com> Avoid reusing a currently active NetID.

There are only a limited number (65526) of NetIDs so the chance for reusing
one exists. Reusing a currently active NetID will cause problems like netd
failures and overwriting entries in mNetworkForNetId.

bug:16815182

Change-Id: Ib75302beae3179c3f3b90c345cf4d2cf5f4ad2be
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
73ed9d8dee5ef7139b84c8e1713fec7ff5ccce5d 20-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Fix CS/NetworkMonitor race.

If we have a message in flight about a NetworkAgentInfo when it gets disconnected
we are left with a zombie network. Fixes this by verifing the network is still
live before we process the msg.

bug:17142206
Change-Id: I2c94a39b3ea97c1562066571b277280c1f69f71c
ava/com/android/server/ConnectivityService.java
0311b2b31a9577a89fc0a2ed82ba761aa97df06b 19-Aug-2014 Paul Jensen <pauljensen@google.com> Fix listening NetworkRequests to listen for all networks.

This is a small change but should fix a number of functional problems:
1. When registering a listening NetworkRequest and when a Network is
validated, we should always add the listening NetworkRequest to the
Network's list of NetworkRequests if the Network satisfies the
NetworkRequest. Previously in both cases this was only done for
the highest scoring network. This enables the listening
NetworkRequest to listen for all networks, not just the highest
scoring network.
2. No longer add listening NetworkRequests to mNetworkForRequestId as
it doesn't make sense as it's a 1:1 mapping but listening
NetworkRequests to Networks is a many:many mapping.
3. Don't "keep" a Network that's finished validating when only a
listening NetworkRequest requests it.
4. Don't send updated scores to NetworkFactories from listening
NetworkRequests. NetworkFactories and NetworkAgents shouldn't
concern themselves with listening NetworkRequests.

bug:16680764
Change-Id: Iaba14263227771e4bd84ee4bce488beaef20a8a3
ava/com/android/server/ConnectivityService.java
d6a3f7ed90d7fa861f579968f12cc30015b3a989 19-Aug-2014 Paul Jensen <pauljensen@google.com> Add missing break statements to avoid unnecessary network validation.

The missing break statements were causing unnecessary network
validation for VPNs and networks that don't provide internet access.

bug:16680764
Change-Id: I714bacdff350a818f7bfba2f505b95c4b3559699
ava/com/android/server/connectivity/NetworkMonitor.java
255dd04271088590fedc46c8e22b2fd4ab142d39 19-Aug-2014 Selim Cinek <cinek@google.com> Added notification color to all system notifications

Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb
ava/com/android/server/ConnectivityService.java
ava/com/android/server/InputMethodManagerService.java
ava/com/android/server/UiModeManagerService.java
ava/com/android/server/accounts/AccountManagerService.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ServiceRecord.java
ava/com/android/server/connectivity/Tethering.java
ava/com/android/server/connectivity/Vpn.java
ava/com/android/server/content/SyncManager.java
ava/com/android/server/display/WifiDisplayAdapter.java
ava/com/android/server/input/InputManagerService.java
ava/com/android/server/net/LockdownVpnTracker.java
ava/com/android/server/net/NetworkPolicyManagerService.java
ava/com/android/server/storage/DeviceStorageMonitorService.java
34ff492978d30569e694f7427be430dce66cac06 19-Aug-2014 Jose Lima <joselima@google.com> Fixes for a few bugs related to visible-behind activities

- Allow activities currently not visible to switch back to not
visible-behind state.
- Do not allow an activity that is not set as the visible-behind
activity to cancel the visible-behind state.
- Immediately mark a finishing activity as no longer visible behind.

Bug: 17070266
Change-Id: I2c5016793e5264013b8a54b84098e6ffae34ae6c
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStackSupervisor.java
5e85359a36c14c0c568b73f138f6c8f4baad9b8e 20-Aug-2014 Terry Heo <terryheo@google.com> Merge "CEC: Broadcast language setting whenever it changes" into lmp-dev
1ca0a43251a31bb1b4253dc404316cc4b840f497 18-Aug-2014 Terry Heo <terryheo@google.com> CEC: Broadcast language setting whenever it changes

Bug: 16995278
Change-Id: Id695d4d2f213cd8039c9915f3d4e451e829e715c
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
8e6e1e2e82c67efa06bc5c5944363df63b48e5d8 20-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Use id to find proper HdmiDeviceInfo instead of ojbect itself." into lmp-dev
cf445877c60396cac1e8ecef75287952d2580db6 20-Aug-2014 Jungshik Jang <jayjang@google.com> Use id to find proper HdmiDeviceInfo instead of ojbect itself.

TvInputHardwareManager manages internal device info and update
it by remove or add method of List collection. However,
HdmiDeviceInfo overrides equals method and remove may not work
if incoming HdmiDeviceInfo has different power status.
Instead, this change iterates all HdmiDeviceInfo and compares
id of HdmiDeviceInfo.

Bug: 17145753
Change-Id: Ia5de3e33cf05b28fa2bd108d99e78de09b838fb3
ava/com/android/server/tv/TvInputHardwareManager.java
b135d06cb83db03b1328b7a82f064de7868fb16f 20-Aug-2014 Jeff Brown <jeffbrown@google.com> Remove incomplete media router API. (DO NOT MERGE)

Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
ava/com/android/server/media/MediaSessionRecord.java
9727b332973d2aae6cb31b7d02e469bdcb3e3082 20-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Hook up device select API to MHL device RAP" into lmp-dev
87f22a2870ac363a5849a7252c1bd44ce2b809c2 20-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Hook up device select API to MHL device RAP

This lets the input selection on UI perform MHL RAP signalling, and
CEC routing control.

Bug: 17141884
Change-Id: Ic1605175c5779a9a3c43df954baf9fdb6f154d36
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
03861d072131563561bb5873d35dc346e82bd904 18-Aug-2014 Terry Heo <terryheo@google.com> Merge "CEC: Handle Remote Control command" into lmp-dev
3e1564ee397ef833cba351153029317786f3d6bb 12-Aug-2014 Terry Heo <terryheo@google.com> CEC: Handle Remote Control command

Generate an Android key event when a UserControl message is received.
And report menu state active when a MenuRequest message is received to
notify sender can send a UserControl message.

Bug: 16938007
Change-Id: Id8f393dc254508b9e7a6fa203f8e817fbe807e38
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
5ba6906768f2bdc22fea45f064dcb5ef96cd78e0 20-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev
2738e2d872a22fe95a99941139863ff642fbd8e7 19-Aug-2014 Jungshik Jang <jayjang@google.com> Implement missing mhl apis

1. get_supported_features
2. get_ecbug_device_rols
3. set_option in native.
4. get_mhl_version
5. get_peer_mhl_version
6. send_scratchpad_command
- it includes send_scratchpad_command but does not include
java side implementation. It will be added when we implement
scratchpad.

Bug: 17096490

Change-Id: Iacb4a41234cbbd2d832908b48d188bd81a301b0f
ava/com/android/server/hdmi/HdmiControlService.java
350e68d0b80c22e6ec37dd683134f46079619803 19-Aug-2014 Jungshik Jang <jayjang@google.com> Clean up MHL local devices when HdmiControlService turns into disabled state

Bug: 17122583
Change-Id: Id8f17faf9891952c762f86b46a89732f1497c5fc
ava/com/android/server/hdmi/HdmiControlService.java
15c56aac985bc8d75f38fb4ecb92dda12d2ca06c 18-Aug-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Call setMain(false) when session is released.

Also, rename setMainTvView() and setMainSession() to setMain(), except
ITvInputManager.

Change-Id: I586e3fd42720f07a75d6f31b1ee955ce5c29dd68
ava/com/android/server/tv/TvInputManagerService.java
8809f1e5473db09bc47315a2e423e58ba14fd670 19-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev
ed0864557b3340ab7db00e2dc95b29c4b8bb485d 18-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Invoke events listener upon MHL device state change

With this change, mobile devices state changes are propagated through
TIF to UI, hence the input pickers shows the mobile devices as
expected.

Bug: 16986744
Change-Id: Id633207acf4f814f57d43cc1de5f8cb88ac23ad6
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiUtils.java
611f8f17f333f7702cd8c60e2f4908ae306a02db 19-Aug-2014 Jon Miranda <jonmiranda@google.com> Merge "Exposes style and theme data, adds developer option." into lmp-dev
836c0a8b949d71293c996761691e065f0651acef 11-Aug-2014 Jon Miranda <jonmiranda@google.com> Exposes style and theme data, adds developer option.

Adds support for a String[] return type in ViewDebug; and in addition to that,
the hasAdjacentMapping method can use the String array as means to map a key to
its value.

Adds DEBUG_VIEW_ATTRIBUTES to Settings so that the heavy per-view
computations only affect those who opt in. This setting is used in
CoreSettingsObserver to avoid impacting start time.

Change-Id: I8f507e4e5361414c30d247e8d9815205feb5e91f
ava/com/android/server/am/CoreSettingsObserver.java
3b57e1d1294096f374e11e2ac3aa33098efeb3c4 19-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev
5691b2f2297b29dc83a7f83f77da517035b11cce 18-Aug-2014 Jungshik Jang <jayjang@google.com> Remove parameter field in HdmiCecKeycode.

Since we don't support mapping between android key and parameterized
cec keycode, remove parameter fields in HdmiCecKeycode.

Bug: 17099253
Change-Id: I8b6b6b361f0c343b0a263240b49e41bf289d36ca
ava/com/android/server/hdmi/HdmiCecKeycode.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/SendKeyAction.java
d1858574d0d3ba648fc20c55f0caf40e70b5de9a 19-Aug-2014 Michael Wright <michaelwr@google.com> Merge "Add callbacks for MediaProjection start / stop." into lmp-dev
d86ecd26d78c7bcd7f820b9ef5e3f4c3eb037510 13-Aug-2014 Michael Wright <michaelwr@google.com> Add callbacks for MediaProjection start / stop.

Also, enforce that there is only one valid MediaProjection at a time.

Bug: 16488053
Change-Id: Id05445d798c98cb208bc4dab186296392e15d30b
ava/com/android/server/media/projection/MediaProjectionManagerService.java
ccc8c29af113b68a337cf4e38fae5d06531b3cf8 19-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev
4a88bf99851a3db3b629df23b919f2660c492f18 19-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17114392: android.com.phone crashes - PackageManager code

Change-Id: Ib02119c6f313384a73fa7cb7b2b62dbd716fa6ca
ava/com/android/server/pm/PackageManagerService.java
f52233df74bb4a3efa1f7b9107353c841eafc933 18-Aug-2014 Nicolas Prevot <nprevot@google.com> Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev
0c3b4ad7b6888f533aaef01db1c8f61327f7d5e7 19-Aug-2014 Ji-Hwan Lee <jihwan@google.com> Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev
4835497886ee876b16e1144d32f5bdcfbb7e9062 16-Aug-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Remove session state when hardware wrapper input crashes

Change-Id: I2306cc407a19892c1895ee70bd6bd52b1a3bd4f3
ava/com/android/server/tv/TvInputManagerService.java
468fef687031f0d4f050bb001392fffc6ccf2c4b 19-Aug-2014 Michael Wright <michaelwr@google.com> Merge "Persist Show IME option." into lmp-dev
7b5a96ba8364d5c180780b2f878f5a2b949cfdac 10-Aug-2014 Michael Wright <michaelwr@google.com> Persist Show IME option.

Add a new setting to persist whether to show the IME when a hard
keyboard is connected.

Bug: 14066881
Change-Id: I2237ded850a0d4ab43ca441d0b7df13e0958e630
ava/com/android/server/InputMethodManagerService.java
ava/com/android/server/wm/WindowManagerService.java
665366a3055c7baa36242b8c92c5ff85b1c3394b 08-Aug-2014 Michael Wright <michaelwr@google.com> Change 'disable hardware keyboard' to 'show input method'

Previously it implied that the hardware keyboard would be disabled,
but really the toggle would just enable showing the IME even if a
hardware keyboard was present. Changed the string and swapped the
semantics to be more clear about the behavior.

Bug: 14066881
Change-Id: I9c8a7eb98b5277f1d09cc19fa7402e9b4cf51d92
ava/com/android/server/InputMethodManagerService.java
ava/com/android/server/statusbar/StatusBarManagerService.java
ava/com/android/server/wm/WindowManagerService.java
12450c72ebdc695d72b06ddaa8f199d5afe8d525 19-Aug-2014 Esteban Talavera <etalavera@google.com> Merge "Add cross profile intent in order after intent filter resolution" into lmp-dev
54edd1cdc45773dc5c208d9dc4f26b768d200901 18-Aug-2014 Esteban Talavera <etalavera@google.com> Add cross profile intent in order after intent filter resolution

The elements returned by queryIntentActivities must be in order, as specified in the Javadoc. Otherwise the ResolverActivity will incorrectly filter out intents if they follow another intent with lower priority than the ones that will be shown to the user.

Bug: 15906680
Change-Id: I755e05d3017ee124cbae468f51fa86cfdf42b483
ava/com/android/server/pm/PackageManagerService.java
73f84480af851a9f030880849d3686c11f9788ff 19-Aug-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Remove "allow disable" filter from noman." into lmp-dev
dd753c00d5c25600f0c297b9d1e89e2c4b064bc2 19-Aug-2014 John Spurlock <jspurlock@google.com> Zen: Remove "allow disable" filter from noman.

No longer used by dialer.

Bug:15344099
Change-Id: Ib2d00804f671fae520303531e8ccde9e44f817ec
ava/com/android/server/notification/NotificationDelegate.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenLog.java
ava/com/android/server/notification/ZenModeHelper.java
ava/com/android/server/statusbar/StatusBarManagerService.java
0a82e80073e193725a9d4c84a93db8a04b2456b9 30-Jul-2014 Lorenzo Colitti <lorenzo@google.com> Stop using LinkProperties for static configuration.

LinkProperties can represent way more complicated configurations
than what we can actually apply to interfaces. This makes it
error-prone to use it to represent static configuration, both
when trying to apply configuration coming from LinkProperties
and when trying to save configuration from current
LinkProperties.

Instead, move static configuration (IPv4 only, since we don't
support static IPv6 configuration) into a separate
StaticIpConfiguration class.

Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
ava/com/android/server/net/IpConfigStore.java
d2b8c947ddfc6349a3ae6c3968b422b9cf50d7ed 19-Aug-2014 RoboErik <epastern@google.com> Api updates to MediaSession components

-renames get/setBufferPosition to get/setBufferedPosition
-renames getLaunchActivity to getSessionActivity
-adds doc link to setVolumeTo flags param
-renames setLaunchActivity to setSessionActivity
-hides setMediaRouter
-moves PLAYBACK_TYPE_ constants to MediaController.AudioInfo
-adds addOnActiveSessionsChangedListener version with a handler parameter
-renames AudioInfo to PlaybackInfo

bug:17114404
Change-Id: I0fbfe4eb979cb2af98e3f13095c654bb131f7ae5
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
3d34b54ca8d5af82e021f9a43dd230af9d2ce918 18-Aug-2014 Chulwoo Lee <chulwoo@google.com> Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev
4612a6e1116f1196e6aa64b5a6e3757ea48f94ac 12-Aug-2014 Jungshik Jang <jayjang@google.com> Implement MHL send key action.

This class introduces two classes, MhlSendKeyAction and
HdmiMhlKeycode.
- MhlSendKeyAction is a feature action that manages MHL message
for RCP, Remote Control Pass Through.
- HdmiMhlKeycode is a collection of MHL keycode including keycode
mapping between MHL and Android keycode.

Bug: 16966459
Change-Id: Ib3f7229c71b66837cd0d239e5af1940dfccee7df
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiCecKeycode.java
ava/com/android/server/hdmi/HdmiControlService.java
404bef8a1de30045d36a7579a00c510dc7f2518d 18-Aug-2014 Chulwoo Lee <chulwoo@google.com> Fix ConcurrentModificationException in PersistentDataStore

BUG: 17092853
Change-Id: I613c90b5b78ce317996edb2fda1703aaa318fb1e
ava/com/android/server/tv/PersistentDataStore.java
98f4c16a7beba90abffa89d0b32b8ee56a31073d 18-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev
c22d0c0941ab65ca69977d002c4431394a735c7d 15-Aug-2014 Jae Seo <jaeseo@google.com> TIF: Make passthrough related method names consistent

Bug: 17063792
Change-Id: Id76b37ae1507db5d78319b8786b395353ded70e1
ava/com/android/server/tv/TvInputManagerService.java
89e4ae2f504b4c55d7823c3f04d4894de0d8e471 18-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev
d953c53d3b04d772bb1b62ede1c2011641ca82b5 17-Aug-2014 Dianne Hackborn <hackbod@google.com> Work on issue #16629489: Google (Play?) Services eating through battery

There is a bug in how we deal with name overflows combined with resetting
the battery stats data. If we do a reset while a wakelock is being
actively held that has been put into the overflow bucket, then we can
end up reducing the number of known wake locks in the list so when after
that it is released we try to release it under its real name rather than
the overflow name.

This means we need to keep track of which wake locks have been placed
in the overflow bucket while they are actively being used, so we can be
sure to properly handle it as part of that bucket until it is eventually
released.

This makes things... somewhat more complicated. So now we have a class
to take care of all these details, and also use it for other places where
we have the same overflow semantics sync and job stats.

Also fix potential deadlock -- BatteryStatsHelper needs to call on to
ConnectivityManager to find out of there is telepohny, however we use
that class when doing a dump while the battery stats lock is held. To
fix this, we check the connectivity state up in the battery stats service
before acquiring the lock and propagate that information through to the
dump code.

Change-Id: Ib452206af5c36f4b0f03cc94d2845d36613d1ba5
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/power/PowerManagerService.java
57137289a2798b8c19f1e9f16bd3f0a71f1b916a 18-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev
f2ac2761276e4972f6463d6818c9f5798bdc9a4d 16-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17082301: replacePreferredActivity is ignoring userId

It was being given the argument and just... ignoring it.

But the bulk of this change is to make replacePreferredActivity
better about replacing -- it now detects if the request will not
make a change and, in that case, just do nothing.

The reason for this?

It turns out that each time you install an app, the telephony
system is calling this function over 20 times to set the default
SMS app. This is almost always doing nothing, but before this
change it means we would re-write packages.xml over 20 times...!

There are definitely more improvements that can be made here (delaying
write of packages.xml to allow them to batch together, reducing
the amount of calls being made), but until then this is a big
improvement.

Change-Id: I02c4235b8ecd5c13ef53e65d13c7dc2223719cec
ava/com/android/server/IntentResolver.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/PreferredComponent.java
d47ad033c35b2b69fc0be2073c682c30c855c124 15-Aug-2014 Adrian Roos <roosa@google.com> Fix bars jumping to black on activity launch

During animations, the wallpaper crop is the
union of the start and end crop. This prevents
the system bars from jumping to black when an
activity with opaque bars is launched.

Bug: 16441036
Change-Id: Ic0f3bc2e83b9830514a3456a27ae6f23716f3240
ava/com/android/server/wm/WindowStateAnimator.java
804322564b1b4e4ccff0b1c8cd312bac75ec5bb0 17-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix a logic error so mtu works." into lmp-dev
8e5482f6edda2a5e792f11327fd201040a9cfea5 18-Aug-2014 Michael Wright <michaelwr@google.com> Merge "Change 'disable hardware keyboard' to 'show input method'" into lmp-dev
3f05bf4d7838cb719e78f9d93b22d7ce777392c5 06-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Add tcp buffer size conduit to NetworkAgent.

bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591
ava/com/android/server/ConnectivityService.java
028ceeb472801bcfa5844fc89ed0da8463098824 18-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue #14617210: Apps can gain access to any ContentProvider...

...with grantUriPermissions (no user interaction required)

Add a new path in to the activity manager to start an activity as
if it was directy started by the original calling activity. This
is specifically for the resolver activity and chooser activity to
be able to safely launch its data after serving as an intermediary.

Access to the new method is highly restricted -- it can only be
called by an activity that is declared in the framework apk itself,
and the execute-as-the-caller behavior will only happen if the
code is running under the system uid. (This means we could still
have these run in the client's process in some cases and still work
correctly.)

Note there is some commented out code here half-done about trying
to propagate security exceptions back to the original calling
activity. This would be really nice, especially now with the
chooser activity running in a system process so any errors made
by the app (bad permission grants, bad intents, etc) no longer
actually appear in the app so are essentially invisible. I'd
really like to figure out a way to propagate these exceptions back
to the app, but this is hard since the app's process may no
longer even be running at this point.

Also tweak activity manager dump output to split the recents
dump out from activities, since recents can now be super large.

Change-Id: I50410c4783faf9302c69290589a068a846e0973a
ava/com/android/server/am/ActivityManagerService.java
5b1caaf7d8408bf0ce78d8d7a36f4649dda17797 19-Aug-2014 Jae Seo <jaeseo@google.com> TIF: Fix some comment warnings

Also fixed some other obvious warnings from Eclipse

Bug: 16876068
Change-Id: Ic9c44caf3fd53e965043aa96039d5f3a5655eaff
ava/com/android/server/tv/TvInputHal.java
ava/com/android/server/tv/TvInputHardwareManager.java
8415477dcc3902a67e54fa9df4b4d4b096b82941 19-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "Progress towards staging ASECs." into lmp-dev
742e790294b3441b79f715fe447069b63c6065db 17-Aug-2014 Jeff Sharkey <jsharkey@android.com> Progress towards staging ASECs.

Move location selection logic into shared PackageHelper location,
and share it between DCS and PackageInstaller. Fix bugs related to
installed footprint calculation; always count unpacked native libs.

Have PMS do its own threshold checking, since it's fine to stat
devices. PMS only ever deleted staging ASECs, so move that logic
into installer and nuke unclaimed staging ASECs. Allocate legacy
ASEC names using PackageInstaller to make sure they don't conflict
with sessions.

Start wiring up session to allocate ASEC and pass through staged
container for installation.

Fix bug to actually delete invalid cluster-style installs.

Bug: 16514385
Change-Id: I325e0c4422fc128398c921ba45fd73ecf05fc2a9
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
15ed2754a308546a54ab1061b4e365d6fe9b898d 19-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix path for handling system window with app token.

It is wrong to turn the token into a null appWindowToken; we
need to create a new top-level token as if they had passed in null.

Change-Id: I870d8167c6ed456ea8fd58b149809ec9e0103bce
ava/com/android/server/wm/WindowManagerService.java
43074032d6ee3576416c86342da3a7a3291049a7 16-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Fix a logic error so mtu works.

bug:17046179
Change-Id: I744a2fd425627da16d9779df3a96541506e0b6b3
ava/com/android/server/ConnectivityService.java
bd431ee5d302f46ac3cc846797fa7a5551f7b42e 16-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Configure MTU based on network MTU parameter" into lmp-dev
cab3eb0c0b29d8c4b58652c40687a5a4309f94ef 15-Aug-2014 Jeff Davidson <jpd@google.com> Merge "Fix default scorer provisioning." into lmp-dev
3edf5272fb2185403dfe64b9722b9fc9b9de80f8 15-Aug-2014 Jeff Brown <jeffbrown@google.com> Add trace tag for power management.

Instrumented the basic power manager state transitions,
calling into the Power HAL, setting the display power mode,
and setting the backlight.

Bug: 17004602
Change-Id: I4e362162ddfd7292a7eea8b5d029ce3f6593c4a9
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/display/DisplayPowerState.java
ava/com/android/server/display/LocalDisplayAdapter.java
ava/com/android/server/dreams/DreamController.java
ava/com/android/server/lights/LightsService.java
ava/com/android/server/power/Notifier.java
ava/com/android/server/power/PowerManagerService.java
3e3b251f46f6ec46a41d42eb7c36a6268096c70d 16-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "PackageInstaller API refactoring." into lmp-dev
a0907436c01fd8c545a6b5c7b28bc3bc9db59270 15-Aug-2014 Jeff Sharkey <jsharkey@android.com> PackageInstaller API refactoring.

Switch to using IntentSender for results to give installers easier
lifecycle management. Move param and info objects to inner classes.

Bug: 17008440
Change-Id: I944cfc580325ccc07acf22e0c681a5542d6abc43
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
376e4ba96222163be1f1cf409dc697550be4a285 14-Aug-2014 Nicolas Prevot <nprevot@google.com> When forwarding intents, ignoring the package set in the intent.

Apps should not be allowed to target a specific package in the target user.

BUG: 17025506

Change-Id: I81afa2f8d0a1114d91c001e357366792c63b6577
ava/com/android/server/pm/PackageManagerService.java
c6f22499f3046684d7175e10ca42cce1492cd36f 14-Aug-2014 dcashman <dcashman@google.com> Address KeySet API Review

Hide KeySet API. Change getKeySetByAlias to not require aliases from the calling
package. Make KeySet parcelable. Add hashCode method.

Bug: 16895228
Bug: 17009318
Change-Id: I75951947dfc7a3cca9f8873bda72576d11abaaf0
ava/com/android/server/pm/PackageManagerService.java
3d69256fdf3f2006d312824386a4b68b4c6f79bd 15-Aug-2014 Ruchi Kandoi <kandoiruchi@google.com> Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"

This reverts commit d54157e2e92f58e997c4bdb50e026e6a0d0121fd.

Bug: 16654179
Change-Id: Id4f22c0a4e23518881ac58ad969c16c4612306a2
ava/com/android/server/power/PowerManagerService.java
528dcd2fbe6556ca542a432b7aa26731663e3148 15-Aug-2014 John Spurlock <jspurlock@google.com> Zen: tweak audience interruption logic.

Only check audience for calls & messages.

Bug:17061146
Change-Id: I7f0176a7184c725fef393784fe8ccb0eb7f49ff7
ava/com/android/server/notification/ZenModeHelper.java
4db0d98b42a723f2e16c6595e85e866fd26c6d98 13-Aug-2014 John Spurlock <jspurlock@google.com> Zen: Downtime now a condition provider, persist conditions.

- Persist the entire exit condition instead of only the id.
- Make downtime a proper condition provider (similar to the
existing countdown provider for time-based conditions)
- Move all downtime-related items out of ZenModeHelper and
into the new condition provider.
- Reevaluate downtime more often, when any of its inputs change.
- Make sure downtime appears as an available condition in the
condition panel when applicable.

Bug:16296125
Bug:16211189
Bug:17031767
Change-Id: I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/CountdownConditionProvider.java
ava/com/android/server/notification/DowntimeConditionProvider.java
ava/com/android/server/notification/ManagedServices.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenLog.java
ava/com/android/server/notification/ZenModeHelper.java
29564cd24589867f653cd22cabbaac6493cfc530 07-Aug-2014 Narayan Kamath <narayan@google.com> Remove system_server classes from the boot image.

We set the system_server classpath in the environment
(like we do with BOOTCLASSPATH). After the zygote forks
the system_server, we dexopt the classpath (if needed)
and then launch the system server with the correct
PathClassLoader. This needed several small / medium
refactorings :

- The logic for connecting to installd is now in a separate
class and belongs in the system_server.
- SystemService / SystemServiceManager have now moved to
classes.jar. They are only used from there, and since they
use Class.forName, we want them to be loaded by the
system_server classloader, and not the bootclassloader.
- BootReceiver now moves to frameworks.jar, because it is
used by ActivityThread and friends.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
ava/com/android/server/BootReceiver.java
ava/com/android/server/SystemService.java
ava/com/android/server/SystemServiceManager.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/Installer.java
ava/com/android/server/pm/PackageManagerService.java
ni/onload.cpp
6c4b9de8f1fd594038793c3924b52a44138c319e 08-Aug-2014 Narayan Kamath <narayan@google.com> Validate instruction sets passed to installd.

We don't want folks passing down arbitrary strings.

bug: 16837404
Change-Id: I73ac66b376f1401f9f95f3c6323da6242ac8ed3d
ava/com/android/server/pm/Installer.java
15afd8115869bf22534a1f26fe6e389c9e5ef413 06-Aug-2014 w19976 <w19976@motorola.com> Configure MTU based on network MTU parameter

Add logic to obtain the mtu from the network PCO parameter and set it to kernel
when the mobile data connection is established. When there is no PCO mtu configured
from the network, the mtu size defined in the corresponding APN will be used. In case
no mtu size is defined for an APN used for data connection, the MCC/MNC based MTU
defined in the framework overaly will be applied.

bug:17046179
Change-Id: I6465d4b8f2076aaa380ae3617fb3f24adbe136d4
ava/com/android/server/ConnectivityService.java
56f9f73a5aad38aa777ec9a42c859e687f2d2af1 15-Aug-2014 Jeff Davidson <jpd@google.com> Fix default scorer provisioning.

Use Settings.Global instead of SharedPreferences (which don't work) to
track whether we've run the one-time provisioning step of activating
the build-time configured default scorer.

Bug: 16980605
Change-Id: I093cdd6f4f1110960078a186191c4e02b5543d6a
ava/com/android/server/NetworkScoreService.java
82d6d337b389ef088879a5e527d44c75c41c5b44 15-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "Some networks may have null ifaces, I guess?" into lmp-dev
9da2f1e007268a42248a1778aa9b560e3ce3b704 14-Aug-2014 Jeff Sharkey <jsharkey@android.com> Some networks may have null ifaces, I guess?

Seems like a bug further upstream, but guard ourselves against it
for now.

Bug: 17033841
Change-Id: Id0e5895c3389b63d4e34b1fb064efef8b72cd609
ava/com/android/server/net/NetworkPolicyManagerService.java
ava/com/android/server/net/NetworkStatsService.java
7c9ee19cbd0360a62dc4322169afc1b0b9c9e022 15-Aug-2014 Craig Mautner <cmautner@google.com> Fix race condition between binder deaths

If a Binder dies there is a race between activity manager and window
manager to see who can handle the binderDied call first. If the
activity manager wins the race it will remove the activity and task
but leave the windows around. Until the WindowState.binderDied call
is made and all animation is complete the windows will try to access
the task that they were associated with.

This fix removes the windows of an activity when the activity is
removed. It also defers removal of the activity and task until
exiting windows have completed their animation.

Fixes bug 17031518.

Change-Id: Idf52f55c5feb0cad4e3664ef2eae5b7e95bbf490
ava/com/android/server/wm/AppWindowToken.java
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/WindowManagerService.java
8960d1b1552729e3dfd33deee951ac75933ad8e5 13-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Replace the usage of logical address with id for HdmiDeviceInfo

Introduced 'id' of HdmiDeviceInfo to replace the direct use of logical address
as id. This accomodates the identification of MHL device with ease. Also updated
TIF to use id instead of logical address.

Bug: 16986744
Change-Id: Ifa827fb5e5fcf1d2f612f0845accbfe5c03734aa
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
1d2a1c917f46b6854e91f9867a20abb76ecb794d 14-Aug-2014 RoboErik <epastern@google.com> Merge "Pipe caller's identity through volume methods" into lmp-dev
0dac35af2c6aa42bcd181981b041747cfd1afa5f 13-Aug-2014 RoboErik <epastern@google.com> Pipe caller's identity through volume methods

setStreamVolume and adjustStreamVolume were always being called
from the session service's uid/package. This adds the plumbing to
allow the original app's info to be passed in to the audio service
when volume is changed.

Change-Id: Ib36639dab1e518b435161dc453c8ba9351df3e9b
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
550c4b0d4dc6f3e2ef388b4250c758829c8255bc 13-Aug-2014 Jae Seo <jaeseo@google.com> TIF: Temporarily disable permission check for parental controls

Bug: 16979343
Change-Id: I00ff70194faaf7218151388dc10ce8e4dd3d2728
ava/com/android/server/tv/TvInputManagerService.java
235510e67210f90de30c2d5582a2077ccc589619 13-Aug-2014 Jose Lima <joselima@google.com> Made AlarmClockInfo a nested class in AlarmManager

Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
ava/com/android/server/AlarmManagerService.java
4b6c6697da5a20c08b2f9f2ca40c94008477e914 13-Aug-2014 Jose Lima <joselima@google.com> Renamed "media playing" APIs to "visible behind"

- Request from API Review: rename the media playing APIs to a more
generic name, reflecting the background visibility feature these
methods actually control.
- Made the new isActivityVisibleBehind().
- Changed convertFromTranslucent() and convertToTranslucent() to be
SystemApi.

Bug: 16959028
Change-Id: I526eac22f44273b3254dd6201f89194d13e597e2
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
c12035cd40d01b032013f515cb509e6c8791cf65 14-Aug-2014 Jeff Brown <jeffbrown@google.com> Log who is calling goToSleep().

Change-Id: Ibae61c90ee115735835e878bb3bf79eedaa0ae44
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/power/PowerManagerService.java
5b1500a7dcfe01b38f4cefc1e55ea228323334b1 14-Aug-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix singleInstance usage when singleTop intended" into lmp-dev
ad400af809d4f0da7e3747922ddae6c1828a96bb 14-Aug-2014 Craig Mautner <cmautner@google.com> Fix singleInstance usage when singleTop intended

In ag/499591 launchSingleInstance was mistakenly used to replace
r.launchMode==ActivityInfo.LAUNCH_SINGLE_TOP. This fixes that
and...

fixes bug 16898764.

Change-Id: I0c0cc3b67eda69276dbe1dd5da4f17556651b1ff
ava/com/android/server/am/ActivityStackSupervisor.java
592ddc3f6e8362807b314ac2c4b7c9b7e6e89ff2 14-Aug-2014 Wonsik Kim <wonsik@google.com> Merge "TIF: handle HDMI CEC power status change" into lmp-dev
e92f857d50d7259a4cf7ef5b88309e098338c9c1 12-Aug-2014 Wonsik Kim <wonsik@google.com> TIF: handle HDMI CEC power status change

Bug: 16967261
Change-Id: I252dbb249ec818bcaad7d813d1065ebb0714bd54
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
8e083ec0444e52cb203228bcf1c1cd34bcc4e70d 12-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Remove timeout from deviceSelect processing

20-second timeout set for incoming <active source> command after
<set stream path> is moved out of HdmiControlService, to
HDMI input service.

Bug: 16967429
Change-Id: I5b50b0187e562b51e227a29e54824740ca37906e
ava/com/android/server/hdmi/DeviceSelectAction.java
82324ec66298984d2b6770538a8406abd5299847 14-Aug-2014 Jae Seo <jaeseo@google.com> Merge "TIF: fix IOException at PersistentDataStore.save()" into lmp-dev
7ed8901f120b21b4476c37b47791e25d659b21a5 14-Aug-2014 Wonsik Kim <wonsik@google.com> TIF: fix IOException at PersistentDataStore.save()

Bug: 17018435
Change-Id: Ic999aaf59ae942ee8279576ec1e2ce2fa62bd6e0
ava/com/android/server/tv/PersistentDataStore.java
ceb4d418464d1b72c450c5e390b1cc7b1f92a49f 13-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev
55b0abd75c4fe61d293846f55c3d9fe834a4d15a 13-Aug-2014 John Spurlock <jspurlock@google.com> Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev
3929232cf9d17f81e4fc31004fef3deaa9096826 13-Aug-2014 John Spurlock <jspurlock@google.com> Send LED signal up to SystemUI regardless of setting.

Let it make an independent decision about whether or not to
do anything with it.

Bug:17001245
Change-Id: Ie494abec423f3620bf142ad332bb5f0a4d4341a5
ava/com/android/server/notification/NotificationManagerService.java
4903f64ba2478849e6c401f42f5a77c1d4f9f7df 11-Aug-2014 Narayan Kamath <narayan@google.com> Persist the cpuAbiOverride setting.

If an app is installed with an ABI override (adb install -r --abi)
we should remember this so that we don't revert to the scan derived
ABI on the next reboot.

bug: 16476618

Change-Id: I6085bc0099eb613dd9d3b07113c7c13859780697
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/PackageSetting.java
ava/com/android/server/pm/PackageSettingBase.java
ava/com/android/server/pm/PendingPackage.java
ava/com/android/server/pm/Settings.java
72eb2ae21bc8d1788ffc4445b39ede87bc91cdc4 13-Aug-2014 Jorim Jaggi <jjaggi@google.com> Merge "Lockscreen launch animations" into lmp-dev
20200849d1dd6ac5e52b3d18ced2d9becb5ff229 11-Aug-2014 Narayan Kamath <narayan@google.com> Fix a couple of PM warnings.

- "Could not delete native binary" : This one is a bit of
a WTF. git history tells us this code has been around for
a very long time (the warning's new though). It's a no-op
because codePath always contains the *current* codePath and
trying to remove native libs from the current codePath will
do nothing for bundled apps. This code sounds like it wants
to delete dangling native binaries for system apps that were
upgraded during an OTA. This sounds like a wrong place to do
that, though.

- "Unrecognized code path" : This one's harmless and removed
by moving this call closer to where it's used.

bug: 16823001

Change-Id: I9b40ae507b2c80ff3fdd45d5699df62bfc86514f
ava/com/android/server/pm/PackageManagerService.java
7f8821c5a252f5b41a43502d6140708708b16511 13-Aug-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Bugfix: adds extra null check" into lmp-dev
0c38fc764b0e1c5c8b880872d9b4a647a76955cd 13-Aug-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Fix release logic for hardware wrapper input

Change-Id: I7aad26682738e7a20bc6a053c3827ab79e83e925
ava/com/android/server/tv/TvInputManagerService.java
dd8e48f306b85ab10d57e474475f3ab9756aa5e9 13-Aug-2014 Wonsik Kim <wonsik@google.com> Merge "TIF: fix parental control data inconsistency" into lmp-dev
276ec84b5db595be54613fa57b9c7f507ec464e6 13-Aug-2014 Wonsik Kim <wonsik@google.com> TIF: fix parental control data inconsistency

Bug: 16987144
Change-Id: I43cc7de92663d50073d5c4da1dbffe4e9a2b26a6
ava/com/android/server/tv/PersistentDataStore.java
08a1be81d7b597f858164fee6a4934264259b3ae 12-Aug-2014 Yuncheol Heo <ycheo@google.com> Implement MHL RAP reception.

Bug: 16966458
Change-Id: I77effc917e19072c387be8ba28d6ce1664d16415
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiControlService.java
48054241eb70b4319f8df6575e838f64d6b2c05a 13-Aug-2014 keunyoung <keunyoung@google.com> fix wrong flag check for virtual display

- FLAG_NEVER_BLANK was always set for non-public display

bug: 16958538
Change-Id: Ia147ac3ca39d687e60ec4b77726f6b6e4c3aeb3b
ava/com/android/server/display/VirtualDisplayAdapter.java
67241476f3fd5d2ae145d64233193f823aa03a6a 13-Aug-2014 Jae Seo <jaeseo@google.com> Merge "TIF: Create TvInputState only once per each input" into lmp-dev
95ab7849444125387dc88088bb5197ee463d8c17 12-Aug-2014 Amith Yamasani <yamasani@google.com> Decouple user limit from guest creation

Allow Guest to be created even if there are N users.
Allow N users to be created even if there are N-1 users
and a Guest.
Limit number of guests and managed profiles that can
be added.

Added unit tests.

Bug: 15934700
Change-Id: I1a8f0fa38a91d71ef7b2980e05c974244dfc337a
ava/com/android/server/pm/UserManagerService.java
9cc28e5175e1391646b29469d329c9c1c9311ee1 13-Aug-2014 Jae Seo <jaeseo@google.com> TIF: Create TvInputState only once per each input

Also removed mClientTokens which is no longer used.

Bug: 16970763
Change-Id: I4fc276241c33f88ed932ce6c703bdb3f771eb7d4
ava/com/android/server/tv/TvInputManagerService.java
57e383b1cc72aea93b0041d69afa31a02597338a 14-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't send NetworkMonitor bcast until systemReady" into lmp-dev
fb68f8fbe0213841f393f8bdb5313e4e44f4f116 13-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Don't send NetworkMonitor bcast until systemReady

bug:16913951
Change-Id: I26c5c3353c2d8821452f81765875958d5b9d385b
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkMonitor.java
eb0cefa965fbc37d45a0f7e91be5bab53e0e22a7 14-Aug-2014 Winson Chung <winsonc@google.com> Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev
60a729c8e93461c9446d0c8cd519b40dec01e8d8 13-Aug-2014 Winson Chung <winsonc@google.com> Adding scrim to task views. (Bug 15704955)

- Fixing issue with focus animations not happening for new views

Change-Id: I3134f25becf06db343aa30ea80cb33514cd99d06
ava/com/android/server/wm/AppTransition.java
4a8dddbf18fedb33bb2c725db489669a141e1d73 13-Aug-2014 Craig Mautner <cmautner@google.com> Clean up app following death when creating service

If an app has died, run through the cleanup before relaunching its
service.

Also a little simplifying refactor.

Fixes bug 16979752.

Change-Id: I376cbef2ea00fc626588386317f092cc6dea0bdc
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
84a3e7aacf6dbeccf4afb36a29f2f069dca7d486 13-Aug-2014 Jorim Jaggi <jjaggi@google.com> Use different unlock animation when going to full shade

Also fixes a bug that the notify flag was not reset, and fix the
transition for the phone/camera affordance (in these cases, no
animation is needed).

Bug: 15991916
Change-Id: Idbb4fa40f86bda597cd66cc38da838ef4f75514d
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
e253fabbc76779b26475fe40ea91e7359085920e 13-Aug-2014 Jae Seo <jaeseo@google.com> Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev
eb829f2f9fa9348e85f1ff5e856e0525c53ddff6 13-Aug-2014 Craig Mautner <cmautner@google.com> Merge "Disassociate system windows from apps" into lmp-dev
a5d29971f8f4d463348e9de0f7af7e2e92a377a0 13-Aug-2014 Craig Mautner <cmautner@google.com> Disassociate system windows from apps

If an app launches a system window remove the app token.

Fixes bug 16825063.

Change-Id: I7c7403e0958f3cd9f6dd5e2964b2e9cabc51ded7
ava/com/android/server/wm/WindowManagerService.java
2c1c74afca549939da834ab6f623e33ea2a56562 13-Aug-2014 keunyoung <keunyoung@google.com> Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev
c093bf26456e55c09ed4e61ad36999d07a86be1f 12-Aug-2014 keunyoung <keunyoung@google.com> rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP

bug: 16959030
Change-Id: I413a2ba676488bfc18e393465b98681682ec88d4
ava/com/android/server/UiModeManagerService.java
9dbe190099a34c6420541a36425d8c68007bc86e 13-Aug-2014 Adrian Roos <roosa@google.com> Trust: Insecure unlock also removes disable-trust-on-boot restriction

Bug: 16485702
Change-Id: I437f619eb680fa9461a5e0d854db2d9f84dc602c
ava/com/android/server/trust/TrustManagerService.java
2d8964cca7663b32ca339e1bb57eb4830488fb97 13-Aug-2014 destradaa <destradaa@google.com> Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev
ff8e6093fa5c9114d3565e0fb0d87bd4df3d777c 13-Aug-2014 destradaa <destradaa@google.com> Update FlpHardwareProvider native layer, to stop raising FatalErrors.

b/16800814

Change-Id: Ic619f37c02c7e4dddc4ef06369f8730cbd66e6bd
ni/com_android_server_location_FlpHardwareProvider.cpp
2bb8bfd1e85c8359412159fde57dd5722f5be58c 13-Aug-2014 Adrian Roos <roosa@google.com> Dismiss bouncer when onTrustInitiatedByUser fires

Also modifies the SampleTrustAgent to allow testing of the feature
and adds the initiatedByUser flag to the dumpsys output.

Bug: 16840500
Change-Id: I4c08ddcdcbd0ab02c694a1873f73cb9a250f98d7
ava/com/android/server/trust/TrustArchive.java
da97066d5aa6543704a7dcbf484d47b64e0d7525 13-Aug-2014 destradaa <destradaa@google.com> Merge "Add additional logging around AGPS IP Address handling." into lmp-dev
931a37f992c738ebc5d3c82e424d94591798a4d7 13-Aug-2014 destradaa <destradaa@google.com> Add additional logging around AGPS IP Address handling.

The additional logging is expected to help troubleshoot and prevent the issue tracked by the
following bugs:
b/16875580
b/16961654

Change-Id: Ibee7fe0774efa3db77ab53af96c128ced186b40e
ava/com/android/server/location/GpsLocationProvider.java
ni/com_android_server_location_GpsLocationProvider.cpp
0204938659d93347081caec107661ea3734f1a65 14-Aug-2014 Jae Seo <jaeseo@google.com> Merge "TIF: Change the directory of the state file" into lmp-dev
8211dda34da967ca1801bb817e0bfc7c3c87863c 14-Aug-2014 Jae Seo <jaeseo@google.com> TIF: Change the directory of the state file

Changed it from /data/system/tv/{userId} to the directory obtained from
Environment.getUserSystemDirectory(userId).

Bug: 17018435
Change-Id: Ib9704a974c4397149ca4b50670cf11346b818de3
ava/com/android/server/tv/PersistentDataStore.java
b05ea7bb2866035105707e22a977b010ef5062b2 14-Aug-2014 RoboErik <epastern@google.com> Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev
24762bffc3358762666079cd802040a316b3260d 14-Aug-2014 RoboErik <epastern@google.com> Add an onSessionDestroyed callback to MediaController.Callback

Callbacks on the controller need to know when the session ceases
to exist.

bug:17009030
Change-Id: I0f1c1cfc51f7dd2203955287cc269667d3765ee4
ava/com/android/server/media/MediaSessionRecord.java
815e057b9bb19acd77bf01ecb690b6e9fa85902e 12-Aug-2014 Jason Monk <jmonk@google.com> Switch exiting screen pinning to recents+back

When accessibility is on, still use just recents.

While here fix strings to be less wrong. Still need finalization.

Bug: 16649417
Change-Id: I94debe9471d5132f1f662543cc98cbde638c758d
ava/com/android/server/am/LockTaskNotify.java
ava/com/android/server/am/LockToAppRequestDialog.java
d4edf4cb01b6f0509089708590753774072bffd1 13-Aug-2014 David Christie <dnchrist@google.com> Disable GPS when battery saver is on and screen is off.
Bug: 15348895

Change-Id: Iae2c3898ff48dc4d22e0ff872d7417ef6945c5e3
ava/com/android/server/location/GpsLocationProvider.java
81f871e2b96125d57b76c07169e868e516443794 07-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> Add support for AudioAttributes in android.media.Ringtone

Deprecate use of stream types.
Map deprecated API to AudioAttributes.
Add new methods to specify AudioAttributes on a Ringtone instance.

Bug 16790748

Change-Id: Ifb3c2e838e1f119614459ad7d71d83a4d7c9ffdb
ava/com/android/server/notification/NotificationManagerService.java
8de4311c51229efbe2f2d0afbf298982c5cadd96 11-Aug-2014 Jorim Jaggi <jjaggi@google.com> Lockscreen launch animations

- Get rid of ActivityManager.dismissKeyguardOnNextActivity, which was
used for two different things: Dismiss keyguard from somewhere else
(not really necessary anymore), wait to actually dismiss keyguard
after the window behind is drawn. Instead, introduce
keyguardWaitingForActivityDrawn(), and change the semantics where
necessary.
- Make wallpaper_close_enter consistent with task_open_enter and the
Keyguard launch animation.
- Close the panel even on lockscreen when launching a notification.
- Block notification shade updates during the collapsing motion so
notification don't play the disappear animation immediately after
having launched a notification.

Bug: 15991916

Change-Id: I133c177b84e926c87c1a404ba93d633593fec3ab
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/wm/WindowManagerService.java
d45afac287f54f610b795dcd9513bcd032695363 12-Aug-2014 Diego Pontoriero <diegs@google.com> Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API
for determining carrier app instead of MCC/MNC.

Related ConnectivityService change: http://ag/374479

Related Aeroshell change to SetupWizard: http://ag/520857

Bug: 16457806
Change-Id: I78eb2a25d578400c2de6bae4af3d6e8e1ee4d0c7
ava/com/android/server/ConnectivityService.java
33fe1ed56d7d7b781046d28d7e1aebe42894623e 13-Aug-2014 Winson Chung <winsonc@google.com> Merge "Clearing tasks along with application data. (Bug 16952119)" into lmp-dev
70236bf4f10b485c20fd7aab80c9309a8b8f5cbf 08-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Remove extraneous clearing of inet condition

This was old code I missed in previous inet condition refactor
and caused us to show "not connect" icon any time we connected
to a secondary network (mms/supl/etc).

bug:16896743
Change-Id: I0fa62e09bb0b7c0ee0864bb1f95967eac5f60d3e
ava/com/android/server/ConnectivityService.java
93baa0ed9b6b582e28454a4c636b2bfc91d90fcf 12-Aug-2014 Winson Chung <winsonc@google.com> Clearing tasks along with application data. (Bug 16952119)

Change-Id: Ie986712a7d7d0911b6de7a4b34b7d03bf7874d6f
ava/com/android/server/am/ActivityManagerService.java
76a1623afc170a13923b68f3256057d8adeb7937 08-Aug-2014 Jorim Jaggi <jjaggi@google.com> Preparations for lockscreen launch animations

- Update unlock animations to new spec to make the consistent with
lockscreen launch animations.
- Introduce disappearing motion for security views which runs before
we actually dismiss Keyguard.
- If a window is running the un-force-hide animation, treat as it
would have the wallpaper flag set so the wallpaper stays until
the animation is completely done.
- Run an animation on the wallpaper if the wallpaper is going away.

Bug: 15991916
Bug: 16234603
Bug: 15326120
Change-Id: I063aa4f269ddcf75b9a705e90f0c3056b541b642
ava/com/android/server/wm/AppWindowAnimator.java
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
fee26771cfed736d207a8ee9c97134c848be1a52 05-Aug-2014 Winson Chung <winsonc@google.com> Ensuring that we update the calling uid/package when updating a task's original intent. (Bug 16676636)

Change-Id: I5d75a912e86e83f05717cb19e9b6edb02eb053e6
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskRecord.java
7c97bbc39f0b748e413de3cd0b0f0c995a2af0ce 12-Aug-2014 Alexandra Gherghina <alexgherghina@google.com> Bugfix: adds extra null check

Bug: 16976436
Change-Id: Id51fd3125b4e68ff7c0ec37ec031fcb8ff882ed4
ava/com/android/server/pm/PackageManagerService.java
867b4e0c55b4b1e432a3585fc945a999f066ef81 12-Aug-2014 Jungshik Jang <jayjang@google.com> Set active port path to HdmiControlService

Set active port path to HdmiControlService so that the service
can handle proper event patch between cec and mhl devices.

Bug: 16215362
Change-Id: I2bd703916a422429b1029067fa3422e24de39274
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiControlService.java
502d8b3beb5bd7ec03ad4fa6edb1a14a2ce1f7ac 12-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Make sure CEC switch info is always updated" into lmp-dev
328e679b210aae094dd1bb86f80550c58aefbe9c 12-Aug-2014 Jeff Davidson <jpd@google.com> Merge "Security-related cleanup for network scoring." into lmp-dev
bcfa0677d4b015457b73b1147c96e4ad2946b2be 11-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Make sure CEC switch info is always updated

The CEC switch information was not updated as expected if
Device Discovery action is in progress. Refactored to have the
update routine gets called regardless of the presence of action.

Conflicts:
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java

Bug: 16931883
Change-Id: I629e8b646bef54599c1a706bf1c797ecebf8616b
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ac7285dc1e13f30d59dad30fe2ad1116e5f676cb 09-Aug-2014 Jeff Davidson <jpd@google.com> Security-related cleanup for network scoring.

-Perform additional checks for the SCORE_NETWORKS permission when
broadcasting scoring requests to the active scorer and when accepting
score updates. In theory, these checks are unnecessary as we manually
check package manager when obtaining the list of valid scorers, but
they cannot hurt to add.

-Fix multi-user. Since the active scorer is a global setting, we
ensure that scoring can only be done by apps available to the primary
user / owner of the phone, and that the request scores broadcast is
sent to that user's profile. When the scorer is changed, we send that
to all user profiles as it's just informational, although it's
unlikely that apps outside the primary user's profile would need to
respond.

Bug: 14117916
Bug: 16399238
Change-Id: Iaf06bda244eec730b590a30a3f4ffab4965bde96
ava/com/android/server/NetworkScoreService.java
1f7a39fee1be73bf079e0443d30d316482728ddc 12-Aug-2014 RoboErik <epastern@google.com> Merge "Fix registering global priority sessions" into lmp-dev
4d26598677095e74e30fc12f46a769cac800f946 12-Aug-2014 RoboErik <epastern@google.com> Fix registering global priority sessions

We were never setting a global priority session due to a change in
the way sessions were registered. This makes sure a global session
gets set correctly.

bug:16930866
Change-Id: I859846c9265e98bb1a37ff9d22808137e787ce18
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
93f871126c6dfb059c655d07f03a4cf4598bd6be 12-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "Hack and ship: NetworkStats edition." into lmp-dev
eb2c2c790c4b86c9c09245e0b87a38972713434a 12-Aug-2014 Jeff Sharkey <jsharkey@android.com> Hack and ship: NetworkStats edition.

Some devices use clatd for catching raw IPv4 traffic when running on
a pure-IPv6 carrier network. In those situations, the per-UID
stats are accounted against the clat iface, so framework users need
to combine both the "base" and "stacked" iface usage together.

This also means that policy rules (like restricting background data
or battery saver) need to apply to the stacked ifaces.

Finally, we need to massage stats data slightly:

-- Currently xt_qtaguid double-counts the clatd traffic *leaving*
the device; both against the original UID on the clat iface, and
against UID 0 on the final egress interface.

-- All clatd traffic *arriving* at the device is missing the extra
IPv6 packet header overhead when accounted against the final UID.

Bug: 12249687, 15459248, 16296564
Change-Id: I0ee59d96831f52782de7a980e4cce9b061902fff
ava/com/android/server/ConnectivityService.java
ava/com/android/server/net/NetworkPolicyManagerService.java
ava/com/android/server/net/NetworkStatsService.java
6d2a9492e2b19421165f0cd918d9f28595bfb770 08-Aug-2014 Jeff Brown <jeffbrown@google.com> Eliminate power manager latency for boot completed.

The power manager disables the power button until boot completed
occurs. If there are many pending broadcasts in the queue, it
may be possible for BOOT_COMPLETED to be delayed for several
seconds after boot.

To avoid the delay, introduced a new boot phase which is
sent to system services immediately when boot completed happens.

Bug: 13398280
Change-Id: I1833d2ffb20305009dd76363b43e534034f1d0a2
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/power/PowerManagerService.java
7df52862dae1fa33c84725c613b0d9b88c1b28b6 11-Aug-2014 Jungshik Jang <jayjang@google.com> Hook up native mhl api to HdmiControl Service.

This change hooks up all apis defined in mhl hal to
java layer's HdmiMhlController and HdmiControlService.
Along with HdmiMhlController, this change includes followings.

1. HdmiMhlLocalDevice
A logical container for a mhl device connected to specific hdmi port

2. HdmiMhlFeatureAction
A base feature action class for mhl's state behaviors like RAP and RCP.

Bug: 16215362

Change-Id: If177999853f60b68bd079549660a3f4982cb9d9e
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecFeatureAction.java
ava/com/android/server/hdmi/HdmiControlService.java
91e25eda411572c7b56382351d718f1343050310 12-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Move input change event handling out of TVInputManager" into lmp-dev
d38bf476f6a31602e92a3207a4ceb29bf965f9aa 11-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Move input change event handling out of TVInputManager

HDMI input change event should be handled best in TIS implementation
of HDMI input since the input change request from TV/other device
needs to be properly coordinated. This requires the listener be
moved the input service.

Provided an interface in HdmiTvClient for the input service to access
the API through getSystemService(Context.HDMI_CONTROL_SERVICE).

Conflicts:
services/core/java/com/android/server/tv/TvInputHardwareManager.java

Bug: 15570939
Change-Id: Ie2ad10d77907de3d4501f9c892ca553b75365467
ava/com/android/server/tv/TvInputHardwareManager.java
7aef77bbf5b983b9f949936ed6cd174251697ca8 09-Aug-2014 RoboErik <epastern@google.com> Remove sessions listeners that are disabled

Removes sessions listeners when their notification listener is
disabled. Also updates the dump for media sessions.

bug:15549450

Change-Id: Ibe51a4a42ef333e75a09f0fffa0f2b9b8939b85c
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
e5910f70fcf99cb2d3bf391b585a236be417d3e6 12-Aug-2014 Yuncheol Heo <ycheo@google.com> Merge "Use the system property for the HdmiControlService configuration." into lmp-dev
7d9acc7a3eddb3e57c0b8312c3baf7ebb4f529d9 12-Aug-2014 Yuncheol Heo <ycheo@google.com> Use the system property for the HdmiControlService configuration.

- We've used the system resoure overlay for this purpose, but we found
that it's hard for OEM which uses PDK to override this. Since the
resource was already compiled and provided as a binary, so it's hard
to change it.

Bug: 16965963
Change-Id: I868305d6f76c128d79c00ab6a8023656cd476c62
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiControlService.java
05182b2d69c66d9cbbb96306008ac54aa06975d0 12-Aug-2014 Wonsik Kim <wonsik@google.com> Merge "TIF: small refactoring around audio configuration update" into lmp-dev
7587d298c9dccbcf425204a9879b5c9e6d2a1a7e 09-Aug-2014 Wonsik Kim <wonsik@google.com> TIF: small refactoring around audio configuration update

Bug: 16880310
Change-Id: Ic519ff0f67cb35a876784530d956fcf8cb7edbf7
ava/com/android/server/tv/TvInputHardwareManager.java
302938e9b54132d8e81a1b2646e58bb97dfd4656 12-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Fix two bugs" into lmp-dev
1f8d1c576f06ed63c21d175fb0c86db596f59353 12-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Fix two bugs

- <Routing Change> goes out with invalid parameter (F.F.F.F) for
old path if the active source/path is not set. Should have been
set to internal path (0.0.0.0)
- <User Control Pressed> was still sent when active source was not
set. Fixed to discard it.

Bug: 16966486
Bug: 16965446
Change-Id: I5abb062be42c17514b3ed7ac930d7a3535fc9132
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
6d73986305bf88038c1010bd7a312a8360b1df90 11-Aug-2014 Yuncheol Heo <ycheo@google.com> Merge "Make it not to go to sleep when changing TV's input to the others." into lmp-dev
64bafd9108b532102bc13c47966444b073c33faf 11-Aug-2014 Yuncheol Heo <ycheo@google.com> Make it not to go to sleep when changing TV's input to the others.

- Previously, we decided to make it go to sleep when changing TV's input
to the others. But, we found that the current molly couldn't wake up by
CEC commands actively. So, we'll revert the decision.
- In addition, during investigating this issue, we found that currently
molly couldn't work with Samsung (SS) TV harmoniously. SS TV will send
<RoutingChange> and <RequestActiveSource> when it wakes up. If there
is no <ActiveSource> response, then it will change the input to the
internal. This CL handles this issue also.

Bug: 16803105
Change-Id: I5179561775b186b486fc3f2a042e759fcb07451b
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
3d1232f35157716bfbb62a475b8203a6a2fc3164 11-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "GID-based permissions are defined by "android"." into lmp-dev
fb2c4d18613efb8197c6b6abcac262b7220b7231 10-Aug-2014 Jeff Sharkey <jsharkey@android.com> GID-based permissions are defined by "android".

This matches all other permissions defined by framework-res.apk,
instead of leaving it null.

Bug: 16907551
Change-Id: I7e2d671443d987906b2f29aa1579bef6380e8a52
ava/com/android/server/pm/PackageManagerService.java
a351ab96987381ffe7ea29a7cdec1e7fbd1497d5 09-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issues 16739817 and 16709247 in voice interaction service.

Issue #16739817 VIS doesn't start for non-primary user(s)
Issue #16709247 GSA is not the default voice interaction agent

These are both fixed by getting rid of the existing code for applying
the default voice recognizer, moving it in to the voice interaction
manager service, and extending it to also set up the default voice
interaction service.

Change-Id: If8d5936c28aebfa7eff77c8d99241c3a2ffdb0a4
ava/com/android/server/RecognitionManagerService.java
ava/com/android/server/am/ActivityManagerService.java
1f819bbfc80f0ae9de120e9b81250db36629a0b1 08-Aug-2014 Jungshik Jang <jayjang@google.com> Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager.

This is to update audio patch when HDMI-CEC system audio mode is changed.

Bug: 16113320
Change-Id: I312fffe511c0bce1c973bb66e9c16875e5dcee56
ava/com/android/server/tv/TvInputHardwareManager.java
61daf6b38e7a7ada2a6ca5a60539a54b9c6810bd 08-Aug-2014 Jungshik Jang <jayjang@google.com> Hook up device power status change to TIF

Instead of introducing new api update existing
IDeviceEventListener

Bug: 16445063
Change-Id: I93bfc736a06a78e83c95877a53f4f241b51ed9c0
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
7eb75dff7a0fb4b19c3e801cd388483d7d471f41 09-Aug-2014 Jae Seo <jaeseo@google.com> TIF: Move watch history logging to TvProvider

There are only two kinds of watch events that can happen on the system:
1. The current TV input session is tuned to a new channel.
2. The session is released for some reason.
The former indicates the end of the previous log entry, if any, followed by the
start of a new entry. The latter indicates the end of the most recent entry for
the given session. Here the system supplies the database the smallest set of
information only that is sufficient to consolidate the log entries while
minimizing database operations in the system service.

Bug: 14791151, Bug: 15921205, Bug: 15988715, Bug: 16831555
Change-Id: Ifcb1a1273c14ee234919d819d082b1004eb92ebc
ava/com/android/server/tv/TvInputManagerService.java
97f550485ea31355390e0cf65b01e9e1e606ba3c 10-Aug-2014 Chulwoo Lee <chulwoo@google.com> Merge "TIF: Fix a bug of incorrect watch history" into lmp-dev
8d4ded0058de5c573ccf79c4596bf5eb1b14fad3 09-Jul-2014 Chulwoo Lee <chulwoo@google.com> TIF: Fix a bug of incorrect watch history

When the user keeps watching one channel without tuning to the other
channel, the user can watch many programs. In this case as many watch
history records as the number of programs the user watched should be
inserted in watched_programs table.
But there is a bug now that only one record is logged for all the
programs and this CL fixes the bug and makes the watch history
logging work correctly for this case.
In addition, package information should be added to the content value
because it should be not null in programs table.

BUG: 16177411
Change-Id: I058f9db927b5d684a1af7852630f50ec2d2743b6
ava/com/android/server/tv/TvInputManagerService.java
8ad7f2051d722b5a92f0ee0ab46622744b4289ef 04-Aug-2014 Calin Juravle <calin@google.com> Use native ISA for dex code (in case there's a NativeBridge)

In the presence of a native bridge it is more efficient to compile the
dex directly to the native ISA than to use the shared library ISA as a
reference.

This can be achieve by configuring the readonly system properties to map
between the .so ISA and the desired dex code .ISA (e.g.
ro.dalvik.vm.isa.ISA1=ISA2).

Bug: 16185267

(cherry picked from commit I50baa7b37e1465b9adf72d6f6b96f526a08d59c7)
(cherry picked from commit I8fe453a800812e382e8f41b5f7922997aa9c18a9)

Change-Id: I6c9684149691285310c961189b58af8c7f47aff4
ava/com/android/server/pm/PackageManagerService.java
81f6d857c1baef5e159bb34dad540baf77572782 09-Aug-2014 Adam Lesinski <adamlesinski@google.com> Merge "Second iteration of the UsageStats API" into lmp-dev
3516800b611a79339a3c188332d13a26e9086b09 22-Jul-2014 Adam Lesinski <adamlesinski@google.com> Second iteration of the UsageStats API

Based on feedback from API council, updated the API.
Also added support for querying the event log.

Change-Id: Ibaa008b9e5bd145acdfe8e20c25c2ed2d96be123
ava/com/android/server/am/ActivityManagerService.java
5008486b09c588bf3409b70d9ee29225e8593c64 07-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Content observer to handle TV Setting update

Replaced the API setOption with content observer to read/get informed of
the CEC settings.

Bug: 16855247

Change-Id: Ieff2399bbfe83f05af4448e7337f91ef40d1e24d
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
40bc0186d0f8945603760c606a6816f0d5ee6e28 08-Aug-2014 Amith Yamasani <yamasani@google.com> Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev
c2f20b66fd28c10e2ec8654bd74cb501eb7f837b 08-Aug-2014 Amith Yamasani <yamasani@google.com> No need to send PRE_BOOT_COMPLETED for new users

Since the primary purpose is to upgrade databases, no need
to send this broadcast. If system apps care to be informed early
on new user creation, USER_INITIALIZE is an early broadcast.

Also remove some logs that spew when switching users.

Bug: 16846465
Change-Id: Ibd7f8630ce1f41f8cadbda616de05844b127d1a8
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/wm/WindowState.java
ava/com/android/server/wm/WindowStateAnimator.java
5c8ea2c369deab75719fe7c7301846a8ef955702 08-Aug-2014 John Spurlock <jspurlock@google.com> Merge "New api to sync zen mode state from listeners." into lmp-dev
a3d98c2508ea14ef2c9a40f9617c9e29cd33a810 08-Aug-2014 Narayan Kamath <narayan@google.com> Merge "Reduce the frequency of calls to isDexOptNeededInternal." into lmp-dev
05e8f801b54d43ae43f86a310217ec6f931b5738 08-Aug-2014 Narayan Kamath <narayan@google.com> Reduce the frequency of calls to isDexOptNeededInternal.

The package manager maintains a set of dexopted instruction
sets as a fast path to avoid calling expensive code. We were
correctly adding elements to that list while performing dexopt,
but were *not* adding elements to the list when isDexOptNeededInternal
told us things were up to date. As a result, we'd hit the slow path
100% of the time on userdebug builds in the steady state, i.e, when
the system did not dexopt anything since boot.

With this change, we make sure isDexOptNeededInternal is called
precisely once per boot in such case.

This patch also fixes broken logic for apps that have multiple
code paths. We must mark the paths as dexopted only if we've
processed all paths.

bug: 16828525
bug: 16868741
Change-Id: Icb59121fe915d892e677d9b7e9a4efd11555ae27
ava/com/android/server/pm/PackageManagerService.java
c3093eb86bdc02ecf30c32693abafdaa01568a41 08-Aug-2014 Nicolas Prevot <nprevot@google.com> Merge "Making getProviderMimeType work across users." into lmp-dev
1dddc7fc790f14208516b4551ff12b2db8528864 07-Jul-2014 Nicolas Prevot <nprevot@google.com> Making getProviderMimeType work across users.

For apps with cross-user uri grants, but without INTERACT_ACROSS_USERS.

BUG: 16128346

Change-Id: I0136cd274eaf457804d196c09f746f66c1fe599f
ava/com/android/server/am/ActivityManagerService.java
6c0b9da65e36543bb50833d1b54ca532d0bd3aab 08-Aug-2014 Jeff Sharkey <jsharkey@android.com> Handle null IPackageDeleteObserver.

Bug: 16862614
Change-Id: I0c197a994b89d49123027f24fe46827c2b994ab6
ava/com/android/server/pm/PackageManagerService.java
faa4b3cb06f3b10ece1f1d246a3530fc2f30a6da 06-Aug-2014 Robin Lee <rgl@google.com> Disallow switching managed profile to foreground

Another check in the ActivityManager to stop us from getting into an
invalid state by a fat-fingered 'am switch' etc.

@bug 16814252

Change-Id: Id65ab647d5a535cc2f965139a1b717cf65aa7e69
ava/com/android/server/am/ActivityManagerService.java
7dea98f6f929cce598d669a802b13851987e2e64 07-Aug-2014 Yuncheol Heo <ycheo@google.com> Allow to use device's own physical address.

- Fixed JavaDoc.

Change-Id: I6fdbf6596b5f2e41a238b36e128ba0889725c813
ava/com/android/server/hdmi/HdmiCecMessageValidator.java
2849b7ccd1cf973f862dd9b95355afbc9ca9268b 07-Aug-2014 Yuncheol Heo <ycheo@google.com> Go to nap when receiving <Active Source> for the other devices.

- Previously, it went to sleep when it got <Active Source>, but this
causes the other side-effects like can't-wake-up when changing to HDMI
port directly.

Bug: 15578870
Change-Id: I0ca5bd2372c9e5e7446592d66483900eeba75500
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiControlService.java
df9f0a321e0cb2958c9d170395a0367a106fa0e6 06-Aug-2014 Terry Heo <terryheo@google.com> TIF: Add system API 'isSingleSessionActive()'

Bug: 16498558
Change-Id: I4f815f431051dbf786216d2b04e9737be451a508
ava/com/android/server/tv/TvInputManagerService.java
a25dc2bbe70b7449dc57e9619778ba592c198003 05-Aug-2014 Alex Light <allight@google.com> resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp

Change-Id: I1fe0e64d2069b7424014bd3ff0bf6f80b439220d
(cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)
ava/com/android/server/pm/Installer.java
ava/com/android/server/pm/PackageManagerService.java
fa387ad6cfa996d09050f8f6c39eaa0537893d20 05-Aug-2014 Craig Mautner <cmautner@google.com> Make next activity opaque when media stops

Call convertFromTranslucent on next activity when an activity below
it stops playing media.

Fixes bug 14469711.

Change-Id: I7e4346987cb620cb3a8c09096ff3a639cf344679
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
9a006258b5f0221323d7a4f0672b1604375119ba 08-Aug-2014 Craig Mautner <cmautner@google.com> Debug for 13924095.

Add logging for 13924095. All logging uses TAG "BadTokenDebug".

Change-Id: I3404e98d8c221cbd183845f479cf4074266b5cb2
ava/com/android/server/wm/WindowManagerService.java
7516ff90015ce71e5b95c889a2211153be30c39c 07-Aug-2014 Craig Mautner <cmautner@google.com> Keep app focus and input focus current

Change ag/422870 mistakenly set app focus to null in the
InputDispatcher. This change restores setting app focus correctly.

In addition, there were a few places where window focus
(i.e. mCurrentFocus) could be modified without notifying the
InputDispatcher. This change fixes those locations.

Should fix 14564396.

Change-Id: Ie24f3410fdd1f5f1eefbce02759fef4149e59620
ava/com/android/server/wm/WindowManagerService.java
b46dea562c15d460fb1408ab34fe3eda319ddfbc 08-Aug-2014 Michael Lentine <mlentine@google.com> Merge "New screen shut down animation." into lmp-dev
0839adb25c6d1a9f4e06fc5a098ffd03c67dbe99 30-Jul-2014 Michael Lentine <mlentine@google.com> New screen shut down animation.

Bug: 16845774

Change-Id: I355f8d73f54a873f6df180dc48c177b993f170f9
ava/com/android/server/display/ColorFade.java
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/display/DisplayPowerState.java
ava/com/android/server/display/ElectronBeam.java
f06009542390472872da986486d385001e91a2a7 08-Aug-2014 Jeff Sharkey <jsharkey@android.com> Logic to confirm uninstalls.

Prompt user for confirmation when caller doesn't have DELETE_PACKAGES
permission. Also extend uninstall events to return failure codes.

Bug: 16515814
Change-Id: I15b52190ff02dbeaaf038b92364264f64c57ba89
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
410ca9c7a4a2d69af5c81e76320433bfda05cafe 07-Aug-2014 Jungshik Jang <jayjang@google.com> Implement PowerStatusMonitorAction.

After this change, need to add an api which reports
power status change to other component like TIF.

Bug: 16445063
Change-Id: I5a347057af6140ece82acb5d15e3a8b3779b18be
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiUtils.java
ava/com/android/server/hdmi/PowerStatusMonitorAction.java
7328a1b39b3dae1c0cd390c0a3695c6a46b8e9d8 07-Aug-2014 Jeff Sharkey <jsharkey@android.com> Logic to confirm permissions on install sessions.

When an app without INSTALL permission attempts to commit a session,
we involve user to confirm permissions. We currently point at the
base APK, which defines all permissions for an app, handling the case
where a session may only be adding splits.

Add failure codes to represent rejection. Fix bug by ignoring stages
during initial boot scan.

Bug: 16515814
Change-Id: I702bb72445216817bcc62b79c83980c1c2bb0120
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
bf4eed772a35a8ae6ddac1b8f6dc0744756c7c75 07-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> First pass of changing statusbar connectedness

Switching from GCM-only inet condition reports to using our network
validation (captive portal check).

Note that currently the GCM signal is disconnected. Next step is to
make the bad-network report API trigger a re-evaluation of the network
and get negative reports from the NetworkMonitor.

Change-Id: Ie2ebab1e5c04775e3c4d6738f656a6c8157dba76
ava/com/android/server/ConnectivityService.java
d224a9dfd2d2f1977e7a40ba3bbfb42a4165aedc 08-Aug-2014 Prashant Malani <pmalani@google.com> am 639421cb: am fed4a556: Merge "Move wakelock release to handleMessage" into klp-modular-dev

* commit '639421cbd9780b9093bdf3415a79489c118ecb92':
Move wakelock release to handleMessage
639421cbd9780b9093bdf3415a79489c118ecb92 08-Aug-2014 Prashant Malani <pmalani@google.com> am fed4a556: Merge "Move wakelock release to handleMessage" into klp-modular-dev

* commit 'fed4a5565b9318fa1132003ad3599fa42bbefdf0':
Move wakelock release to handleMessage
546c635ad9a26421fbdf54efa765b5ab0a63c191 07-Aug-2014 Jae Seo <jaeseo@google.com> TIF: Change CEC specific names to more general ones

Now MHL device information is also a part of HdmiDeviceInfo (previously
HdmiCecDeviceInfo). This change adjusts method/variable names across our code
base to reflect that.

Bug: 16215362
Change-Id: I7a6692329f39842a4aec9a4ff036eca5474cfd33
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
7450614a496d0b6a5836703c1145e9bcd4f104e9 07-Aug-2014 Prashant Malani <pmalani@google.com> Move wakelock release to handleMessage

There were certain code paths in handleDockStateChange() that were
exiting without releasing the wakelock. So we move the release to the
calling function to prevent stray held wakelocks.

Bug: 16841895

Change-Id: I8ae4d2ab8f775c42a893d3bcdef34321c5f631a6
Signed-off-by: Prashant Malani <pmalani@google.com>
ava/com/android/server/DockObserver.java
6720be4e8c65e90d4453ddad5cef192bc3820038 30-Jul-2014 Michael Wright <michaelwr@google.com> Allow media projections to create public presentations.

Change-Id: I3b6e0b54d658352942a38be6a24486bdfc179efd
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/VirtualDisplayAdapter.java
ava/com/android/server/media/projection/MediaProjectionManagerService.java
0068d3dcf1f1a804554a1a09e3b173ac12651786 07-Aug-2014 Dianne Hackborn <hackbod@google.com> Fix issue @16555033: Battery history overflowing too much

- No longer track process starts/stops normally.
- Increase buffer size to 256KB.
- Buffer size increase requires reworking how battery stats
are retrieved, since it is going to be hitting IPC limits.
- Also, store the last full stats after a reset, to be reported
at the next checkin.
- Also, discharge and charge times are tagged with the screen
and battery save state during that time.

Change-Id: Ie108ac9b626846108a9bb858101ac2b93276ac16
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BatteryStatsService.java
ec396d6399c5c31d697d81e94aff459e9771b0c6 07-Aug-2014 Winson Chung <winsonc@google.com> Initial changes to add task affiliation styling. (Bug 16656169)

- Fixing issue with launch-in-background animation
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/TaskRecord.java
579befecb248162021929ab58ffd23f1724cc6be 07-Aug-2014 Jae Seo <jaeseo@google.com> TIF: Do not log non-searchable channel watch history

Bug: 16798476
Change-Id: Ic131009ad65a661331e4f8f0820c5c183a9f4986
ava/com/android/server/tv/TvInputManagerService.java
3c9a3501651aa8ad4f289e89119a6c0b4bdaf78a 06-Aug-2014 Adrian Roos <roosa@google.com> Pass initiatedByUser to TrustListeners

Bug: 16840500
Change-Id: I8d9bd8fe9a305066f33ac5c888d8a41ce219a6f1
ava/com/android/server/trust/TrustAgentWrapper.java
ava/com/android/server/trust/TrustManagerService.java
2e7cf64842aadcf198ee97d137ccbb02ee2115fd 07-Aug-2014 Robin Lee <rgl@google.com> Merge "Permit crash report button for user profiles" into lmp-dev
cead2839a5ed586e18299b84c4c93f095b8498b7 05-Aug-2014 Robin Lee <rgl@google.com> Permit crash report button for user profiles

Loosens the restriction for reporting an issue with an app from "same
profile" to "same user".

Fixes bug 16792315.

Change-Id: I25100a3f7030b2a74e9fe40894103677e8db6cdd
ava/com/android/server/am/ActivityManagerService.java
956afc2ba79f50bb8025c6d334653e3c3419b480 26-Jul-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Handle setMainSession for TV input wrapper services

Bug: 15994065
Change-Id: I46b3c0a89be92036f2c3849a412075caf587ec5c
ava/com/android/server/tv/TvInputManagerService.java
7bbf9e720d12c06c46c468f18848b37d61bcaf28 07-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Use message validator for sending message." into lmp-dev
5f75cbd8593e83eaf17cfac07186a3b6a7b7b1f1 06-Aug-2014 Jungshik Jang <jayjang@google.com> Use message validator for sending message.

Change-Id: I2ff82c5596e8c78c24189199ede66ee9905b95f5
ava/com/android/server/hdmi/HdmiCecMessage.java
ava/com/android/server/hdmi/HdmiControlService.java
14b7c54eeae4285f3c5084787c0607dd3103f20c 07-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Rename FeatureAction into HdmiCecFeatureAction" into lmp-dev
b509c2ecd99619248b7a07fb0fa978bb27f25cc3 07-Aug-2014 Jungshik Jang <jayjang@google.com> Rename FeatureAction into HdmiCecFeatureAction

Change-Id: I92ca11e513f8cf520e84399fe688397f2d9f714a
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/DevicePowerStatusAction.java
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecFeatureAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/OneTouchPlayAction.java
ava/com/android/server/hdmi/OneTouchRecordAction.java
ava/com/android/server/hdmi/RequestArcAction.java
ava/com/android/server/hdmi/RoutingControlAction.java
ava/com/android/server/hdmi/SendKeyAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
ava/com/android/server/hdmi/SystemAudioStatusAction.java
ava/com/android/server/hdmi/TimerRecordingAction.java
ava/com/android/server/hdmi/VolumeControlAction.java
be0c4175398ff5d7e13209e833b3037cdd0207d7 07-Aug-2014 Matthew Williams <mjwilliams@google.com> JobScheduler idle mode not being properly triggered

Issue with how the pending intent was being created -
the component name being explicitly set on the intent somehow
caused the intent to not be delivered.
Fix: no longer set the component name on the intent.
BUG: 16798118

Change-Id: I86b08b2a47067dc9b8da8b85450bc338e0826aca
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/controllers/IdleController.java
9b5bd967e4c90e424eba36feccdbde71fdee1743 07-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Rename HdmiCecDeviceInfo into HdmiDeviceInfo." into lmp-dev
eec75412a971a5ccb769364120c769c331946eb3 04-Aug-2014 Paul Jensen <pauljensen@google.com> Stop ConnectivityService from talking to netd about uncreated networks.

This avoids logged netd errors that are red-herrings.

bug:16667349
Change-Id: I5d6f1681f1d38dab0af4c535573a0c45c0216603
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
61f4fbd2e8436a1ecd478c2a1f516d064a24d43b 06-Aug-2014 Jungshik Jang <jayjang@google.com> Rename HdmiCecDeviceInfo into HdmiDeviceInfo.

In order to include mhl device info to device info,
rename HdmiCecDeviceInfo into HdmiDeviceInfo.

BUG: 16215362

Change-Id: I30fb0216061fbbdd6fdc1b82c63af83f1b678597
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageValidator.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiUtils.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/RequestArcAction.java
ava/com/android/server/hdmi/RoutingControlAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/SystemAudioActionFromAvr.java
ava/com/android/server/hdmi/SystemAudioActionFromTv.java
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
8043df68bff0b6e1240b571cffa7f9d9155e2281 07-Aug-2014 Paul Jensen <pauljensen@google.com> Merge "Flush DNS cache when routes change." into lmp-dev
5fb2c6ffe75d4089ec57ae42f2e5c7423c648dec 06-Aug-2014 Paul Jensen <pauljensen@google.com> Flush DNS cache when routes change.

We used to do this but the change got lost in the NetworkAgent
upgrade. This brings it back. ConnectivityService has netd do
the actual flushing.

bug:16549455
Change-Id: I11ddd55fcb9d1ed1d2c6a9be7eb8c57e41bdbdb8
ava/com/android/server/ConnectivityService.java
b69a3a8eaade042aa5b4d17f9b0dfd565c2e4a97 06-Aug-2014 Paul Jensen <pauljensen@google.com> Revert DNS cache flush command deletion from "Cleanup: Delete dead code."

This reverts part of commit 7a161c535104555890fa78b99faf1f414fc03e85.
The DNS cache flushing code needs to be called when routes change.

Change-Id: I20d39eabfa088deeeeeff0c3292b1910fd948b0d
bug:16549455
ava/com/android/server/NetworkManagementService.java
306f1a45c636e3721ae4b84b8797e6349ae6ff57 04-Aug-2014 Paul Jensen <pauljensen@google.com> Add back in ACTION_NETWORK_CONDITIONS_MEASURED broadcast.

This broadcast used to be sent out by the now defunct CaptivePortalTracker.
Begin sending it out again from the NetworkMonitor who now tests for
captive portals.

Change-Id: Ia33beb04e78cfc4fc042c3b999a3d4e2f9ba4c96
ava/com/android/server/connectivity/NetworkMonitor.java
e547ff281020b08eb51ef7b2786831f7aacdd73c 04-Aug-2014 Paul Jensen <pauljensen@google.com> Use OkHTTP instead of my home-made HTTP, for network validation.

The home-made version was only done because there was no previous way to
perform network-specific HTTP. The home-made version has already shown
incompatibility, see linked bug.

bug:16316314
Change-Id: Ic9e50174552d1466eb1ff59ff9d28e18035cc3e0
ava/com/android/server/connectivity/NetworkMonitor.java
6ac5db5777598b174cc815547ae3ef4e3c405676 07-Aug-2014 Paul Jensen <pauljensen@google.com> Merge "Revert DNS cache flush command deletion from "Cleanup: Delete dead code."" into lmp-dev
0a9aae3e29d0760b35eb6de9c5be6515612df879 07-Aug-2014 Paul Jensen <pauljensen@google.com> Merge "Add back in ACTION_NETWORK_CONDITIONS_MEASURED broadcast." into lmp-dev
ab14df37ab9fcc63affb877833ee7869e1450bb2 04-Aug-2014 Paul Jensen <pauljensen@google.com> Remove dead CaptivePortalTracker.

Captive portals are now detected by the NetworkMonitor.

Change-Id: Ibfb04bf83b1028231397a577468f110d7ab1dc06
ava/com/android/server/ConnectivityService.java
e6499b79216ec70014237ee782300e0e60027831 07-Aug-2014 Paul Jensen <pauljensen@google.com> Merge "Use OkHTTP instead of my home-made HTTP, for network validation." into lmp-dev
58956a556924d5fda091edddc3117708ba925b18 07-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Hide CEC devices behind non-CEC switch" into lmp-dev
4fdd0f47bc10bdbc429c6316c2cc98a747570b12 06-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Hide CEC devices behind non-CEC switch

CEC devices connected to a non-CEC switch are not under full control
of TV. Will be filtered out from the list of devices provided to TIF.

Bug: 16797838
Change-Id: I8f8ff3a33ddeeb0a2877ca0e596a24096e648879
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiConfig.java
fbd0e9fa37fc17ccd25e4c1f16195bbd27de3c4c 07-Aug-2014 Jeff Sharkey <jsharkey@android.com> Surface user action events when un/installing.

This will be used shortly to connect up with permissions
confirmation UI.

Bug: 16515814
Change-Id: If28cecc28549900d960ac107a1fba0b10ce5bd7b
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
8e93c84739902f5adaa499b474f39e3c4807bc1c 06-Aug-2014 Jungshik Jang <jayjang@google.com> Prevent hot plug detection action from multiple device polling

Along with this removed unused code and wrong references in
java doc.

Change-Id: I8b2fd8065f582f60cde5ada0e1669515b6a60f3f
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/DevicePowerStatusAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessage.java
ava/com/android/server/hdmi/HdmiCecMessageValidator.java
ava/com/android/server/hdmi/HdmiConfig.java
ava/com/android/server/hdmi/OneTouchPlayAction.java
ava/com/android/server/hdmi/UnmodifiableSparseArray.java
6429f313b4248a010bb197993bbdb16629459d69 05-Aug-2014 Andres Morales <anmorales@google.com> Allow PersistentDataBlockService to be used with all users

Bug: 16795591
Change-Id: Id5e5dc5c26408752fe85f6f6fc2c67d9408b6a2a
ava/com/android/server/PersistentDataBlockService.java
4cf9f007e6b66c0a970600f66b4229c4ede73f7f 06-Aug-2014 Christopher Tate <ctate@google.com> Add event logs for full backup/restore milestones

Bug 16689703

Change-Id: If870f1b7b9cb3929ac1edc38affc688a37c2acfd
ava/com/android/server/EventLogTags.logtags
e41ce995a0c2c6b167ed64b51e34865c5d58ea4d 29-Jul-2014 Alexandra Gherghina <alexgherghina@google.com> Add hidden API for removing cross-profile package filters

Bug: 16646591
Change-Id: Iaf6837fe4390ac1018c49df366ea434776ed7244
ava/com/android/server/pm/PackageManagerService.java
ff40ed3f8cdb9eab1e6ba97a157f431c2d759d41 06-Aug-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Fix resetAllModes call to act only on the calling user" into lmp-dev
41da5ff98f68a575fc46085e8714c8a3e5e5c17a 05-Aug-2014 Daniel Sandler <dsandler@android.com> Debugging bad notification sorts.

Bug: 16626175
Change-Id: I6cc7ee5f853c846e3aed6f9750e8fb6bc5aed699
ava/com/android/server/notification/NotificationManagerService.java
ff04ae757a5542d2d5633e75b7adacc4fce1ce7e 02-Jul-2014 Youngsang Cho <youngsang@google.com> Add a method in TIS to relayout SurfaceView

Bug: 15389458
Change-Id: I7f740141e7cf59fea5d321099652e65bc9e5f7d1
ava/com/android/server/tv/TvInputManagerService.java
d57ba99a5a50346f6d16208780bb87e1f09a9a35 06-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "More tweaks for recording" into lmp-dev
e9e0f070e34a612fb3bab5d97bdec1e266da4a20 05-Aug-2014 Jungshik Jang <jayjang@google.com> More tweaks for recording

1. Mask TimerClearedStatus message result.
2. Use proper mask for media info.

Change-Id: I7ed6f6839c333460a7bef5e5a84af2a9a34c6d97
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
3f145a2f958320766ae9240c7a57debc20d578aa 23-Jul-2014 Michael Wright <michaelwr@google.com> Add supported refresh rate to displays

Change-Id: I51231dd6dd231d57dd1ac499349d6335121f07d5
ava/com/android/server/display/DisplayDevice.java
ava/com/android/server/display/DisplayDeviceInfo.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/LocalDisplayAdapter.java
ava/com/android/server/display/LogicalDisplay.java
ava/com/android/server/wm/WindowManagerService.java
06c41a3e7ffd26894b6df3a0e4bfcfa47c48c739 04-Aug-2014 Wonsik Kim <wonsik@google.com> TIF: TvInputHardwareManager to listen to audio port changes

Bug: 16758816
Change-Id: I0c7ace661de1911a53f57e22898eccd7cca7a07d
ava/com/android/server/tv/TvInputHardwareManager.java
cdcd487abad10f728f0542accc42a31d1f7fedac 06-Aug-2014 Winson Chung <winsonc@google.com> Fixing issue where home was triggered on top of other activities being launched. (Bug 16823617)

- Also fixes issue with the Recents hide message being clobbered
ava/com/android/server/statusbar/StatusBarManagerService.java
db54e3c6c8943c55f352c123b527d990b2570a5d 06-Aug-2014 David Christie <dnchrist@google.com> Merge "Fix issue where FlpHardwareProvider can crash if GmsCore re-registers a sink." into lmp-dev
daf35c31363fd9cf43aa9e556d1257bd3c3b7a22 05-Aug-2014 David Christie <dnchrist@google.com> Fix issue where FlpHardwareProvider can crash if GmsCore re-registers a sink.

Change-Id: If6f4e9bc3c5be6ca537de2dae1fddd6351350e9e
ava/com/android/server/location/FlpHardwareProvider.java
f174c6e6de6ba863179401aa7b3d55d91ceed707 05-Aug-2014 Jeff Sharkey <jsharkey@android.com> Stronger constraints around install session IDs.

Generate positive, non-zero session IDs, and don't recycle them
within a given boot. Guard against ID starvation by crazy apps.

Bug: 16792837
Change-Id: I6035afe4d942d358b5ca12b4f818c55885b74aba
ava/com/android/server/pm/PackageInstallerService.java
504d78ea10b04baee2a1a65707dc7003c94d1ee4 26-Jun-2014 Nicolas Prevot <nprevot@google.com> Security fixes related to cross-user content.

Enforcing that only uri grants work across users (not permissions).
Fixing a security hole where malicious Apps could access a uri if they had uri grants to the same uri on another user.
Enforcing that userIds in uris, if they exist, are the one of the ContentProvider.

BUG: 16779492

Change-Id: Iaa5264bd6c3aa0e15be3a4a64f9dc88238e0cb2e
ava/com/android/server/am/ActivityManagerService.java
106c16fbd9601ba23eea9b0f13c8f00933f67ee6 05-Aug-2014 Justin Koh <justinkoh@google.com> Merge "Allow listeners to see children" into lmp-dev
8d11a5aa2d42416d580dcf7318200be8b8681dec 05-Aug-2014 Justin Koh <justinkoh@google.com> Allow listeners to see children

Allow listeners to see notification children. Since L is not baked yet, keeping
this version check makes it difficult to test apps.

Bug: 16733244
Change-Id: I70afd6b99fc18c1f0b9188279c04fab80c37d414
ava/com/android/server/notification/NotificationManagerService.java
faa49bc896be859d5bcf2da3bddd4507b5e6494c 05-Aug-2014 Jungshik Jang <jayjang@google.com> Fix bugs on timer recording action.

1. Apply masking to feature abort of SetXXXTimer
2. Announce error when failed to send SetXXXTimer.
3. Remove TimerRecordingAction when deivce is disabled.
4. Report clear timer record error thru onClearTimerRecordingResult.

Change-Id: Id243aa25481dad57509b4229ca214fa9b6b00fdc
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/TimerRecordingAction.java
4f9e21ee32fa542d654df01953168059400fb3a8 05-Aug-2014 Jungshik Jang <jayjang@google.com> Merge "Implement clear timer." into lmp-dev
e5a9337ebe738633cf7b66141cdf76efcdc5754c 25-Jul-2014 Jungshik Jang <jayjang@google.com> Implement clear timer.

This change implements clear timer, which sends
<Clear xxx Timer> to recorder, and reponse of it,
<Timer Cleared Status>.
Along with it, add result parser for [Timer Status Data].

Bug: 16160962

Change-Id: I1f48ec055aa93dc836156525de8b7ef921aad8b5
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/TimerRecordingAction.java
e377ea5de67aaca36c86ac8971ce0a9126c5af20 06-Aug-2014 Dongwon Kang <dwkang@google.com> Merge "TIF: Rearchitecting TvInputPassthroughWrapperService." into lmp-dev
0081e911a2aac5f2846e23a3b9572f60c013f17c 05-Aug-2014 Tadashi G. Takaoka <takaoka@google.com> Merge "Fix unnecessarily non-static inner class to static inner" into lmp-dev
8c6d477d30e64f3dfae20250b8274ffb37ef7bfa 05-Aug-2014 Tadashi G. Takaoka <takaoka@google.com> Fix unnecessarily non-static inner class to static inner

Change-Id: I0c8efda6ef0bede6b5871cd651f42db82dbfbd39
ava/com/android/server/InputMethodManagerService.java
ee3166e0d58855b8c04b6d050c707487020c2f12 05-Aug-2014 Wonsik Kim <wonsik@google.com> Merge "TIF: implement setVolume for hardware inputs" into lmp-dev
fc44e4e03c5f6486efb7457965dcf7eaf36bc971 04-Aug-2014 Yuncheol Heo <ycheo@google.com> Let STB oneTouchPlay on SCREEN_ON event.

- Eleborate the reason code to initiate the initialization.

Bug: 16668375
Change-Id: I4ce657a9438e4f7baa7df2eaa102eb1ce1a7bccb
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
8e45a33ca8cb6b6a0cf75edf52ffdf86ffe3dd31 04-Aug-2014 Wonsik Kim <wonsik@google.com> TIF: implement setVolume for hardware inputs

Bug: 16635576
Change-Id: Ibba9f32b22451d9792b5e74c2cf36cab356e4ab1
ava/com/android/server/tv/TvInputHardwareManager.java
b82de3600f15edbff693d1362bf33140c2aabd33 05-Aug-2014 Wonsik Kim <wonsik@google.com> TIF: fix JTvInputHal::removeStream issue

Bug: 16803334
Change-Id: I3f92a12479cdded7a3bf572cc59e68367a0797ad
ni/com_android_server_tv_TvInputHal.cpp
e069779dea07c77fb858a403c42020e39b3d9c60 04-Aug-2014 Jason Monk <jmonk@google.com> When exiting lock task require authentication

When exiting lock task with screen locking on make sure to notify
that the credentials need to be entered again.

Bug: 16496374
Change-Id: I891a8a8a04a67aa70eba8ea78bd585ad0dd17808
ava/com/android/server/am/ActivityStackSupervisor.java
acf93fefb19eac358fbd37784773603f78d2291f 06-Aug-2014 Craig Mautner <cmautner@google.com> Merge "Don't dismiss boot messages before keyguard is ready" into lmp-dev
a631d49e0516632110aa26b37e61a710d6e91f18 06-Aug-2014 Craig Mautner <cmautner@google.com> Don't dismiss boot messages before keyguard is ready

Or you will expose the home screen.

Fixes bug 16371571.

Change-Id: Ib38a583189c570b44910548a9544b1e81c831119
ava/com/android/server/wm/WindowManagerService.java
f17e498fea935a389d88193dde2d236ea674d10b 06-Aug-2014 Amith Yamasani <yamasani@google.com> Merge "Allow phone UID to export singleton providers" into lmp-dev
41c1ded7f042a4cf303479550b38fa66d7a18906 05-Aug-2014 Amith Yamasani <yamasani@google.com> Allow phone UID to export singleton providers

Also add a user variant of replacePreferredActivity for use
by SmsApplication.

Map user restrictions for SMS/MMS to AppOps perms.

Bug: 16681533
Change-Id: I3dfed5fc754e33bb51c6f571851653a7c2770e46
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/PackageManagerService.java
d6a98979b5d45fff1fa842932274517e999a59c2 04-Aug-2014 Alexandra Gherghina <alexgherghina@google.com> Fix resetAllModes call to act only on the calling user

This makes it consistent with other methods in different services.
Also fixes the Settigns bug referenced below.

Bug: 16727586
Change-Id: I0b8bcb248f621fcfa2cb12163caeec9eb8ff5b1c
ava/com/android/server/AppOpsService.java
dfab517fb245af7445255d298a05a2c8049b23ab 06-Aug-2014 Jae Seo <jaeseo@google.com> Merge "TIF: Make selected tracks identifiable" into lmp-dev
10d285ac06b3d3060c7d90d3dc196d4ac8367467 31-Jul-2014 Jae Seo <jaeseo@google.com> TIF: Make selected tracks identifiable

A recent change on the multi-track API surfaced an issue that it's hard to
identify selected tracks from the list of tracks obtained from
TvView.getTracks() method, especially when two or more tracks convey the same
track information (e.g. two English stereo audio tracks with the same sample
rate). This change introduced a new public method getId() in TvTrackInfo that
returns an ID with which one can identify the tracks uniquely. It also led to
minor signature changes across the multi-track API to make it more
developer-friendly in both application and TV input service developers'
perspectives.

Change-Id: I226f75e697b0ce52b44db7471660f6d9f646f6f9
ava/com/android/server/tv/TvInputManagerService.java
75847b98f39e521a57042c50e69be9e142788d32 29-Jul-2014 RoboErik <epastern@google.com> Add display metadata and change strings to CharSequences

This adds some fields for display purposes to MediaMetadata and also
makes the default for all text CharSequence instead of String. Also
adds a hidden method for getting a Description for the metadata.

bug: 11708293
Change-Id: I0ed58d9ac3aeff41325c4ccf5fed0539bbf03b4d
ava/com/android/server/media/MediaSessionRecord.java
01e840ff9441e005153d799e71d65b38bcb21902 27-Jun-2014 Michael Wright <michaelwr@google.com> Add resize method for virtual displays

Change-Id: I2632fc56c2d2cba356379e42f5c1a3e283b11d1e
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/VirtualDisplayAdapter.java
30c74d9ba60a7208a587ecd6dcdfef1cfbd7fce7 05-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Make port info unmodifiable

Puts HDMI port information behind unmodifiable type. This helps API make use
of port-related information without having to switch to service thread.
See getActiveSource().

Added the unmodifiable version of SparseArray/SparseIntArray.

Change-Id: Idcf05d1d6e19b47c91a7e89a920abccc607a3eb5
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/UnmodifiableSparseArray.java
ava/com/android/server/hdmi/UnmodifiableSparseIntArray.java
58500f43ecbed3f92d7c077fb6ce396252cd00ea 04-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Make deviceSelect to active device a no-op

Changing input to already the active source should return
immediately without initiating routing control. This is also required
for processing the incoming <Active Source>

Also set the flag in intent for input change to start a new
activity from a service. The service fails to launch an activity
without it.

Bug: 15570939
Change-Id: I9b20b31137dfa4dc847bc43cc7fd35e669d0dec7
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/tv/TvInputHardwareManager.java
43cc8bbbbd5e6418cdfa0fa4b26c9f5c3a28c029 28-Jul-2014 Jon Eklund <jeklund@motorola.com> Add support for line out audio device

Change-Id: I48750511b56a2bc5f06b7bdd11cfb4e0cd2728af
ava/com/android/server/WiredAccessoryManager.java
ava/com/android/server/input/InputManagerService.java
6ac5f8df62a4b6d87cf32797d2886efab8e28226 18-Jul-2014 John Spurlock <jspurlock@google.com> Allow user-prioritized packages through in priority mode.

Bug:16396715
Change-Id: I115d717e5c25500407d4f7876f070a1497fb2887
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/PackagePriorityExtractor.java
ava/com/android/server/notification/ZenLog.java
ava/com/android/server/notification/ZenModeHelper.java
6aae6528a6672497b1d1dffb5c083093d5c46dc8 05-Aug-2014 Yuncheol Heo <ycheo@google.com> Refactor <Feature Abort> logic to concentrate it in one place.

- Don't reply from the unregistered address.
- Use "unrecognized opcode" as the default reason.

Bug: 16799466, Bug: 16798785
Change-Id: I7c2ece6436f7ebd59986d2baf4f45cd86e6622d9
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecStandbyModeHandler.java
ava/com/android/server/hdmi/HdmiControlService.java
bd2fa2c02d916a9b6c62f8fd8701d779c00bd68d 25-Jul-2014 Dongwon Kang <dwkang@google.com> TIF: Rearchitecting TvInputPassthroughWrapperService.

This change addresses the following issues raised in the API review:

TvInputPassthroughWrapperService needs to be rearchitected:
-- Create a nested class (possibly called RemoteTvInput) inside TvInputService that
represents remote connection to the underlying physical TV input (HDMI).
RemoteTvInput which will need to have additional method like createRemoteSession.
-- This class has methods to control that remote input, and a callback so TvInputService
to observe state changes.
-- Add TvInputService.onGetParentInputId() (no argument) which returns null by default.
-- Extend TvInputService.onCreateSession(String inputId, RemoteTvInput parent) to pass
in the RemoteTvInput requested by onGetParentInputId(), if any.

Bug: 16542165
Change-Id: Ic6b0c9b5d770c9d1f9377061af8dcb6bae0cb9dc
ava/com/android/server/tv/TvInputManagerService.java
d8afe3c41e65a8f6ff4283c124ba250c92cf50c6 01-Aug-2014 John Spurlock <jspurlock@google.com> New api to sync zen mode state from listeners.

- Allow connected listeners to request changes
to the primary device's interruption level.
- Rename alerts -> effects in the other constant,
which does not affect interruption level.
- Rename "flags" -> "hints"
- Basic NoMan wiring for level hint.

Bug:15888672
Change-Id: I2b07fb2c9d32a143fff7c260b7d2cd4d0cd3a592
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenModeHelper.java
1bb480a3a4ce2ce63c5d09fa7f5cc38ec160ebf4 02-Aug-2014 John Spurlock <jspurlock@google.com> Battery saver: new policy changes + SystemUI tweaks.

- Service policy changes: allow the user to turn off (snooze)
saver mode below the auto-trigger level. Plugging in the
device always exits saver mode.
- Default trigger level is now 0 (never) instead of 15.
- SystemUI now also listens to a new POWER_SAVE_MODE_CHANGING,
since waiting for _CHANGED can take seconds.
- Move shared feature description text into the framework so it
can be shared.
- Tweak dialog title + action strings.
- Remove trigger-level from SystemUI, it no longer needs it.
- Add the ability to turn off saver mode directly from the
notification.
- Migrate saver confirmation dialog to common system UI dialog
helper, and add a few convenience methods.
- Fix bug where the status bar area would be orange over the keyguard
in SHADE_LOCKED mode.

Bug:16214395
Change-Id: I3d1ded1eec9e63e7d97469486f6a320e1bebbccd
ava/com/android/server/power/PowerManagerService.java
83f0f755b04075f6f342d2ae1eeef192ebecdcb3 02-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Add Logging around getNetworkInfo.

bug:16610051
Change-Id: I04f19efc99bce6d990364291b6cd8105f08ab263
ava/com/android/server/ConnectivityService.java
a793a671976eab3f7199e00e2fa0affb2cf5bc56 31-Jul-2014 Lorenzo Colitti <lorenzo@google.com> Improve LegacyTypeTracker.

Keep track of requests as well as of networks that come and go.
This is necessary, for example, to ensure that we pretend that
HIPRI has gone down when the HIPRI request goes away, even
though the underlying cell network is actually completely
unaffected.

Also, ensure that when switching default networks we send
disconnect broadcasts (and do so *before* connect broadcasts, to
maintain the illusion).

Bug: 16610051
Change-Id: Ib3c831387124940156df05b312cc36bc0724373e
ava/com/android/server/ConnectivityService.java
0e32f6bde4872126fa7b1ecddee414a26f506f36 04-Aug-2014 Tom Taylor <tomtaylor@google.com> Merge "Allow MmsConfig override per request (1/3)" into lmp-dev
63c00c4379ba4ac0f50161980b67c8acc2548f7b 01-Aug-2014 Ye Wen <ywen@google.com> Allow MmsConfig override per request (1/3)

Instead of providing ways to override MmsConfig globally, this allows
the override per request, which is safer. Also added subId to the getter
of MessagingConfigurationManager.

b/16681649

Change-Id: Ia5ee391e2fa51fbdf87d111174d8df21f5f5e41f
ava/com/android/server/MmsServiceBroker.java
a4215ceb86fbae3bcb40c4bd3b924e2b71cf50b6 04-Aug-2014 John Spurlock <jspurlock@google.com> Doze: Add a user opt-out setting.

When devices are configured with a doze component, the user
now has the option of disabling doze mode with a secure setting.

Bug:16703536
Change-Id: Ieab6ee8d2acf54580b86fb16e9d77b52080fb3b1
ava/com/android/server/dreams/DreamManagerService.java
6d13bc8e3b1cf0dac56590a0a76e9da4a1ecab75 01-Aug-2014 Wink Saville <wink@google.com> Turn off extra debugging

Change-Id: I3d7c68d3d7bcef5be084398807389f4a485bedb0
ava/com/android/server/TelephonyRegistry.java
cc9537ce558de42577feebeb91a8cc72e102ae2e 04-Aug-2014 Craig Mautner <cmautner@google.com> Call method while holding lock.

The method removeRecentTasksForUser() was being called without the
ActivityManagerService lock held. This change calles it while the
lock is held and renames it to indicate that it should be called
while holding the lock.

Fixes bug 16775111.

Change-Id: I002f9f96d407de458934da8bc728acd54f0c398c
ava/com/android/server/am/ActivityManagerService.java
cb566aab57cafb69c628809fc0a0ffa2151c7d6e 04-Aug-2014 John Spurlock <jspurlock@google.com> Doze: Follow the notification light.

- Send the notification light info up to SystemUI from NoMan.
- Doze mode will now periodically pulse the display (once)
if the notification light is active.
- Change "tease" terminology to "pulse", which is the singular.
Maintain the multi-pulse on buzz-beep-blink for now as extra
emphasis.
- Scrim controller now always takes number of pulses as an arg,
to support a single pulse (used for notification light, and
eventually pickup once available).
- Dial down the display brightness when pulsing.

Bug:15863249
Change-Id: Ifb208a27e82b66cff1d0c04e5b7f758098ea29cf
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerInternal.java
ava/com/android/server/statusbar/StatusBarManagerService.java
273f246c27dc0a2522eb90eb8256d13a9228c64d 04-Aug-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Fix notification sqlite log schema" into lmp-dev
1ad856e17f988482bbf37fc5b94cd55baee464ae 04-Aug-2014 Christoph Studer <chstuder@google.com> NoMan: Fix notification sqlite log schema

The 'log' table creation SQLite code had syntax errors
and left the table in a weird state.

This CL fixes the creation syntax and drops old tables
since they might be in an inconsistent state.

Bug: 16726344
Change-Id: I241d08c9e30cedf27ca37bfaf349975077de222d
ava/com/android/server/notification/NotificationUsageStats.java
e5aa75cabfb6bb4877e1bb20cb0dfe511002c3a4 04-Aug-2014 Yuncheol Heo <ycheo@google.com> Merge "Add the CEC message handler for the standby mode." into lmp-dev
25c20298ad04e0e591e0cfdc0bb9d01a985433ab 31-Jul-2014 Yuncheol Heo <ycheo@google.com> Add the CEC message handler for the standby mode.

- Associate the state of AutoWakeUp with the pref value.

Bug: 16661406
Change-Id: I1299c6ca287aac4127e397a08b5af00190aa5b0b
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecStandbyModeHandler.java
ava/com/android/server/hdmi/HdmiControlService.java
8d70ad22a5c821a02685704a3db18ddb7ad07f22 04-Aug-2014 Tadashi G. Takaoka <takaoka@google.com> Merge "Fix input method picker using Material design language" into lmp-dev
d130b803b0787131208bea99926dc655b124f006 01-Aug-2014 Tadashi G. Takaoka <takaoka@google.com> Fix input method picker using Material design language

Note that the button text color will be fixed in the future change.

Bug: 14860252
Change-Id: I8a6a4a7efce50bfaec114117e33f97f27b1ef950
ava/com/android/server/InputMethodManagerService.java
ca17a9029dd7b1b87c155e68476eae5ee4efbede 31-Jul-2014 Wonsik Kim <wonsik@google.com> TIF: allow TIS to override default sink from audio policy

Bug: 16635576
Change-Id: I995cfca084950f96675aeb086c5055f76d1c4752
ava/com/android/server/tv/TvInputHardwareManager.java
6a0d43f09d8329bfe4709c05d2ce060cfbfba8b8 01-Aug-2014 Torne (Richard Coles) <torne@google.com> Fix WebViewUpdateService timeout code.

The loop was initialising the boolean incorrectly causing the first
iteration to wait even when the condition was already true and have to
hit the timeout before loading continues.

Change-Id: I6a347cff2e4560b38c8aec3297e456b6f784a97e
ava/com/android/server/webkit/WebViewUpdateService.java
ad3aa32fee096f6887ba41bf0bf2b767cbdefeab 25-Jul-2014 Eunae Kim <eunae.kim@lge.com> Fix a bug that the RecentTask list of other’s may show up to non-primary users.

Cherry-pick from aosp to lmp-dev.

When switching to a newly created user, the user may face this bug
when he opens the RecentTask screen.

A possible bug scenario is described as follows:
A user id of a removed user may be recycled when created a new user.
However, mRecentTasks is not correctly controlled so that old
information may still remain and be possibly mapped to wrong user.
This patch prevents this bug by explicitly removing old information
in mRecentTasks when removing existing user.

Change-Id: I1874dbd604598a5d740ae1e034981e21214c15c6
Signed-off-by: Eunae Kim <eunae.kim@lge.com>

Conflicts:
services/java/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityManagerService.java
214be42ea690ee99e1b404844afbe2c138447b59 30-Jul-2014 riddle_hsu <riddle_hsu@htc.com> [ActivityManager] Prevent coredump file may not complete for testing.

Cherry-pick from aosp to lmp-dev

Sympton:
During testing, skip kill native crash process manually because it
will continue to die by default.

Root Cause:
Large process may take some time to do coredump.In auto test, crash
process will be killed immediately that results incomplete coredump
file.

Solution:
If the tester (IActivityController) will handle app crash event,
Do not kill native crashed process if the rom is debuggable.

Change-Id: Ia360af147d694125d440e5ba2f958c4759a50494

Conflicts:
services/java/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityManagerService.java
9bcc6e83d98dc5608d15f38c12d397be650c637c 30-Jul-2014 riddle_hsu <riddle_hsu@htc.com> [ActivityManager] Avoid mistaking visibility by finishing task.

Cherry-picked from aosp into lmp-dev.

Sympton:
Next activity only adds to history but does not launch/resume then results ANR.

Root Cause:
In a rare timing, some windows are switched at the same time,
it will cause some finishing records on the top temporarily,
then set startIt to false that skip to resume the real top activty.

Solution:
If all activities in a task are finishing, do not use it to check.
The behavior/checking is the same concept as in JellyBean:
// If starting in an existing task, find where that is...
boolean startIt = true;
for (int i = NH-1; i >= 0; i--) {
ActivityRecord p = mHistory.get(i);
if (p.finishing) { // <--
continue;
}

Change-Id: I9d81a7b5182400c52e173da23eee61c74692beee

Conflicts:
services/java/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStack.java
beea442e72ddf03efe79d216288ea320fc4c308b 31-Jul-2014 destradaa <destradaa@google.com> Fix crash in Volantis because there is not FLP support.

b/16690237

Change-Id: Ie2dd159ad4e9b5cf4b3e2e66023b456927f18130
ava/com/android/server/LocationManagerService.java
798e7f5cce0a4fcd6f04a09923b5ad123a0ed393 01-Aug-2014 Ben Murdoch <benm@google.com> Merge changes I2f40be36,I4af9fd7e,Ib0b4245f,I55acad96,Id276b71e, ... into lmp-dev

* changes:
Cherry pick Cleanup debug messages in WebViewFactory and WebViewUpdateService DO NOT MERGE
Cherry pick Move startIsolatedProcess implementation in ActivityManagerService DO NOT MERGE
CHerry pick Find WebView package name from a config resource. DO NOT MERGE
Cherry pick Remove dependency on WebView native library path. DO NOT MERGE
Cherry pick Make WebViewUpdateService a SystemService. DO NOT MERGE
Cherry pick Refactor ActivityManagerService and make WebViewFactory more pedantic. DO NOT MERGE
Cherry pick Refactor native library path logic in WebViewFactory DO NOT MERGE
Cherry pick Append WebView assets to AssetManager when loading the WebView. DO NOT MERGE
Cherry pick Introduce startIsolatedProcess private API in ActivityManager DO NOT MERGE
Cherry pick Load the WebView Java code from an APK. DO NOT MERGE
fa58ac09df51ddc7710a7b2837170dd3780aaf3a 01-Aug-2014 Ye Wen <ywen@google.com> Return fake URI for AppOps permission failure check

Change-Id: Ib7adcce0827a90a49e317a5434fb1abfa91a51d5
ava/com/android/server/MmsServiceBroker.java
e76e81a227a29db5223d231ec88ecb02fa4d6835 29-Jul-2014 Primiano Tucci <primiano@google.com> Cherry pick Cleanup debug messages in WebViewFactory and WebViewUpdateService DO NOT MERGE

This is just a cleanup CL which fixes:
- Some erroneous debug messages about the relro creator process.
- The condition checked in WebViewUpdateService, to prevent the
WebView to be used from the SystemServer (it now looks at the
process id, previously it was erroneously looking at the uid).
- Adds a 5s. timeout to the waitForRelroCreationCompleted.

Original BUG:16403706

Original Change-Id: I43a953949050d7df5fe334cfa7257315ee6db071

Bug: 16723226
Change-Id: I2f40be3622b8e6c68b2b52cae7f4d3a95e148cbf
ava/com/android/server/webkit/WebViewUpdateService.java
994e219da8ebee85d8c6b9564995e8ed9eae81e4 30-Jul-2014 Primiano Tucci <primiano@google.com> Cherry pick Move startIsolatedProcess implementation in ActivityManagerService DO NOT MERGE

This CL addresses the comments in CL 512432, moving the implementation
of startIsolatedProcess in the outer ActivityManagerService class and
making the entry point in the ActivityManagerInternal sublcass just
a proxy method.
This change also addresses a potential NPE, due to startProcessLocked
returning null in some failure cases.

Original BUG:16403706
Original Change-Id: I21eff88c23221653f552cfc171647a839e42a802

Bug: 16723226
Change-Id: I4af9fd7eea10b11e06a5c37d8160c220376b3ed1
ava/com/android/server/am/ActivityManagerService.java
5ced502fba5a69dc1d2e55b3d7e5fd429280d6ae 28-Jul-2014 Ben Murdoch <benm@google.com> Cherry pick Remove dependency on WebView native library path. DO NOT MERGE

This CL removes the final use of the hardcoded WebView
library path from WebViewFactory. We now use a system
property to set the amount of address space to reserve
in the zygote rather than stat'ing the file.

See also I07ad5a774623c1899eb50474d999a2b1447783f0

Original Change-Id: Id3c1e3cc2e2a06c1021ad0260a37abcd07d78fd6

Bug: 16723226
Change-Id: I55acad96b6d9ee69f14b84d772abf7740ea96b94
ava/com/android/server/webkit/WebViewUpdateService.java
4dbeb359b2cfeb63d6ec3ecb702f2bd836db058a 29-Jul-2014 Torne (Richard Coles) <torne@google.com> Cherry pick Make WebViewUpdateService a SystemService. DO NOT MERGE

Migrate WebViewUpdateService to the newer SystemService approach instead
of ServiceManager.addService.

Original Bug: 16403706
Original Change-Id: I21aa67a41c22c3c20ba9e82eb87e5d610fe130e8

Bug: 16723226
Change-Id: Id276b71ee547e683f0756bcee0f4978ce342c2af
ava/com/android/server/webkit/WebViewUpdateService.java
161536b5970ba5ab43233e7695ef69ba2bb804f4 28-Jul-2014 Primiano Tucci <primiano@google.com> Cherry pick Refactor ActivityManagerService and make WebViewFactory more pedantic. DO NOT MERGE

This CL adds more robustness to the logic in WebViewFactory, checking
whether the isolated process did start at all and catching exceptions
in its java side.
Also, this addresses the refactor comments received in CL 509840.

Original BUG:16403706
Original Change-Id: Iaaea6d36142ece6d974c2438259edf421fce9f2e

Bug: 16723226
Change-Id: Id308f2ffde9b67a3eb4719c7b81b4f46421f0c2e
ava/com/android/server/am/ActivityManagerService.java
810c052d9b117217152c2a609ccec056a2a61d1e 25-Jul-2014 Primiano Tucci <primiano@google.com> Cherry pick Introduce startIsolatedProcess private API in ActivityManager DO NOT MERGE

The new API spawns a isolated process, using a custom uid, entrypoint and
abi. Such API is used by the WebViewFactory to spawn its unpriviledged
but trusted process (hence the fixed uid) which rewrites the rerlo file
on boot / when an update occurs.
Since both the ActivityManager service and the WebViewUpdate service
live in the SystemServer their calls be dispatched locally and no
binder interface needs to be exposed for the new startIsolatedProcess API.

Original BUG:16403706
Original Change-Id: I327b59735c12698595e0dbcc4da5d759c9103b0a

Bug: 16723226
Change-Id: Iecb49888e11eec9d302d9712953fd498db5821af
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ProcessRecord.java
ava/com/android/server/webkit/WebViewUpdateService.java
a0995ab8212a26945fe377346e110fa9a6e663dd 31-Jul-2014 Robin Lee <rgl@google.com> Always show error dialog for other profiles

Apps running on another profile of the same user were previously
considered to be running in the background, so their error dialogs
would not show unless ANR_SHOW_BACKGROUND was set.

@bug 15665024

Change-Id: I7e559c6b7f8befc1553bc0ec06e89e5d7906d198
ava/com/android/server/am/ActivityManagerService.java
09875ec7292b19e07c38b6127406d6aa7490e26c 29-Jul-2014 Craig Mautner <cmautner@google.com> am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev

* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
Remove PendingActivityLaunches based on stack.
0fa45d93f7265c130d5dc49a51130ed74db5cec9 29-Jul-2014 Craig Mautner <cmautner@google.com> Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
7f13ed37fd2a0533fa7c5e330519decd89fdc1d5 28-Jul-2014 Craig Mautner <cmautner@google.com> Remove PendingActivityLaunches based on stack.

Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.

Fixes bug 16045752.

Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
a9c5257a15f2efb5c017d2ecadb5a7360230bfee 25-Jul-2014 Craig Mautner <cmautner@google.com> am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev

* commit 'a0bb44efe96ca70635b64dac8922b225d1a19407':
Finish crashed activities immediately
a0bb44efe96ca70635b64dac8922b225d1a19407 25-Jul-2014 Craig Mautner <cmautner@google.com> Merge "Finish crashed activities immediately" into klp-modular-dev
8e5b133bf63c0f29ce059bf0ef05695a2f7f99b8 24-Jul-2014 Craig Mautner <cmautner@google.com> Finish crashed activities immediately

By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.

Fixes bug 15092354.

Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
ava/com/android/server/am/ActivityStack.java
bc3699b1c3e0b2d07adb0919ef2a418546a7838c 24-Jul-2014 Prashant Malani <pmalani@google.com> am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev

* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
Revert "Remove circular mask"
2d99826605d8f18d71b5a4696cdf2f6909adab44 01-Aug-2014 Sungsoo Lim <sungsoo@google.com> Merge "TIF: Use XML file for representing TvContentRating" into lmp-dev
5c5b83fcd58d21c9ab7ac986bf84f604ec5bb4b5 29-Jul-2014 Sungsoo Lim <sungsoo@google.com> TIF: Use XML file for representing TvContentRating

This change addresses the following API council feedback.

- Remove all constants from TvContentRating. Instead this class becomes a
general parser for a tuple of "rating domain"+type+subtype(s).
- Instead of constants in the API, the rating definitions should come from
parsed XML meta-data tied to a TvInputService entry in the AndroidManifest.
This XML should define a ranked order of the rating constants along with
@string references for displaying in the Settings UI. Mention that the
"rating domain" should be scoped similar to a package name, for example
"com.youtube.ratings".
- For system-defined rating types (like US, Korea, etc) we should parse this
same XML format, but it may come from a hard-coded XML resource (since they
aren't tied to a single TvInputService.)
- Thoroughly document the built-in supported types in javadoc on TvContentRating.

Change-Id: I0a9526c73c8ca67fd0eeac63f3c63c05657a45e3
ava/com/android/server/tv/TvInputManagerService.java
7c3a95633d307c4be30c9dbbf1071063aa7a3c64 01-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Fix bugs in active source command handling in HdmiControl

- Make sure input change listener is invoked
- The command from new device at the active path should
start routing control

Change-Id: Ic0ca52d42cc1738f9effced322b00f3bd1957f60
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/RoutingControlAction.java
37c665bad3e914c4af7684e881d24c3cd9cf8f32 01-Aug-2014 Sungsoo Lim <sungsoo@google.com> Merge "TIF: Add a parameter (Bundle params) of tune method" into lmp-dev
1a6b25eabcc1fb66e6e8d76f91fd413e18b793a9 09-Jul-2014 Sungsoo Lim <sungsoo@google.com> TIF: Add a parameter (Bundle params) of tune method

- tune(Uri, Bundle) is added as a system API.

Bug: 15809017
Change-Id: I50bc9b510f469ac3c157f095ccfe27d1cd1d9854
ava/com/android/server/tv/TvInputManagerService.java
fc2f1bde1919896457e9ffdace65fa95de372555 01-Aug-2014 Jinsuk Kim <jinsukkim@google.com> Merge "System API HdmiControlService.getActiveSource" into lmp-dev
7e74206693f4ee93afb902d5b3446e2384f2a13d 30-Jul-2014 Jinsuk Kim <jinsukkim@google.com> System API HdmiControlService.getActiveSource

Added getActiveSource to provide Tv Input Service with the information
on HDMI active source/routing path. TIS side will be handled separately.

Change-Id: I3d7c12a6c9da9f96a7f22ba1f66ac2559928858d
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
73140e4df9ed9cfcc897f5cd0742b81d9839d4d4 31-Jul-2014 Christopher Tate <ctate@google.com> Attempt install-time restore even for no-agent apps

Packages without their own backup agents can still have restorable
data to be delivered. Correct the logic for attempting a restore
at install time so that it no longer requires an app-defined backup
agent.

Bug 16688665

Change-Id: I7dcf7ef85ad6b5b393a2c97ce62f1b2eec9d3520
ava/com/android/server/pm/PackageManagerService.java
3f31f5db65f5c2f6193ab58c9c3ea6603a1f5d92 31-Jul-2014 Christoph Studer <chstuder@google.com> NoMan: Use Notification.isGroupX() methods

Change-Id: I041f449361959440a5be7375e655a31fd14e7862
ava/com/android/server/notification/NotificationManagerService.java
5e8cb22e609bf36ada35cd99c6d3ac51abd6b8ab 31-Jul-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev
cef37cf5c749d140070d6d1bcf1cf41072843962 25-Jul-2014 Christoph Studer <chstuder@google.com> NoMan: Filter group children for pre-L listeners

Bug: 16189575
Change-Id: I5297b5273ab0aaee599981738eb736a49f21ce53
ava/com/android/server/notification/NotificationManagerService.java
691ed0561d592e0305939d3d928b221e9fe7f532 31-Jul-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Add logging of Legacy Type info." into lmp-dev
a87863a8bddb033ca9ace11e7d78932d70d08ce3 29-Jul-2014 Sander Alewijnse <salewijnse@google.com> Fix deadlock window manager and device policy manager.

Removed all communication from wm to device policy manager.
Added initialization of cache in wm by dpms.

Change-Id: Ifa0b8bfcd625464b156d5cc0fb66d342deda1c27
ava/com/android/server/wm/WindowManagerService.java
d5ce9759524740cfb02638fd1d7b44315957b422 25-Jul-2014 Jae Seo <jaeseo@google.com> TIF: Make TvTrackInfo methods more explicit.

This change addresses the following API council feedback:

TvTrackInfo:
-- Remove all KEY_/VALUE_ constants, and replace with explicit,
strongly-typed accessor methods.
-- Add additional Bundle getExtras() method (in addition to the explicit
types); most of the time this Bundle will be null.

Bug: 16542165
Change-Id: Ie48cb170b2bbf07d9460fdc8ed77d7db01799772
ava/com/android/server/tv/TvInputManagerService.java
d49ac33b5e1c0bd0370255d8e3da64ed634e2b41 31-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Add logging of Legacy Type info.

There are some bugs where getActiveNetworkInfo gives bad data (seemingly)
and this will give the backing data in logs.

bug:16610051
Change-Id: Iad867485ad78daeb3e88665dcd0fdb0af756a3bf
ava/com/android/server/ConnectivityService.java
fa75e3d465a9600b800ad253f1e236f4d375e430 30-Jul-2014 keunyoung <keunyoung@google.com> Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev
1d0a7ccd007e7ce62588212f76db09d2e593b742 28-Jul-2014 keunyoung <keunyoung@google.com> add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode

- When this flag is set, system no longer keeps the display on while in car mode.

bug: 15472822
Change-Id: I277368be5227eaf96213684598f278c39e4c34db
ava/com/android/server/UiModeManagerService.java
e47df8466be991b187f445c8cf811891271051bf 30-Jul-2014 Jason Monk <jmonk@google.com> Allow System UI access to VPN.

Bug: 16153201
Change-Id: I5f5e9e0ed3e4e02d6a6995011356b350758f068d
ava/com/android/server/connectivity/Vpn.java
4e68b6572306fb4a44e78b3cf2b48fb943e69cbe 25-Jul-2014 Adili Muguro <adili.muguro@sonymobile.com> Fixed a NullPointerException in AccountManagerService.

Change-Id: If65d7870c609ae6c7467e26978ffd0ce0d52f518
ava/com/android/server/accounts/AccountManagerService.java
8750dbca947ff6eb7f4a46c12d411752bb88396d 31-Jul-2014 Wonsik Kim <wonsik@google.com> Merge "TIF: fix TvInputHal bug for multiple devices" into lmp-dev
21aa3467cd14260418cc47334b656adf841a567c 29-Jul-2014 Wonsik Kim <wonsik@google.com> TIF: fix TvInputHal bug for multiple devices

In addition, add toString() method to TvStreamConfig for easier
debugging.

Bug: 16561829, Bug: 16666251
Change-Id: Ic192aef30f4d193b73bac7bc93a1563aa9af4377
ava/com/android/server/tv/TvInputHal.java
ni/com_android_server_tv_TvInputHal.cpp
f9a274c9b8578dda6afeda422bff18b1577028b9 26-Jul-2014 destradaa <destradaa@google.com> Add support for sources in Geofencing APIs.

Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
ava/com/android/server/LocationManagerService.java
ni/com_android_server_location_FlpHardwareProvider.cpp
4b54271f1bbd29957c47433155c58aa792105d6d 30-Jul-2014 Yuncheol Heo <ycheo@google.com> Don't clear local device when it goes to the standby mode.

Some OEM/SOC will keep passing the received packets until the
application processor goes to the sleep mode actually. so we'll
not clear the local devices to get the received packets and react
like in the standby mode.

Bug: 16661406
Change-Id: I6eb9c21877a29905bb0084256dc6692fe0d07170
ava/com/android/server/hdmi/HdmiControlService.java
ceb2adca4905bc1f80545792d82bed5d877ed583 01-Aug-2014 Jeff Sharkey <jsharkey@android.com> Merge "Persist install sessions, more lifecycle." into lmp-dev
1cb2d0d4bba387665128c62c342e59103ea4be26 31-Jul-2014 Jeff Sharkey <jsharkey@android.com> Persist install sessions, more lifecycle.

To resume install sessions across device boots, persist session
details and read at boot. Drop sessions older than 3 days, since
they're probably buggy installers.

Add session callback lifecycle around open/close to give home apps
details about active installs. Also give them a well-known intent
to show session details.

Extend Session to list staged APKs and open them read-only, giving
installers a mechanism to verify delivered bits, for example using
MessageDigest, before committing.

Switch to generating random session IDs instead of sequential.

Defensively resize app icons if too large. Reject runaway
installers when they have too many active sessions.

Bug: 16514389
Change-Id: I66c2266cb82fc72b1eb980a615566773f4290498
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
a3dbd1087dfad0cacdb274420ec70505e236ad42 29-Jul-2014 Ye Wen <ywen@google.com> Move archived column from pdu/sms to threads (1/4)

Also add API to archive a conversation

Change-Id: Ib7daf6e0c3205c3c084406800c9c5bf054e1ca40
ava/com/android/server/MmsServiceBroker.java
4579fd2d0c23f92546633e472439f9207acb3ae0 30-Jul-2014 Christoph Studer <chstuder@google.com> Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev
4600f9b60753adab4e65258a05744a46938fce86 22-Jul-2014 Christoph Studer <chstuder@google.com> Strip RemoteViews from Notifications, re-create them in SysUI

Bug: 16329721
Change-Id: Ic0bea763ffaec4c5644ca78705007211ac6b4b88
ava/com/android/server/notification/NotificationManagerService.java
f0382899c71a540103ba2dbcd0fe8aa8c926c4a8 30-Jul-2014 Lorenzo Colitti <lorenzo@google.com> Use a new socket for each of the host's IP addresses.

If Socket.connect() times out, the socket cannot be used any
more - any attempt to do so fails with EBADF. Use a new
socket for each IP address.

Bug: 16664129
Change-Id: If3616df86f7c2da0eabd30dca5db65d0da85cb17
ava/com/android/server/connectivity/NetworkMonitor.java
78403d79739605511ea88b653564d81d7bf4bbba 28-Jul-2014 Chris Wren <cwren@android.com> Add a log and statistics for notification expansion.

Bug: 16618854
Change-Id: I501f396fa495e1e55a27d7d0b65aac66495418c1
ava/com/android/server/EventLogTags.logtags
ava/com/android/server/notification/NotificationDelegate.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationUsageStats.java
ava/com/android/server/statusbar/StatusBarManagerService.java
29762c3dfb7a510c23f021f6797840ebd80663af 29-Jul-2014 Nicolas Prevot <nprevot@google.com> Removing old tag TAG_FORWARDING_INTENT_FILTERS.

By now, all devices should have updated, so we can remove the
old tag name.

Change-Id: Id0bc0e08f3979c5a2652c4eb8da9ff938b5d5bc4
ava/com/android/server/pm/CrossProfileIntentFilter.java
ava/com/android/server/pm/Settings.java
8f21158fe64eb93ff005dc1b831b282b95531023 29-Jul-2014 Adrian Roos <roosa@google.com> Trust: Make setEnabledFeatures asynchronous

Unsynchronizes the call into app code from setEnabledFeatures,
replacing it with a callback mechanism. Also makes this actually
work by fixing the check in TrustManagerService to take into account
whitelisting.

Change-Id: I0831752cd2d3158eda9c8404a5569498f11ac2ac
ava/com/android/server/trust/TrustAgentWrapper.java
ava/com/android/server/trust/TrustManagerService.java
7861c663fd64af33ec2a4c5ad653c806dc8bd994 25-Jul-2014 Adrian Roos <roosa@google.com> Add setManagingTrust and expose it on lockscreen

Adds a facility for trust agents to indicate if they
are ready to manage trust. Also adds an indication to
the lock icon on the lockscreen to show whether trust is
being managed.

Bug: 15518469
Bug: 16123013

Change-Id: Ie17f588aebeafe66c81dea4a69c733b0d2c72fd4
ava/com/android/server/trust/TrustAgentWrapper.java
ava/com/android/server/trust/TrustArchive.java
ava/com/android/server/trust/TrustManagerService.java
783645e99f909ffc7a2d5d2fca9324cc0e9b7362 28-Jul-2014 Jae Seo <jaeseo@google.com> TIF: Merge TvParentalControlManager into TvInputManager

This change addresses the following API council feedback.

TvParentalControlManager:
-- Replace the listener interface with a broadcast Intent with well-known
action, something like ACTION_BLOCKED_RATINGS_CHANGED.
-- TvParentalControlManager goes away, and two remaining methods move to
TvInputManager.

== Implementation changes ==
-- The user-selected rating preferences should be stored in an XML file, and
loaded at boot by your internal system service. It should _not_ be stored in
a Secure/Global setting.

Bug: 16542165
Change-Id: I278df963576652ec9163a66c1ef99419fcdb36c2
ava/com/android/server/tv/PersistentDataStore.java
ava/com/android/server/tv/TvInputManagerService.java
d922a546b94119217fb790113d0001cad0432060 24-Jul-2014 Wonsik Kim <wonsik@google.com> TIF: ensure hardware / CEC event calling sequence

Bug: 16441047
Change-Id: Ie654b78ec91a081a1438cc036967f528e063f25b
ava/com/android/server/tv/TvInputHardwareManager.java
d97e1fdb29db15c5117e2502da2f1f1fb82233b6 24-Jul-2014 Ye Wen <ywen@google.com> Implement broker pattern for imms (1/3)

b/16324360

Change-Id: I41dc9823820eed60406973f5edb5a71deb4b0130
ava/com/android/server/MmsServiceBroker.java
f4f8bb793fe101af770dc974b29c26722bce285f 29-Jul-2014 Craig Mautner <cmautner@google.com> Eliminate memory leak in TaskPersister

Bitmaps added to TaskPersister were piling up in the queue.

- The mRecentsChanged flag was being modified without holding the
lock. There is no mRecentsChanged flag now. Everything to be
written goes into a queue.
- TaskPersister now runs until the queue is empty.
- Bitmaps being written to the same file were being added to the
end of the queue without replacing the earlier bitmap. Now we
search the queue for matching tasks and replace the bitmaps
if needed.
- Method notify() was renamed to wakeup() so IDE could find usages
quicker.
- Bitmaps that were being requested but were still in the queue
are now being fetched from the queue.

Fixes bug 16512870.

Change-Id: Idca1c712e5d2df8196e93faaf563a54405ee96bf
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/TaskPersister.java
ava/com/android/server/am/TaskRecord.java
1561fd3b066bef822dce69e26bdd7aaa41ca3a84 30-Jul-2014 Jeff Davidson <jpd@google.com> Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev
26fd143326a11c9dd7942e31acca6df56288d194 29-Jul-2014 Jeff Davidson <jpd@google.com> Add NetworkScoreManager.disableScoring().

Allows the active scorer app to disable itself.

Change-Id: I7bcdc3aafb95af4ea0b110b01b08ab4daf7a137f
ava/com/android/server/NetworkScoreService.java
43c23e273e1b78caf26899eca5a4f51df9d52400 29-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Invoke input change listener at path change

Previously input change listener is not invoked if the routing change
does not cause the TV port change, but this failed to trigger the change
from an active source connected to port 1 to a non-cec device also
connected to port 1. Do this by comparing paths not ports.

Also did some cleanup:
- Avoid allocating empty lists too often for getActions
- ActiveSource.invalidate()

Change-Id: Id79531e2552ef7fa38bd604796108b8650db69a1
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
26ba7fddcaeb052710ca8672889830dabcbfd3ac 29-Jul-2014 Yuncheol Heo <ycheo@google.com> Make it pass CECT 11.1.3 System standby

- Accept the broadcast <Standby> message.
- Fix the bug that onStandyCompleted() is called mutliple times.
- Fix the issue that <Standby> message is not sent when going to
the standby state, since the local device was cleared already.

Bug: 16497304
Change-Id: Ib04ad2386621929814a801edd6b6c0e1a3902a7c
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
b2b3151a42bd563669b222b82efb64e294dc9049 21-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Send TV app the intent for the new active source

When signalled by an external CEC device about to become a new active
source, TIF(TvInputHardwareManager) sends an intent for TV app to tune to
the input mapped to the device. For non-CEC devices or MHL device
the device info comes with port ID only, which should be used to find
the right input.

Change-Id: I71c8454fead037d880ee440b0a8d64dd361ed558
ava/com/android/server/tv/TvInputHardwareManager.java
c6acfa29d57cd322188ae22f30ae4291158ceaa6 29-Jul-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Use getBoundURL for network validation." into lmp-dev
ae6dffb69792a93422c3bbc50088572c99e5b7be 17-Jul-2014 Lorenzo Colitti <lorenzo@google.com> Use getBoundURL for network validation.

Disable for now, until we're more confident that it doesn't choke
on strange captive portals.

Change-Id: Ic8e66a379d32c915c949df70ca0d38535cd5dbe0
ava/com/android/server/connectivity/NetworkMonitor.java
73f1856f7f224dce9670b57707f65f805bb0f6b3 29-Jul-2014 Jim Miller <jaggies@google.com> Merge "Add new DevicePolicyManager API to allow fine-grained TrustAgent management" into lmp-dev
604e7558ef32098644b2f9456d7743a07ae789dc 19-Jul-2014 Jim Miller <jaggies@google.com> Add new DevicePolicyManager API to allow fine-grained TrustAgent management

This adds a new feature that allows a device admin to specify a
whitelist of features that are allowed for the given admin.

Change-Id: I83f853318efbcf72308532d0a997374f73fa9c10
ava/com/android/server/trust/TrustAgentWrapper.java
ava/com/android/server/trust/TrustManagerService.java
7544c829972d5ea33ab2ac9ec1e9a4974909d8d8 29-Jul-2014 Craig Mautner <cmautner@google.com> am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev

* commit '09875ec7292b19e07c38b6127406d6aa7490e26c':
Remove PendingActivityLaunches based on stack.
bfa5dc4c6c486bdabadb5ea2e356a7d348e3b975 29-Jul-2014 John Spurlock <jspurlock@google.com> Zen: Classify notifications using the alarm stream.

Also:
- include audio attributes in dump
- workaround for recent AudioAttributes change.

Bug:16455021
Change-Id: Ib9b047a74cff3e0cc354a5aaa96bc92a400b3845
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/ZenModeHelper.java
ee410da42b6b8352213f03f7725fd041f703b035 25-Jul-2014 Matthew Williams <mjwilliams@google.com> remove possible JobScheduler race in cancel()

Client can jobFinished() before getting a cancel msg.
1) Do better clean up of JobServiceContext after client jobFinished()
to remove superfluous MSG_CANCELs
2) When processing MSG_CANCEL check whether the context is still active
3) Do JobServiceContext cleanup before calling back to JobSchedulerService
Client can get a cancel msg even after calling jobFinished() (opposite to above)
1) explicitly check whether there are any MSG_CALLBACKs in the queue before
processing a MSG_CANCEL. If there are we can throw away the cancel.

Bug: 16547638
Change-Id: I90644586c7895a9ce97de752a5d657faf7f74b78
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/JobServiceContext.java
5c1c832a8f87850f55755202f1f7caa510449d87 29-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Remove dead code 4.

Removing:
handleDnsConfigurationChange
updateDnsLocked
updateRoutes
handleConnectivityChange
handleConnect
handleDisconnect

Adding a missing flushVmDnsCache and setting of mActiveDefaultNetwork

Change-Id: I681fc72c317833ea1deb42db0b43d2adb21baeff
ava/com/android/server/ConnectivityService.java
3a50a69a0e8566e96287988b6631b739bb440dea 29-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove dead code 3." into lmp-dev
8c01d88208e17af01268ea01a08c46c2d2f96721 28-Jul-2014 John Spurlock <jspurlock@google.com> Zen: follow independent ringer mode changes.

Bug:16624498
Change-Id: Ib623118970a82c8406c714687b1b516378fe7824
ava/com/android/server/notification/ZenLog.java
ava/com/android/server/notification/ZenModeHelper.java
1ea93a3b4f0454a693fd1b276b47c3944c1a8bb6 27-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Remove dead code 3.

Removing mNetRequestersPids and mPriorityList.

Change-Id: I8295040436b62f7f6495ece7154246fb719288a4
ava/com/android/server/ConnectivityService.java
f4e0c0cb8ef22fdb20ae74b444c9f4b7d15ded8b 27-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Allow VPNs to add/remove link addresses dynamically.

Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Vpn.java
ni/Android.mk
ni/com_android_server_connectivity_Vpn.cpp
cfcdf1270127d9a333cda2b91646713d1f41c6ac 29-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Add MHL getPortInfo" into lmp-dev
f4eb72d53b4c5bc2286841006ad473ad4448bcf8 25-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Add MHL getPortInfo

Allows MHL support flag to be put into port information

Bug: 16215362
Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
ava/com/android/server/hdmi/HdmiControlService.java
8c688ada2dc256a746429b10b2e7a47a52e9b02f 24-Jul-2014 Jinsuk Kim <jinsukkim@google.com> MHL controller for subcommand reception

Implement HdmiMhlController command reception part.

Bug: 16215362

Change-Id: Iabf46dfaa762fae8c537e4d4ebd3469388a6b7c3
ni/com_android_server_hdmi_HdmiCecController.cpp
6831f1d80f9a5ad2400bd186fb6179e0e511be05 27-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Remove dead code 2.

Removing ConnectivityService.NetworkFactory. This requires disabling
the ConnectivityServiceTest, but that's been broken since we stopped
using NetworkStateTrackers anyway.

Change-Id: I9b86bd37eb9d018c40f60dca5b00d62c36d4e3ad
ava/com/android/server/ConnectivityService.java
6ba042b51496b9763d721b6dca8a591c323d648c 28-Jul-2014 George Mount <mount@google.com> Make returning ActivityOptions part of ActivityRecord.

Bug 16626030

Getting the timing correct for when to clear returning activity options
was difficult when Activities can be destroyed and recreated. Moving
the returning ActivityOptions to the ActivityRecord forces the
ActivityOptions to only apply to the correct Activity.

Change-Id: Ib5400b157eb741ae484aae0cc83172a3db637a3e
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
39ca3f5f698c4213bff5b1982463f6d2ddbc9653 28-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove dead code 1." into lmp-dev
42065ac64cba166dc0fe602957ea8fe80bf406e2 27-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Prohibit address families by default unless a VPN explicitly allows them.

Bug: 15972465
Change-Id: I3278d94536fefacc86390c1ba4231680f7be8589
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/connectivity/Vpn.java
39fa65a3be4932ddadb5104fd0de9ef2121b3bc7 27-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Remove dead code 1.

Starting with startUsingNetworkFeature and stop.
Figure it's easier to code review incremental changes.

Change-Id: I19aee65e740858c3a9a2a1a785663f6fee094334
ava/com/android/server/ConnectivityService.java
e0b8c378b7b4881396346116a9c1d633d1a4eb9f 28-Jul-2014 RoboErik <epastern@google.com> Merge changes I87f551a7,Icb8dc76c,I66fbf585,I0c9506e7 into lmp-dev

* changes:
Add context to MediaController constructor
Add getPackageName to MediaController
Expose a way to set a PendingIntent for restarting playback
Finish plumbing for launch intents in sessions
aa4e23bbb36994708ba72c5f4c83255025d99e07 25-Jul-2014 RoboErik <epastern@google.com> Add getPackageName to MediaController

This removes the MediaSessionInfo class and adds a method on the
controller to get the package name. This also converts code that
depended on the session's UUID to use the token for comparison or
the Tag in the case of test code that needs a string identifier.

Change-Id: Icb8dc76c70e23e897da8fd07651c524b96372bf9
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
b214efbb9170a9f6a4991684a63ca59680074cc7 24-Jul-2014 RoboErik <epastern@google.com> Expose a way to set a PendingIntent for restarting playback

This is to allow apps to set a PendingIntent to restart playback. This
is not persisted across reboots but will allow music to start playing
again for the life of the system. Only the most recent priority app with
a PI set will be cached. This also deprecates methods in AudioManager
that do this and unhides the unregister method in MediaSessionManager.

Change-Id: I66fbf5856333468d8cb8a3022809778ba00d426e
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
e34c09daf89fb888fe2638e71758573462d85173 24-Jul-2014 RoboErik <epastern@google.com> Finish plumbing for launch intents in sessions

This finishes out the plumbing for setting a launchable PendingIntent
on a session and getting it from a controller to launch an app's UI.

Change-Id: I0c9506e7c3f0ebf57070ca7e0d91324eb3fdd1e1
ava/com/android/server/media/MediaSessionRecord.java
9e8ade2eb7ee835963473c9cf6faaf5423b0b048 25-Jul-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Rename ComponentName variables to "component" consistently

Currently, it's sometimes "name", or "service".

Change-Id: I91dffe30fd2b873c744dbde2c027f0582f55746f
ava/com/android/server/tv/TvInputManagerService.java
8cd33ed84e94036a5e1201485af7603dc6fb0d9b 24-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Implement support for bypassable VPNs.

Bypassable VPNs grab all traffic by default (just like secure VPNs), but:
+ They allow all apps to choose other networks using the multinetwork APIs.
If these other networks are insecure ("untrusted"), they will enforce that the
app holds the necessary permissions, such as CHANGE_NETWORK_STATE.
+ They support consistent routing. If an app has an existing connection over
some other network when the bypassable VPN comes up, it's not interrupted.

Bug: 15347374
Change-Id: Iaee9c6f6fa8103215738570d2b65d3fcf10343f3
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
ava/com/android/server/connectivity/Vpn.java
ea4f01070a9c8f5147eb228c413a84de78d98973 28-Jul-2014 Julia Reynolds <juliacr@google.com> Merge "Remove the profile/device owner user restriction bypass." into lmp-dev
401de1785eccc946ed6c35e9b7fccab92b2022af 25-Jul-2014 Julia Reynolds <juliacr@google.com> Remove the profile/device owner user restriction bypass.

Bug: 16566096

Change-Id: I4a56046df44d36d82edc64fc727e8cad5dc75382
ava/com/android/server/AppOpsService.java
f0f0f7ca66e15c5cebfbcf38a8d1e576b3e6e335 26-Jul-2014 Jeff Brown <jeffbrown@google.com> Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev
4b4971b8a31f29e9dd3d27d54a49914a7c3ec1fb 26-Jul-2014 Jeff Brown <jeffbrown@google.com> Fix a deadlock due to AMS calling into WMS with its lock held.

The full deadlock cycle involved ActivityManagerService,
WindowManagerService, and DevicePolicyManagerService.

Fixed by posting the work of enabling the screen to the handler
instead of doing it immediately while holding the activity manager
lock.

Bug: 16578860
Change-Id: I10514cd2df993c7193747ae823e1990a2c34e196
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
82379ba8ddc04116a40aa177df4ef6c2aa428a69 26-Jul-2014 Jeff Brown <jeffbrown@google.com> Don't suppress haptic feedback on keyguard anymore.

This enables haptic feedback from virtual keys, lift-to-wake,
and long-press power to work as expected on the keyguard.

There doesn't seem to be a good reason for us to block haptic feedback
on keyguard anymore. The PIN, pattern, and password locks already
bypass this check and vibrate and require a swipe to access in
the first place. So there doesn't seem to be much potential
for accidental vibration anymore.

If this becomes a problem then we can investigate more targeted
means to suppress undesired vibration.

Added some debugging code to VibratorService.

Bug: 16535403
Change-Id: Ia7a5d8c35244009db36c358e5cbcbf8cf5d68768
ava/com/android/server/VibratorService.java
7d93e279ef113fcf503efc3674cc118caf34b198 26-Jul-2014 Jeff Brown <jeffbrown@google.com> Merge "Don't suppress haptic feedback on keyguard anymore." into lmp-dev
c88f1916b8ab7f5f75a00375c6fb4873ea5044af 25-Jul-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Fix invalid use of serviceStateMap.get()

Change-Id: Ic43ac2697ed459a105e62c81e8cb6d0fb8ff6dd0
ava/com/android/server/tv/TvInputManagerService.java
20e0c50f601e5930a246d4556118423a49c12ca1 25-Jul-2014 Jeff Sharkey <jsharkey@android.com> Offer force-dex-opt when running as root.

Recently we removed the PackageManager inotify triggers, meaning the
only supported ways of installing apps were:

-- adb install -r Foo.apk
-- adb shell stop && adb sync && adb shell start

Iterating on most system apps (like Settings) can use the first
approach, but it doesn't work for "persistent" processes like
SystemUI. (ActivityManager is very particular about how it deals
with persistent apps, and it always sticks with the first
ApplicationInfo found at boot.)

So to enable rapid iteration on persistent apps, we now offer the
one missing piece of forcing a dexopt with a new pm force-dex-opt
command only available to -eng or -userdebug builds. Typical use
for iterating on persistent apps now looks like this:

$ mmm frameworks/base/packages/SystemUI/ && adb sync &&
adb shell pm force-dex-opt com.android.systemui &&
adb shell kill `pid systemui`

Yay!

Change-Id: I0ae2467f1d7cda56c70ba20953cd25fa8ee766ff
ava/com/android/server/pm/PackageManagerService.java
16c8e3f49497b6046972ae650772f65768366be8 25-Jul-2014 Jeff Sharkey <jsharkey@android.com> PackageInstaller changes based on feedback.

Mostly cosmetic changes from API council feedback.

Bug: 16543552
Change-Id: Ic926829b3f77c31f50a899c59b779353daf00d59
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
5ec618e3c3163928bd4c1109756764fcd9f90dae 25-Jul-2014 Craig Mautner <cmautner@google.com> am a9c5257a: am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev

* commit 'a9c5257a15f2efb5c017d2ecadb5a7360230bfee':
Finish crashed activities immediately
3c153519ca5f2b66b88901374383f943c9d77df7 24-Jul-2014 Adam Lesinski <adamlesinski@google.com> Add Per-User logging of UsageStats

Change-Id: I4518c5d3c56b3821292accb886f9fb21f3a8b25f
ava/com/android/server/am/ActivityManagerService.java
466d203c4ff032477d9a6bdb077ce3cd9b4fe070 23-Jul-2014 Kenny Guy <kennyguy@google.com> Add method to launch settings app details page.

Add a method to LauncherApps to allow launchers to
show application details for an app in a managed profile.

Bug: 16371359
Change-Id: I23acb4365c09e4a7b9fa742ae6fc7e04434f45aa
ava/com/android/server/pm/LauncherAppsService.java
ed1391a9297db5e2a8671bbf2d83654ee5d28702 25-Jul-2014 Narayan Kamath <narayan@google.com> Merge "Handle apps that share a UID with the system_server correctly." into lmp-dev
340ca8b7e81afe891b2d76a08e406eafc63c4fc8 23-Jul-2014 Narayan Kamath <narayan@google.com> Handle apps that share a UID with the system_server correctly.

The system process does not explicitly declare any ABI, or
package any native code that it depends on but its ABI is
dictated by the zygote configuration. We need to account for
it correctly to have apps that share a UID with it work
correctly.

bug: 16317188

Change-Id: I84713c64409d7fdcc314114231e87a9263d5c5e7
ava/com/android/server/pm/PackageManagerService.java
045e648980e66a19f7021116020e733814ac8019 23-Jul-2014 Narayan Kamath <narayan@google.com> Handle renderscript apps in the system partition correctly.

Get rid of various pointless calls to setBundledAppAbisAndRoots.
This method should only need to be called during scanPackageLI.

There's no other good reason to call it.

bug: 16484595
Change-Id: I2830b140058f0fffdbedb51d673e514852854626
ava/com/android/server/pm/PackageManagerService.java
3ae16ddabcf4959607140b233ebc1613442e2f9e 25-Jul-2014 Yuncheol Heo <ycheo@google.com> Merge "Check the validity of the port id of HdmiCecMessage only in TV." into lmp-dev
a65118e13b5ceb54454b48f67ea754a38a08f27a 24-Jul-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Remove ClientState.mInputIds

It's no longer used since callback is now global, instead of per-input.

Change-Id: I82e4d9b8999fb9c18819a12e8436cd94e7174206
ava/com/android/server/tv/TvInputManagerService.java
e946ed8f54c5ee0e58e168df00d4f418e1eed7a7 25-Jul-2014 Yuncheol Heo <ycheo@google.com> Check the validity of the port id of HdmiCecMessage only in TV.

In playback device, we don't track the port info, so we can't verify
the validity of the port id part of the physical address parameter of
HdmiCecMessages.

Bug: 16274232
Change-Id: I41f95dba0505d45688e2c9031b78863dc93248ce
ava/com/android/server/hdmi/HdmiCecMessageValidator.java
ava/com/android/server/hdmi/HdmiControlService.java
5f054cea32eb2e87aeaa03138341eb887cda5e0c 25-Jul-2014 JP Abgrall <jpa@google.com> MountService: Fix android.process.media crash repeatedly problem

When the framework restarts because of certain exception, the
external volume id will disappear. At this time, mount service
will issue "volume list" command to vold to get the status of
each storage.

The fix is to re-broadcast the uuid and user label again via
vold "volume list broadcast" command.

Bug: 16253597
Bug: 16306775
Change-Id: I227e8bc597a4f5338035d3401036490f14557211
ava/com/android/server/MountService.java
68bed6c5d7a000ccea469dc67fa9b4b9bfff7ac4 25-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Add portID information in HdmiCecDeviceInfo" into lmp-dev
2b152015ff94f20b9ec3ef284fb83105f8b3c831 25-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Add portID information in HdmiCecDeviceInfo

This change makes it convenient to get the HDMI port ID from the device
info without having to look it up through a separate HdmiPortInfo, which
happens in many places.

Also removed port information lookup loop by introducing two maps variable
in Control Service: port path ->port ID, and port ID -> port info.

Bug: 16547583
Change-Id: Ibfff722a16b626230766058efcc819e9c8ca0663
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/NewDeviceAction.java
16606119117b6fc738ff60d98dad765fab3068ae 25-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Replace osd message for record status with IHdmiRecordCallback." into lmp-dev
12e5dcefe136b58562f39604e6a8460ac92cb895 24-Jul-2014 Jungshik Jang <jayjang@google.com> Replace osd message for record status with IHdmiRecordCallback.

Add new interface, IHdmiRecordCallback, in order to handle
result of all recording features, One Touch Record and
Timer Recording.
HdmiRecordCallback is clientside interface which uses
RecordSource as return of getOneTouchRecordSource,
instead of raw byte array.

Along with it, add TimerRecordingAction.

Bug: 16160962

Change-Id: If0ed7abc5f45b020b39555cac585becbe8ee7da4
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/OneTouchRecordAction.java
ava/com/android/server/hdmi/TimerRecordingAction.java
ba6e4c60e75218291fb9e7ebe44fbcf8d4fcd211 25-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Don't create a ConnectivityManager when the service isn't ready yet." into lmp-dev
62a61314bc880df15a1d284ce12bc08b9c79a4dd 25-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Don't create a ConnectivityManager when the service isn't ready yet.

Bug: 16550853
Change-Id: Ib244c93dc982cbfe5d065a20e4b8f0aeefb15b8f
ava/com/android/server/connectivity/Tethering.java
422570ea3fe5bf6c4dbc4d96cf47734252ffe703 23-Jul-2014 Amith Yamasani <yamasani@google.com> Call PRE_BOOT_COMPLETED on starting any user

Refactor PRE_BOOT_COMPLETED delivery code.
Continue to call it on all existing users on system update.
Call it on any user being started, as part of
initialization.

Change-Id: Ie188a823fb19afde3781d6c45ada55d6e92edfac
ava/com/android/server/am/ActivityManagerService.java
42dc32d82961301d20cd4a3b286c5fed47919e6f 25-Jul-2014 Michael Wright <michaelwr@google.com> Merge "Flip the permissions checks for video capture." into lmp-dev
8746a478abcfb3b0d73b156232051af1e8d21ce2 25-Jul-2014 Craig Mautner <cmautner@google.com> Create end of animation callback for Activity

Activities cannot draw while their entering animations are active.
This change introduces a callback, onEnterAnimationComplete() so
that activities can know when their draws will be effective.

Fixes bug 13658460.

Change-Id: Ic48540cd4c7e37538f10cb2dc0852aa3f55d11e1
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/wm/AppWindowAnimator.java
ava/com/android/server/wm/AppWindowToken.java
ava/com/android/server/wm/WindowManagerService.java
0ccc2b0a4466f12fb1d753b58314854674b01b3c 25-Jul-2014 Michael Wright <michaelwr@google.com> Flip the permissions checks for video capture.

Currently they're backwards in DisplayManagerService. Oops.

Bug: 16315225
Change-Id: I9bbfc0f4aef1bd21e43594cc36c6e8fd112f0b81
ava/com/android/server/display/DisplayManagerService.java
b9583c9d93bd1d2c9d506dffae87a5ca2b7f7307 25-Jul-2014 Christopher Tate <ctate@google.com> Turn on debugging override of idle time

'adb shell am idle-maintenance' has traditionally been used to force
the system to consider itself to be in an "idle" state. Unfortunately
the new Job Manager hadn't yet been aware of this. Rectify the situation.

Also fixes a bug in debug logging that would cause a system server
crash under certain race circumstances.

Change-Id: I8a29bd7757924f8e464865235c344233fc03d8c3
ava/com/android/server/job/JobServiceContext.java
ava/com/android/server/job/controllers/IdleController.java
85d514498488e079477d0ec789abedd721d4ed6f 25-Jul-2014 Prashant Malani <pmalani@google.com> resolved conflicts for merge of bc3699b1 to lmp-dev

Change-Id: I1b219b5b48afb08ce3704a4f064a85652d2d9339
fab50167a88941b1088130b6b62b1200088764cc 23-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Fix DUN-based tethering.

It was calling into dead ConnectivityService code rather than using
the new ConnectivityManager shim code.

bug:15221541
Change-Id: I1e3eea8a658a162ce36673ed1cf7b1e7e4372c42
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Tethering.java
cf0cf47545db558784563161d6d5324b07630a6e 25-Jul-2014 Narayan Kamath <narayan@google.com> Merge "Handle renderscript apps in the system partition correctly." into lmp-dev
c3d5ead837b1f87c8d55b69e8c48453f8273dde3 25-Jul-2014 Adrian Roos <roosa@google.com> Merge "Restart trust agents when updated or when they are dead" into lmp-dev
c5f95cea2639b698594a85acbde6a5519941d7b1 24-Jul-2014 Adrian Roos <roosa@google.com> Restart trust agents when updated or when they are dead

ActivityManager restarts the trust agent service for us
when it gets killed automatically. This does not apply
when its process crashes too often or when its package
gets updated however.
To catch the update case, the trust agent connection
is removed as soon as the package disappears, and then
readded when the new package appears.
To catch the repeated crashing case, the connection is
reset if it hasn't successfully connected for several minutes.

Also adds a button to SampleTrustAgent to simulate a crash.

Bug: 16137258
Change-Id: I1b18fc7a3025e23e25ca1623b6af658d5430a94b
ava/com/android/server/trust/TrustAgentWrapper.java
ava/com/android/server/trust/TrustArchive.java
ava/com/android/server/trust/TrustManagerService.java
0417982b65efaaf07cc035e7330e3845cad700e6 25-Jul-2014 Nicolas Prevot <nprevot@google.com> Merge "Migrate extras to ClipData for image/video capture intents." into lmp-dev
d1c99b1fe85ed03261a77a14ae52e7fa3a6e523a 04-Jul-2014 Nicolas Prevot <nprevot@google.com> Migrate extras to ClipData for image/video capture intents.

The intents ACTION_IMAGE_CAPTURE, ACTION_IMAGE_CAPTURE_SECURE and ACTION_VIDEO_CAPTURE are now handled in a way
similar to ACTION_SEND and ACTION_SEND_MULTIPLE.
Migrate the uri in the EXTRA_OUTPUT extra to clipData, and add the flag GRANT_WRITE_URI_PERMISSION.

The userIds are now added to extra uris in the process receiving the intent, (not in the system process), because the
system process may not be able to parcel/unparcel the extras.

BUG: 15534203

Change-Id: I8f79666b726bc6d7745bf777ad3c7518945c5cc3
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
43327a61eb57839429fbb064f4166a858788779c 28-Jul-2014 Narayan Kamath <narayan@google.com> Fix regression in renderscript detection.

We must persist the selected (32 bit) ABI for legacy
renderscript apps so that we can launch them correctly.

bug: 16569287

Change-Id: I944acd0cf56ddb1f27337e01bca1b24cd369eb8f
ava/com/android/server/pm/PackageManagerService.java
6714e86a545a38d8726e75fcd271947b4259c759 24-Jul-2014 Craig Mautner <cmautner@google.com> Refactor screen blocking logic.

Because of the call to turn on the screen introduced in ag/495255
is now made earlier we may not have sent the wakeup broadcast by
the time the windows have all drawn. In such a case onScreenOn()
did not release the wakelock and the screen stayed off.

This change ensures that no matter the timing of onScreenOn()
the wakelock will be released but only for the onScreenOn()
called in response to the most recent screen on transition.

Fixes bug 16404078.

Change-Id: Ic1e3e61e16c1fc34d4ec657e0e53ac49a05ca6a4
ava/com/android/server/power/Notifier.java
8a9068573c8f2f038d1eebbe9ccad18bc291f5ce 28-Jul-2014 Jorim Jaggi <jjaggi@google.com> Merge "Fix status icon reappearing for legacy activities" into lmp-dev
b26c24fdbe928000d7c3ebf7c9d8a18eccd888a4 28-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am a01d3aa4: am 7baf28e3: am 1c937d63: Merge "Give clear distinction between active source/active routing path" into lmp-dev

* commit 'a01d3aa48cc1614e9d7c15c293efcf493eecf31a':
Give clear distinction between active source/active routing path
d5bf66ea8a3cac3663cb616fab60d63c102fda9a 28-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 7baf28e3: am 1c937d63: Merge "Give clear distinction between active source/active routing path" into lmp-dev

* commit '7baf28e39e8ab8ebcb03390bee2b42ff9bdab78e':
Give clear distinction between active source/active routing path
4b111442d716c26a24f5c606c8d44d70c327117f 28-Jul-2014 Christopher Tate <ctate@google.com> am 8ac64af6: am 9cd88b91: am 7c98ecd3: Schedule full backups

* commit '8ac64af6236b03e0af6ee95bd579612a6d1ef4d4':
Schedule full backups
083bdc68a94f906767f5ba8c5cc62e89716b7f9e 28-Jul-2014 Christopher Tate <ctate@google.com> am 9cd88b91: am 7c98ecd3: Schedule full backups

* commit '9cd88b9105742ffa15584183d3b3337d98f750be':
Schedule full backups
5eeb59cceb1f95813c548c1c5937f161c1ed3571 22-Jul-2014 Christopher Tate <ctate@google.com> Schedule full backups

Initial policy: at most daily; backups only run when the
device is idle + charging + on an unmetered network.

Bug 16485874

Change-Id: I5665d890a943bac765adcef14be79d7dba6ce078
ava/com/android/server/job/controllers/IdleController.java
e468f29992b242421161078f59cca81a4cba5d6f 28-Jul-2014 Jeff Brown <jeffbrown@google.com> am 501cdb21: am 3efb37d2: am 636e6b73: Minor tweak to screen dimming policy.

* commit '501cdb21024050ec44ef9fbfcf8c4ce0a248666a':
Minor tweak to screen dimming policy.
a621dc5a92ff3c5dda86bf88507c0e9379b07bb5 28-Jul-2014 Jeff Brown <jeffbrown@google.com> am 3efb37d2: am 636e6b73: Minor tweak to screen dimming policy.

* commit '3efb37d23c14682b2958399ac05332e6eee2cdc2':
Minor tweak to screen dimming policy.
5c8ea084e609ecce17a038eb6b09fe118a81d700 25-Jul-2014 Jeff Brown <jeffbrown@google.com> Minor tweak to screen dimming policy.

Avoid accidentally raising the brightness above the normal minimum
if for some reason we already decided it should be less.

Change-Id: Ib47385287be3ef8719c25148575b1f59589add8c
ava/com/android/server/display/DisplayPowerController.java
61a9c9478c7557f8d50c5de801d37332eb4afa83 27-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> am 15ab3fab: am ea444fe7: am 0280963e: Move Alarm setup to systemReady.

* commit '15ab3fabac91e64cf4ef13fb6060882e4d94c533':
Move Alarm setup to systemReady.
0d5ac0b2080892861ee4202658fad859682aa786 27-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> am ea444fe7: am 0280963e: Move Alarm setup to systemReady.

* commit 'ea444fe795e00f793dda5e380e55beb178e83ef7':
Move Alarm setup to systemReady.
f9b5c26309c9d6c2e5ad5116d8e0e055bc5818a2 27-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Move Alarm setup to systemReady.

Don't register alarms before the system is ready.

bug:16484913
Change-Id: Iae5c75ff8d40d4d39dbb23ff65a600b4a00cd1f0
ava/com/android/server/ConnectivityService.java
d8ec2c85bb3ba5f4ab5a1c263babb6084278a006 27-Jul-2014 John Spurlock <jspurlock@google.com> am f11f938f: am 7ad3fea6: am 80be3129: Handle special users in default app check.

* commit 'f11f938fa4be5a326b29975e60d53b6565711720':
Handle special users in default app check.
3f2db8e4b9bf19acd5db30d9647a56ecfec8a102 27-Jul-2014 John Spurlock <jspurlock@google.com> am 7ad3fea6: am 80be3129: Handle special users in default app check.

* commit '7ad3fea65b792b20870bb60052c405582b8f7b0d':
Handle special users in default app check.
b5e767b50918f70ba5f3420a58cc2631eacab903 27-Jul-2014 John Spurlock <jspurlock@google.com> Handle special users in default app check.

Change-Id: I3d1828f143a677bf48cc3caeff125196b6d315e3
ava/com/android/server/notification/ZenModeHelper.java
917a2aa147d62c211e3bd82efc2693fb78a77b63 27-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am 022adc96: am 7618c339: am c52817e9: Fix issues with noticing that a VPN interface is gone.

* commit '022adc9668b8dee2e05738a3cedfeafa6a2835b8':
Fix issues with noticing that a VPN interface is gone.
1b67448fcf96b668ba93012c734de9ea45295d52 27-Jul-2014 John Spurlock <jspurlock@google.com> am d1518fe6: am 592226f6: am e6de13b1: Merge "Zen: Remove hardcoded package name filters." into lmp-dev

* commit 'd1518fe697c71c321a550ce847772bdcc0014177':
Zen: Remove hardcoded package name filters.
49acdf684670feed2a90dcb73f88a46e2ffc57cf 27-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am 7618c339: am c52817e9: Fix issues with noticing that a VPN interface is gone.

* commit '7618c3396e7d047117528fd9aea06eca6dbae71c':
Fix issues with noticing that a VPN interface is gone.
6d37b59c6aee279d88a8bcd25c17d2dfa0d50353 27-Jul-2014 John Spurlock <jspurlock@google.com> am 592226f6: am e6de13b1: Merge "Zen: Remove hardcoded package name filters." into lmp-dev

* commit '592226f656da40d795523ef4cf46f90b26f0ce40':
Zen: Remove hardcoded package name filters.
030a6b923400eada46220343b5e9681cd0a191b7 26-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Fix issues with noticing that a VPN interface is gone.

The root cause of both bugs linked below is the same. In establish(), we call
agentConnect(), which sets the state to CONNECTED. But right before returning
from establish(), we set the state to AUTHENTICATING, which is a "CONNECTING"
state. Later, when the interface is gone (either because the VpnService closed
it, or because the process got killed), agentDisconnect() doesn't do anything
because "isConnected()" is false.

We could fix it by changing that to "isConnectedOrConnecting()", but I think a
superior fix is to get rid of the bogus AUTHENTICATING state. It was added in
http://ag/214042 two years ago, with a TODO saying to eventually make sure it
becomes CONNECTED, but that never seems to have been followed up on.

I don't see any use for this AUTHENTICATING state. Although I haven't tested it,
code inspection suggests that the legacy VPN doesn't seem to care, and it sets
its own states in execute() and such.

Bug: 16495146
Bug: 16495887
Change-Id: Ie2a40aa1a8a173665d8b7aa9fab5ae6e800ba5fb
ava/com/android/server/connectivity/Vpn.java
39542d116cc7d1b3d1d76bbb6111b8cb4d5246e4 27-Jul-2014 Wink Saville <wink@google.com> am 21f9be76: am 70d5a344: am 3a9bab72: Change TelephonyRegistry to use phoneId as a callback condition.

* commit '21f9be768e5d98f7f2081540c7029e7e9b71f705':
Change TelephonyRegistry to use phoneId as a callback condition.
ea5e6e79c75da78ba3f040153df65b005859920f 27-Jul-2014 Wink Saville <wink@google.com> am 70d5a344: am 3a9bab72: Change TelephonyRegistry to use phoneId as a callback condition.

* commit '70d5a344499c25ef23540061e8b4a08d5abb4b70':
Change TelephonyRegistry to use phoneId as a callback condition.
e380b9866703355e4768a9ce163369b80842080c 27-Jul-2014 Wink Saville <wink@google.com> Change TelephonyRegistry to use phoneId as a callback condition.

Previously subId was used but it is currently not consistent and
can take on dummy values thus callbacks would not be called appropriately.
Eventually I hope to remove the dummy value concept but for now this
looks like the best approach.

Bug: 16148026
Bug: 15973975
Change-Id: I450c968bda93767554b5188ee63e10c9f43c5aa4
ava/com/android/server/TelephonyRegistry.java
2da66650020a2b06ea449303768d6f28d29a2705 27-Jul-2014 Jeff Brown <jeffbrown@google.com> am 8bfbd2f6: am 7798e931: am 108f9dc2: Merge "Remove DozeHardware since it will not be used." into lmp-dev

* commit '8bfbd2f61ffb8cc9e167b45ae0306f05af54d10d':
Remove DozeHardware since it will not be used.
8090ac3eaa6d73567a000483747f1d7f2e7861f7 27-Jul-2014 Jeff Brown <jeffbrown@google.com> am 7798e931: am 108f9dc2: Merge "Remove DozeHardware since it will not be used." into lmp-dev

* commit '7798e9313106abfcc39808108b35edc2493ebc6a':
Remove DozeHardware since it will not be used.
fa8fccf6c7acde3c71389caa04921b32b49af3f3 26-Jul-2014 John Spurlock <jspurlock@google.com> am 382300fd: am 8ebe80a3: am c9dfaff7: Merge "Doze: Update tease signal to buzz-beep-blink from NoMan." into lmp-dev

* commit '382300fd23cda23040c97f2255edb5d6d351b019':
Doze: Update tease signal to buzz-beep-blink from NoMan.
aa2a40d57be6122292f8439940f24369806767fb 26-Jul-2014 John Spurlock <jspurlock@google.com> am 8ebe80a3: am c9dfaff7: Merge "Doze: Update tease signal to buzz-beep-blink from NoMan." into lmp-dev

* commit '8ebe80a3919861e36988f91ef95be2efb4e5836d':
Doze: Update tease signal to buzz-beep-blink from NoMan.
cd26a6a0726e87bb730ace21e80c9f34621119fc 26-Jul-2014 Jeff Brown <jeffbrown@google.com> am ff415ca8: am d2d80f2e: am 8944771f: Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev

* commit 'ff415ca830964a86399df19968dd2bceff275359':
Fix a deadlock due to AMS calling into WMS with its lock held.
baacadd14de7e282f9e1539a6c45cd260b705738 26-Jul-2014 Jeff Brown <jeffbrown@google.com> am c1d00de0: am 32019e7e: am dab2b29b: Merge "Don\'t suppress haptic feedback on keyguard anymore." into lmp-dev

* commit 'c1d00de01b5904a6c6e3e5b6160b0b7e628bd880':
Don't suppress haptic feedback on keyguard anymore.
402e888ecbaa8c7fce4f686f72ab5a0a5aab1e6d 26-Jul-2014 Jeff Brown <jeffbrown@google.com> am d2d80f2e: am 8944771f: Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev

* commit 'd2d80f2e401a06564cb03b649582f74c41e1337b':
Fix a deadlock due to AMS calling into WMS with its lock held.
fe841f1c63516a621fb14284c856fa4bd8634c2e 26-Jul-2014 Jeff Brown <jeffbrown@google.com> am 32019e7e: am dab2b29b: Merge "Don\'t suppress haptic feedback on keyguard anymore." into lmp-dev

* commit '32019e7e463565977bd29715e4a9e357c61d8a29':
Don't suppress haptic feedback on keyguard anymore.
3d24f17e9d9906d51d50dc4a137f38b1a76a2557 26-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 7ea51115: am e4160d70: am 9c5d5ad9: TIF: Fix invalid use of serviceStateMap.get()

* commit '7ea51115e98550cc9119187f02daa1a98ae9cd42':
TIF: Fix invalid use of serviceStateMap.get()
6469c41f09844fbcb7f6509e9b41493d04671324 26-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am e4160d70: am 9c5d5ad9: TIF: Fix invalid use of serviceStateMap.get()

* commit 'e4160d70c64632bcb4394ff94b67f13738e63072':
TIF: Fix invalid use of serviceStateMap.get()
90c2a962cdb2900c834b2461a96586970ad29826 26-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 98eacf02: am 12f642cf: am 5bd81570: TIF: Rename ComponentName variables to "component" consistently

* commit '98eacf02f42ac0b1a6b933d80af2d63b72f4ef68':
TIF: Rename ComponentName variables to "component" consistently
29ac3533f0796a32d4df0098ff7ac3cf60518b1f 26-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 12f642cf: am 5bd81570: TIF: Rename ComponentName variables to "component" consistently

* commit '12f642cf1ed42f3c30375ba33925c3b174bc6530':
TIF: Rename ComponentName variables to "component" consistently
99f6dde22c15f2c7207c004426c10630f2868ee0 26-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 2b08afab: am 46d2cb78: am 20f25011: Merge "MHL controller for subcommand reception" into lmp-dev

* commit '2b08afabfcb6f09c732a3a6a36d550b1ba4d2742':
MHL controller for subcommand reception
37970ac22af64bf0be99a133f5cec368f1729639 26-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 46d2cb78: am 20f25011: Merge "MHL controller for subcommand reception" into lmp-dev

* commit '46d2cb7870682ee3feb99006b340e2fbfded12d2':
MHL controller for subcommand reception
b2049de0279fd1a56bb0f4ccd2660f1f496c82f1 26-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am 5c478c04: am f87f2fc6: am a6754382: Merge "Implement support for bypassable VPNs." into lmp-dev

* commit '5c478c04a0fa4391d07b50bd460e2b63bb3a138b':
Implement support for bypassable VPNs.
e0d6374773bf7f92347d8e0278b1c6b0707bf845 26-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am f87f2fc6: am a6754382: Merge "Implement support for bypassable VPNs." into lmp-dev

* commit 'f87f2fc6bd56363f0b8ccb16c4eb959250b63594':
Implement support for bypassable VPNs.
e12a1259729c647c46023b34bc1aa2bbdee112dc 25-Jul-2014 Jeff Sharkey <jsharkey@android.com> am cf85d14e: am bf9964cb: am e52581f6: Offer force-dex-opt when running as root.

* commit 'cf85d14e12824bb51631b2a8d8cd79ff0d0e26fb':
Offer force-dex-opt when running as root.
14098346646d4d873cc42cc8854db6fd75e94982 25-Jul-2014 Jeff Sharkey <jsharkey@android.com> am bf9964cb: am e52581f6: Offer force-dex-opt when running as root.

* commit 'bf9964cb8784e2ac6ea5a2274b4ef9288b4d2da9':
Offer force-dex-opt when running as root.
13c726795fd30788057dffe7c57b0b202fafd907 27-Jul-2014 Jeff Brown <jeffbrown@google.com> Merge "Remove DozeHardware since it will not be used." into lmp-dev
0f208eb707926f0afc1ce073be866bedd4955aa2 27-Jul-2014 Jeff Brown <jeffbrown@google.com> Remove DozeHardware since it will not be used.

Bug: 16516536
Change-Id: I14597d3c9470c94e3bc5b8cff500d2fe6b2fd977
ava/com/android/server/dreams/DreamManagerService.java
ava/com/android/server/dreams/McuHal.java
ni/Android.mk
ni/com_android_server_dreams_McuHal.cpp
ni/onload.cpp
b64fd1957f573ba649497c84c2cf5af9828ec5c0 25-Jul-2014 Jeff Sharkey <jsharkey@android.com> am 891d3aa9: am a475ef57: am 4d700a9c: Merge "PackageInstaller changes based on feedback." into lmp-dev

* commit '891d3aa977653fb79f544f69fab2d214e58cd2b3':
PackageInstaller changes based on feedback.
4c0ee261d35dc7e9bbc1cd9ef3c1fd6a33890e9b 25-Jul-2014 Craig Mautner <cmautner@google.com> am d559647d: am 053ce1e7: am 40185726: am a9c5257a: am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev

* commit 'd559647df21701a4a6fd3d233e33747a3a3a7ed8':
Finish crashed activities immediately
53d64de0ac9a0819dd424a7de3d29e2a7d457d50 25-Jul-2014 Jeff Sharkey <jsharkey@android.com> am a475ef57: am 4d700a9c: Merge "PackageInstaller changes based on feedback." into lmp-dev

* commit 'a475ef574492142bdfd9c25c93bd1e87cc9c712a':
PackageInstaller changes based on feedback.
040491594d922177c892d377bfff17b272bb6611 25-Jul-2014 Craig Mautner <cmautner@google.com> am 053ce1e7: am 40185726: am a9c5257a: am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev

* commit '053ce1e7a85e3ca7820a3b9e1b2c203d1a1a345b':
Finish crashed activities immediately
54e650196acbd44857dad002b0e7209704b2aeea 25-Jul-2014 Adam Lesinski <adamlesinski@google.com> am 4d5eda90: am 42460fd6: Add Per-User logging of UsageStats

* commit '4d5eda904054382c118622d2d46546189dbbf70b':
Add Per-User logging of UsageStats
1d2ea07adcec905d79a547f0407f9a64f5aa193f 25-Jul-2014 Kenny Guy <kennyguy@google.com> am 2afedc82: am 0f151df6: Add method to launch settings app details page.

* commit '2afedc8225d754f8422c96ae04988d7ce9891aa9':
Add method to launch settings app details page.
288db80e04913897640ba84c196d5d6d25e14368 25-Jul-2014 Narayan Kamath <narayan@google.com> am 1f4a1c58: am a589b67f: Merge "Handle apps that share a UID with the system_server correctly." into lmp-dev

* commit '1f4a1c5823e11dd48a0d076ab88f33a32aef478a':
Handle apps that share a UID with the system_server correctly.
4e070e33dd187262f0382d276fd8c1fc42c14a26 25-Jul-2014 Narayan Kamath <narayan@google.com> am bbe9386f: am 77075e88: Merge "Handle renderscript apps in the system partition correctly." into lmp-dev

* commit 'bbe9386f0f639bde8422c1d02ea9c614cd396117':
Handle renderscript apps in the system partition correctly.
7a2cb299a0fffba8ad4eb044a57c37d0e42d380b 25-Jul-2014 Adrian Roos <roosa@google.com> am f8a01f5f: am 6468d5c2: Merge "Restart trust agents when updated or when they are dead" into lmp-dev

* commit 'f8a01f5f011dc9e1324fc2b54fcf4d9e0695da37':
Restart trust agents when updated or when they are dead
a8f076e8c3e4750d9860cc24376838bad73ba7a1 25-Jul-2014 Nicolas Prevot <nprevot@google.com> am e7469eca: am c50bbc02: Merge "Migrate extras to ClipData for image/video capture intents." into lmp-dev

* commit 'e7469eca60b76931830e3679788865ee8582add1':
Migrate extras to ClipData for image/video capture intents.
0e2855ae25fbbc70d601a5737415cf069b77e2f1 25-Jul-2014 Yuncheol Heo <ycheo@google.com> am d40418ce: am 0f5a4415: Merge "Check the validity of the port id of HdmiCecMessage only in TV." into lmp-dev

* commit 'd40418ced2a3eaa95d23fce44b32e16a869c6a8a':
Check the validity of the port id of HdmiCecMessage only in TV.
1e9bc752e29934e718cfb6f2628a283199480a45 25-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 260a9884: am 4f2ba445: TIF: Remove ClientState.mInputIds

* commit '260a988429d96d466168865b9ec6153d6d669569':
TIF: Remove ClientState.mInputIds
3d08555edea1efad3f5594ad61d8c92afcded4f9 28-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Give clear distinction between active source/active routing path" into lmp-dev
72b7d738d5b9254594726304cdb1777b54d95631 24-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Give clear distinction between active source/active routing path

Previously in HdmiControlSerivce, active routing path was mixed with
the physical address of the active source, but these two concepts needs
clearer distinction.

Defined a new variable for active source that contains both logical/physical
address to keep active routing path separate. This change makes it possible
to write the flow more closely to the guideline.

Also added to this CL is flag notifyInputChange, which allows the device/
routing change triggered by external event to trigger InputChangeListener
to get TIF notified. For routing control, the device info passed to TIF
has the path information in the field mPhysicalAddress (other fields are
invalid).

Bug: 16519939
Change-Id: I8b400bc48e874b0866500655773aea38ab945fe4
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/RoutingControlAction.java
45b0ff37f1695bf610ef9363c2149fcdd95b1f53 25-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 1e5b3846: am 885c07cf: Merge "Add portID information in HdmiCecDeviceInfo" into lmp-dev

* commit '1e5b38464ff3028064d4d04c60d6a030073d9429':
Add portID information in HdmiCecDeviceInfo
eefb303e660243a9647cfd58a86c55f82edd1998 25-Jul-2014 Jungshik Jang <jayjang@google.com> am 5e93d5bd: am d0af31ad: Merge "Replace osd message for record status with IHdmiRecordCallback." into lmp-dev

* commit '5e93d5bd9d2331b6b9da03025d9e6634f413acc8':
Replace osd message for record status with IHdmiRecordCallback.
7effe8a4f95e0cb4f40b1d981c430fea2de431a0 25-Jul-2014 JP Abgrall <jpa@google.com> am bac1f926: am ff941249: MountService: Fix android.process.media crash repeatedly problem

* commit 'bac1f9265c9432d8ae19928e3a353c3864052c04':
MountService: Fix android.process.media crash repeatedly problem
a74f3e47d766ca843be9312e79acfed0dcff5ee7 25-Jul-2014 Michael Wright <michaelwr@google.com> am 5886d7db: am f5f90d6c: Merge "Flip the permissions checks for video capture." into lmp-dev

* commit '5886d7dba5e8542a6fd87083830f65b09b95e82a':
Flip the permissions checks for video capture.
078a404587d1b1a463cfeea6c7fbeaa9e7cfed5f 25-Jul-2014 Craig Mautner <cmautner@google.com> am 068d3b14: am 89539ae5: Create end of animation callback for Activity

* commit '068d3b142f993e80b83752f78dbe74b4c0bd46df':
Create end of animation callback for Activity
cb6121dc482a2dad5a03533fd48cc05ecc5b3b7e 25-Jul-2014 Christopher Tate <ctate@google.com> am fcacf679: am 1cf19dc7: Turn on debugging override of idle time

* commit 'fcacf679871631ddc16381374becb5213b2ee2df':
Turn on debugging override of idle time
2b1b96ba0f46cb26fec78222625473738c7ff756 25-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am 5641181d: am f5aef029: Merge "Don\'t create a ConnectivityManager when the service isn\'t ready yet." into lmp-dev

* commit '5641181dbaaad61b5cd584044ae85ccf0d436698':
Don't create a ConnectivityManager when the service isn't ready yet.
2423ad19b97227a09df4275b4bacc25276e7cb8c 25-Jul-2014 Amith Yamasani <yamasani@google.com> am 2ec5ef32: am 8fdfdbbb: Call PRE_BOOT_COMPLETED on starting any user

* commit '2ec5ef329f6e36a722f3cac1dac380d75889f603':
Call PRE_BOOT_COMPLETED on starting any user
8ddba1e8e91ddf501d373e0f660548311e95a839 25-Jul-2014 Prashant Malani <pmalani@google.com> am 992f4dee: am 16d220d9: Merge "resolved conflicts for merge of bc3699b1 to lmp-dev" into lmp-dev

* commit '992f4dee4c7e7de7d659129c979187f7e3317607':
Revert "Remove circular mask"
eeaea4f90256df174d0a15f3de6b76870d5006d7 25-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> am 142fc0ca: am 457a09d5: Merge "Fix DUN-based tethering." into lmp-dev

* commit '142fc0ca3326c87b43f873e0a749be78436aa173':
Fix DUN-based tethering.
b33ff850221e9b9f5a0c413f87318ee281b69c10 25-Jul-2014 Craig Mautner <cmautner@google.com> am 93853c4c: am b803a2be: Refactor screen blocking logic.

* commit '93853c4c341ebdc2a630fe76767cbd5d86c8249e':
Refactor screen blocking logic.
f2e791fcdd9b86738c1599b4da3f2301bffddff2 24-Jul-2014 Nicolas Prevot <nprevot@google.com> am 1b4a211d: am 4fe8fe2b: Merge "Making the clipboard work across users." into lmp-dev

* commit '1b4a211dc241c8d7275da97980dd6ea843f42933':
Making the clipboard work across users.
a2ccc146ba1dd7d8aa6b5cae191450a25ff1a47c 24-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am e24b1ccc: am fe199929: Merge "TIF: Handle null main session" into lmp-dev

* commit 'e24b1ccc00a79dec8de5d8b7e27477251b2aca02':
TIF: Handle null main session
24445f62f8ad5424967e6da249df35f270c53469 24-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 8207fa19: am f9203497: Merge "TIF: Fix crash on setMainSession" into lmp-dev

* commit '8207fa194b9f0e2c126b7ee3978d34ba6ca15192':
TIF: Fix crash on setMainSession
b398259496926f71fcda0f878477c7c64c0f8c6a 24-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 1bcb91c1: am 22185ce0: TIF: Support HDMI-CEC active source management

* commit '1bcb91c19bfdc166ff4cacc1dc1569da5416b3fa':
TIF: Support HDMI-CEC active source management
b4862fa7423af464710e254d3f6489a82ba1bd2e 24-Jul-2014 Terry Heo <terryheo@google.com> am 6933e350: am f71dcd8e: Merge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev

* commit '6933e350e6eb1f866578e1f588284706b3401894':
TIF: Enable capturing TV input of TvInputPassthroughWrapperService
6e753f80877a4041e50345f580e95826383f8250 24-Jul-2014 Antoine Labour <piman@google.com> am f6ec140a: am 4a35f41a: Merge "WindowManager: fix clipping" into lmp-dev

* commit 'f6ec140ad67263061c6c9236e1c117c75c1a6dc0':
WindowManager: fix clipping
a81ca12dc36e3176c30b8ee996bdc3f362a3fef3 24-Jul-2014 Jungshik Jang <jayjang@google.com> am 13dcf17a: am 3b4dcfa8: Implement OneTouchRecordAction and stop one touch record.

* commit '13dcf17a859bb88569dc93287d69054d213a3e89':
Implement OneTouchRecordAction and stop one touch record.
8934fd5d6468f915ad3d0451f324e689885e378b 24-Jul-2014 Terry Heo <terryheo@google.com> am 5d41a6b0: am 4d85b87c: Merge "Add a frame capture API of TV input" into lmp-dev

* commit '5d41a6b0ca5f44d7eeca9d853a468a3a899f0c49':
Add a frame capture API of TV input
832f82f9ebf2525266c3c2ba5da3b69b00d2bde7 24-Jul-2014 Geoffrey Borggaard <geoffreyb@google.com> am 1b09c716: am d07b648b: Merge "Fixes setting password through DevicePolicyManager" into lmp-dev

* commit '1b09c716096ccada799c6fde6cb397b3e307b709':
Fixes setting password through DevicePolicyManager
7d1081531db42b5e0f020f80b784004d7e8bcea9 24-Jul-2014 Matthew Williams <mjwilliams@google.com> am 083e4b24: am 0e61a7c0: Merge "Fix JobScheduler race condition" into lmp-dev

* commit '083e4b24c978e380e6a7c864a00257f585eb51c7':
Fix JobScheduler race condition
d90cd59507a6b4e8d7bc9964c7c57dd1b30a1c82 27-Jul-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Remove hardcoded package name filters." into lmp-dev
c54459fb9469b60d85bff716c5f53c55ba0fc784 27-Jul-2014 John Spurlock <jspurlock@google.com> Zen: Remove hardcoded package name filters.

Bug:15474885
Change-Id: I282cc3d597b2a8855bcb4e987a11cea04f956bad
ava/com/android/server/notification/ZenLog.java
ava/com/android/server/notification/ZenModeHelper.java
cad5768e22e5132efb2e5179f4988a763c7a8d9e 26-Jul-2014 John Spurlock <jspurlock@google.com> Doze: Update tease signal to buzz-beep-blink from NoMan.

Inform SystemUI when NoMan buzzes, beeps or blinks. Use that
as the notification signal when dozing instead of trying to figure
out interesting panel content updates.

At some point, we should move the entire calculation up into SystemUI
itself, but that's too large of a refactoring to perform now.

Bug:15863249
Change-Id: I40e92334977e0676a1363774c2cbbf91d72ec8e5
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerInternal.java
ava/com/android/server/statusbar/StatusBarManagerService.java
a7fa6a27c2b43c3f8ac3123d2f7d1c45bd446d7e 25-Jul-2014 Adam Lesinski <adamlesinski@google.com> am 081a7ac6: am 4d5eda90: am 42460fd6: Add Per-User logging of UsageStats

* commit '081a7ac698372147ff472935febc7fac484a3879':
Add Per-User logging of UsageStats
b7aa6b22b256d5c34ac72b06e0a1fed0a44cbb32 25-Jul-2014 Kenny Guy <kennyguy@google.com> am 5984703a: am 2afedc82: am 0f151df6: Add method to launch settings app details page.

* commit '5984703aed48789a7aaa6dd0d1dd55a288f7529a':
Add method to launch settings app details page.
198c47b054f0cd5d9986b8669877a15fe1c6aa7e 25-Jul-2014 Narayan Kamath <narayan@google.com> am 280023dd: am 1f4a1c58: am a589b67f: Merge "Handle apps that share a UID with the system_server correctly." into lmp-dev

* commit '280023dd0fab4ea915a298046d570708783b9780':
Handle apps that share a UID with the system_server correctly.
390dfc160dc5345541d08aea5ecd1e56ac09af53 25-Jul-2014 Narayan Kamath <narayan@google.com> am faa2243f: am bbe9386f: am 77075e88: Merge "Handle renderscript apps in the system partition correctly." into lmp-dev

* commit 'faa2243f6965319e743d6e438235d59cba0aab09':
Handle renderscript apps in the system partition correctly.
b42fe576f6f4b194866fde51175cd7062a4a435d 25-Jul-2014 Adrian Roos <roosa@google.com> am 5de758d3: am f8a01f5f: am 6468d5c2: Merge "Restart trust agents when updated or when they are dead" into lmp-dev

* commit '5de758d3868b036f5067ad9f86ee7b02331e4818':
Restart trust agents when updated or when they are dead
73b941f761270c71616fe44fa0727aa79345604c 25-Jul-2014 Nicolas Prevot <nprevot@google.com> am c5435cdd: am e7469eca: am c50bbc02: Merge "Migrate extras to ClipData for image/video capture intents." into lmp-dev

* commit 'c5435cdd91f6778d753f99ee6ee8c5132e0ae962':
Migrate extras to ClipData for image/video capture intents.
20c8e702d41306bddec30c10e2b8637322081e64 25-Jul-2014 Yuncheol Heo <ycheo@google.com> am 6eea71e1: am d40418ce: am 0f5a4415: Merge "Check the validity of the port id of HdmiCecMessage only in TV." into lmp-dev

* commit '6eea71e1083a3fad3d08d961cd0343bc3380e75e':
Check the validity of the port id of HdmiCecMessage only in TV.
6883282c5eafb8b7d50389dac2ee906447f0b580 25-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 05c76f4d: am 260a9884: am 4f2ba445: TIF: Remove ClientState.mInputIds

* commit '05c76f4d8412d8347b3b09d6ac66087507e8f885':
TIF: Remove ClientState.mInputIds
8419e0e0af1e62d81a118093546c464308e8d8bc 25-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 9b362265: am 1e5b3846: am 885c07cf: Merge "Add portID information in HdmiCecDeviceInfo" into lmp-dev

* commit '9b3622659f0981dcf355134921630a4f26116f32':
Add portID information in HdmiCecDeviceInfo
94eab7d1cf9edb135b9b399c9646642fa12904c2 25-Jul-2014 Jungshik Jang <jayjang@google.com> am 0998d7e2: am 5e93d5bd: am d0af31ad: Merge "Replace osd message for record status with IHdmiRecordCallback." into lmp-dev

* commit '0998d7e2fc2e4331d29bd990d19b8eef56a978c8':
Replace osd message for record status with IHdmiRecordCallback.
19290e9b6d6595eb9cf62b4562903ab6ed8fc2c5 25-Jul-2014 JP Abgrall <jpa@google.com> am 7aa357d9: am bac1f926: am ff941249: MountService: Fix android.process.media crash repeatedly problem

* commit '7aa357d92323b31a3ac2962d562fb48f93142d5e':
MountService: Fix android.process.media crash repeatedly problem
cd2c936c26c97f8e66525f7f8c242fca07cdd289 25-Jul-2014 Michael Wright <michaelwr@google.com> am d23d915b: am 5886d7db: am f5f90d6c: Merge "Flip the permissions checks for video capture." into lmp-dev

* commit 'd23d915bed5ed1b5bdd5d8b1716fb71983240722':
Flip the permissions checks for video capture.
0f1f8c9a77ae5df5fe2bb3fa6c98a359674b1c7f 25-Jul-2014 Craig Mautner <cmautner@google.com> am 97886c4c: am 068d3b14: am 89539ae5: Create end of animation callback for Activity

* commit '97886c4c435881590069911bcfbfc38e037841b2':
Create end of animation callback for Activity
7444eac6262ac601b5331bf6bb1c4360dbedaa40 25-Jul-2014 Christopher Tate <ctate@google.com> am 5037ad87: am fcacf679: am 1cf19dc7: Turn on debugging override of idle time

* commit '5037ad87a5a9a0d1d7a8b8af0e1f676c9d0514a8':
Turn on debugging override of idle time
44a7fb9626ebb71082f1fbcab31bcd462d01cc67 25-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am 13eb1c78: am 5641181d: am f5aef029: Merge "Don\'t create a ConnectivityManager when the service isn\'t ready yet." into lmp-dev

* commit '13eb1c784bb6a9e08b0ff5d3e6a5c97b5dad78f5':
Don't create a ConnectivityManager when the service isn't ready yet.
032a8f2a21d172b00bdb8a3421c75cfb6e1e285f 25-Jul-2014 Amith Yamasani <yamasani@google.com> am 4386e810: am 2ec5ef32: am 8fdfdbbb: Call PRE_BOOT_COMPLETED on starting any user

* commit '4386e81064b58494419b2cc210a46e758696a76a':
Call PRE_BOOT_COMPLETED on starting any user
5b8bb3c4594039729dfed8e1f4d9ccb52d6bafc5 25-Jul-2014 Prashant Malani <pmalani@google.com> am 8ecdc61e: am 992f4dee: am 16d220d9: Merge "resolved conflicts for merge of bc3699b1 to lmp-dev" into lmp-dev

* commit '8ecdc61ee2ff425bb6f1ca31bc20c76a4f35b24b':
Revert "Remove circular mask"
e8ce885918ba3eed4be9388d4d496c4567833850 25-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> am f70323fe: am 142fc0ca: am 457a09d5: Merge "Fix DUN-based tethering." into lmp-dev

* commit 'f70323feeb34650e033ae9e19bdd5fb6f2f100b4':
Fix DUN-based tethering.
a5fccc36628cb779a93eed63b4c2b1234e761ebb 25-Jul-2014 Craig Mautner <cmautner@google.com> am afb2c674: am 93853c4c: am b803a2be: Refactor screen blocking logic.

* commit 'afb2c674aa52afdb9d63140bfe442285769a3cc3':
Refactor screen blocking logic.
3f7777fa4f1d392e18bad39edcd4539880c52ff9 24-Jul-2014 Nicolas Prevot <nprevot@google.com> Storing the app who sets a CrossProfileIntentFilter.

When we add a CrossProfileIntentFilter, we store the package and userId of the calling app
inside the CrossProfileIntentFilter.
When an app calls clearCrossProfileIntentFilters, we only remove the filters that the calling app
has set itself.

BUG: 16537557

Change-Id: I6e7bc859383ea66553d9f4230365df8ba27525f3
ava/com/android/server/pm/CrossProfileIntentFilter.java
ava/com/android/server/pm/PackageManagerService.java
b593e79436593b5b73416c65743c86118d03a6bc 24-Jul-2014 Nicolas Prevot <nprevot@google.com> am 498694c6: am 1b4a211d: am 4fe8fe2b: Merge "Making the clipboard work across users." into lmp-dev

* commit '498694c67112923f85f3572c4b7ad093283d1f68':
Making the clipboard work across users.
537f496ad9eabb09ecc1bbbe25646bc58a8f70d3 24-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 16200052: am e24b1ccc: am fe199929: Merge "TIF: Handle null main session" into lmp-dev

* commit '162000520bbddd75049f6ecfd81b54ab493b69ac':
TIF: Handle null main session
8b4aab7eff00a62804072cbe272513fc012f5e92 24-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 22f6a0b6: am 8207fa19: am f9203497: Merge "TIF: Fix crash on setMainSession" into lmp-dev

* commit '22f6a0b6ad69fbfd0fbe01642277f3694f3ae384':
TIF: Fix crash on setMainSession
27135a3a2ef8dfea10df0e9a1d779c1f0dc23533 24-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 0f5ffe28: am 1bcb91c1: am 22185ce0: TIF: Support HDMI-CEC active source management

* commit '0f5ffe28428bc901771fa14807c199020aa99905':
TIF: Support HDMI-CEC active source management
81f54c8367c9ee2b1267a56544851fba396a33c6 24-Jul-2014 Terry Heo <terryheo@google.com> am e3f7d3e2: am 6933e350: am f71dcd8e: Merge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev

* commit 'e3f7d3e21fe1e1fa42df32b41da9d13f85066fe5':
TIF: Enable capturing TV input of TvInputPassthroughWrapperService
ffcacfeedc5d85b979ba064c557966101252db94 24-Jul-2014 Antoine Labour <piman@google.com> am c7b10d9f: am f6ec140a: am 4a35f41a: Merge "WindowManager: fix clipping" into lmp-dev

* commit 'c7b10d9f79f2855f06bb54913e44d282a17c9247':
WindowManager: fix clipping
a50b1b28f5594e86cc8dcdf1d975c6eeb9779626 24-Jul-2014 Jungshik Jang <jayjang@google.com> am 7ba466ea: am 13dcf17a: am 3b4dcfa8: Implement OneTouchRecordAction and stop one touch record.

* commit '7ba466ea44d1fcd04efd1adec094bcb32cc18c28':
Implement OneTouchRecordAction and stop one touch record.
934c70b8640e68872f83356ead7e2b7d1a9dec38 24-Jul-2014 Terry Heo <terryheo@google.com> am 3657316e: am 5d41a6b0: am 4d85b87c: Merge "Add a frame capture API of TV input" into lmp-dev

* commit '3657316e922a48b2290a7d59b2ce0ea383cb43fa':
Add a frame capture API of TV input
d213923d48a404e949e9527a98113fa78d010cf3 24-Jul-2014 Geoffrey Borggaard <geoffreyb@google.com> am 83e405ec: am 1b09c716: am d07b648b: Merge "Fixes setting password through DevicePolicyManager" into lmp-dev

* commit '83e405ec2dc5430f5f9bb4cec68ca85412441838':
Fixes setting password through DevicePolicyManager
4aa3ab95ffcd5859f2f362a077363b2136f081cb 24-Jul-2014 Matthew Williams <mjwilliams@google.com> am cb8aca78: am 083e4b24: am 0e61a7c0: Merge "Fix JobScheduler race condition" into lmp-dev

* commit 'cb8aca78fca1c37e209dc44dbbe25b7e180dfd65':
Fix JobScheduler race condition
4c52697dbed682a19dacc78b0c08931ea8dbc6b5 21-Jul-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Support HDMI-CEC active source management

Add system API TvView.setMain() and TvInputService.onSetMain().

Bug: 15994065
Change-Id: I60ac24659453ca616380993c4accd8c17e714639
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
b6591b8e5399099dc6b7693e0fc719b613aba89c 23-Jul-2014 Jungshik Jang <jayjang@google.com> Implement OneTouchRecordAction and stop one touch record.

In addition to it, add api for clearTimerRecording as well.
Separately, I will replace logic for notifying message with callback
interface.

Bug: 16160962

Change-Id: I2368f7c697eb44ed4542c0ec4412c63a6ae41a5c
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/OneTouchRecordAction.java
a04ea61db5566f05d5c783b2f62614aa03005be9 19-Jul-2014 Prashant Malani <pmalani@google.com> Revert "Remove circular mask"

This reverts commit 2e8b27e898af3af1165a79e7c5f8b59f63f20a2f.

It also makes the circularMask option configurable via overlay.
It is set to false by default.

An offset dimension entry is also provided, for displays which have
a "chin". This is set to 0 by default.

Bug: 16380982
Change-Id: I16ec3e8d8882a6683c9155055944e5c2f5cd781e
ava/com/android/server/wm/CircularDisplayMask.java
ava/com/android/server/wm/WindowManagerService.java
8c747cab641839121d054ea23de32dd66e27ff93 24-Jul-2014 destradaa <destradaa@google.com> am cb47ca7e: am 32acd391: am 87a50e32: Merge "Expose Gps Navigation Messages in the platform. b/16405976" into lmp-dev

* commit 'cb47ca7e733462b8db932ec3407309d73b1c0100':
Expose Gps Navigation Messages in the platform. b/16405976
7c469f1aec075798610d45875016f6eacd7933c6 23-Jul-2014 destradaa <destradaa@google.com> am 32acd391: am 87a50e32: Merge "Expose Gps Navigation Messages in the platform. b/16405976" into lmp-dev

* commit '32acd391035535ccec902458befd5353e7d1ec4b':
Expose Gps Navigation Messages in the platform. b/16405976
19de3bddc91e608da4e30aedd8f475ad35f33884 23-Jul-2014 Jeff Sharkey <jsharkey@android.com> am f131525b: am af043268: am 7bf4f48f: Remove APK observers.

* commit 'f131525b29457031615eb35903445aa4318a69df':
Remove APK observers.
ff33a988dd7bf61b5a8f6b49549efd912d44da7d 23-Jul-2014 Jeff Sharkey <jsharkey@android.com> am af043268: am 7bf4f48f: Remove APK observers.

* commit 'af043268f0f27620be25de18109c7e1ba691906f':
Remove APK observers.
84e71d1d61c53cd947becc7879e05947be681103 23-Jul-2014 Jeff Sharkey <jsharkey@android.com> Remove APK observers.

Most app installations have migrated to the new cluster-style layout
where each app is placed in a unique directory. There are now two
general issues with these observers:

We can't know when a push/sync has finished delivering all splits
for an app. Also, inotify isn't recursive, so we'd have to manage
watches for each app directory.

Change-Id: I3770fa9059ddf80f933a3804714f2e52591fce49
ava/com/android/server/pm/PackageManagerService.java
2e23f3b184100b92ae06a94b95e2b69e7c2bc6ff 23-Jul-2014 Gabriel Peal <gpeal@google.com> am 7062d88d: am 6aac8cf7: am f2b4f70b: Merge changes I925c8738,I1a8ad5c2 into lmp-dev

* commit '7062d88de40de8e6dd160bc9a10922aa0a9ff7d7':
Added Action to PlaybackState
Added QueueState, playUri, and playFromSearch.
e3daa56441504da3172e26e4a011497be121f4e4 23-Jul-2014 Gabriel Peal <gpeal@google.com> am 6aac8cf7: am f2b4f70b: Merge changes I925c8738,I1a8ad5c2 into lmp-dev

* commit '6aac8cf7bccf5ab47b89fa69d9963c123701bcbb':
Added Action to PlaybackState
Added QueueState, playUri, and playFromSearch.
f57168ef86ecc24cb04fa6966ec579d43dfc19a0 23-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> am 678108fc: am 819917e3: am dc9d7aa7: Merge "Reenable logging." into lmp-dev

* commit '678108fc7ead5783040da41a87b2bc01a9a5c353':
Reenable logging.
22aab81e2ca8b54864cd70ae76862069d87ac6fa 23-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> am 819917e3: am dc9d7aa7: Merge "Reenable logging." into lmp-dev

* commit '819917e3eb54dacba025c8516ed7d8b5eeaf419b':
Reenable logging.
abca0ee7949f59e72b8d2764dafa23af18eb51db 24-Jul-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Handle null main session

Change-Id: I5d9007e706d2adf4b559839c1db31221527214ec
ava/com/android/server/tv/TvInputManagerService.java
982abe693f66037ca265b88057eceb5a3e815182 24-Jul-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Fix crash on setMainSession

Change-Id: Iddf5032a99dbf855e418448b39ba66a68be8b07c
ava/com/android/server/tv/TvInputManagerService.java
a8177c887954908a360997a14ae23c36258d3fc4 24-Jul-2014 Terry Heo <terryheo@google.com> Merge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev
79124a717c09f12c74d587d3977bf33ca37e6420 21-Jul-2014 Terry Heo <terryheo@google.com> TIF: Enable capturing TV input of TvInputPassthroughWrapperService

Also fixed usage of Log.e() in TvInputService to show stack trace.

Bug: 16441553
Change-Id: I5c160de4a628698907ffd00510d982d597c0ea01
ava/com/android/server/tv/TvInputManagerService.java
f1939901d2ed0480069f0b23be64f122fce93995 25-Jun-2014 Nicolas Prevot <nprevot@google.com> Making the clipboard work across users.

When copying from the parent: the ClipData can be pasted in the managed profile.
When copying from a managed profile: it can be pasted in the parent,
unless the policies says it's disabled. In which case, the clipboard of the parent becomes empty.
Supporting content uris.

BUG: 15186236

Change-Id: I522564a7c07ff21df137adcda980bb52e5739964
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/clipboard/ClipboardService.java
c086a3df3b28996cd10ebe42c5f59035d054aa0d 18-Jun-2014 Terry Heo <terryheo@google.com> Add a frame capture API of TV input

- Added new permission CAPTURE_TV_INPUT

Bug: 15736756
Change-Id: I2ae8b2e3f5b1ad1d525854ed89ab2043cf66acbe
ava/com/android/server/tv/TvInputHal.java
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
ni/com_android_server_tv_TvInputHal.cpp
8b0c934092e8f341ec22752bcf0f197fdc686f4a 23-Jul-2014 Craig Mautner <cmautner@google.com> am 79c98fb1: am 41505285: am 59f55203: Disable back button goes to recents behavior

* commit '79c98fb136ca0b17250302f2e3b600d0ee129d92':
Disable back button goes to recents behavior
699a295bb8f7864a6872153c650c84b506a5de6c 23-Jul-2014 Craig Mautner <cmautner@google.com> am 41505285: am 59f55203: Disable back button goes to recents behavior

* commit '41505285136f349f281df0dade79f17b353971ff':
Disable back button goes to recents behavior
021fa35d2f6dcfb9253b13909c08aa94761bf608 23-Jul-2014 Jason Monk <jmonk@google.com> am 06bbb1e7: am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev

* commit '06bbb1e71e17151b1de7827c9c59c8a14f00d87c':
Make the 'locked' lock task not lock keyguard on exit
0b633fc12188ac9a78c0cea9cacc8e90d08260dc 23-Jul-2014 Craig Mautner <cmautner@google.com> Disable back button goes to recents behavior

Using a static final boolean to do this so if policy is changed it
can be enabled easily.

Also fix fetching task from wrong list. Was causing
ActivityNotFoundExceptions.

Fixes bug 16512561.

Change-Id: I9b47a86fd740d45104aa14712e71df830218c5a7
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/TaskRecord.java
a979c5573bcdaecdf4d19bdebb52d982a12c9cfa 23-Jul-2014 Jason Monk <jmonk@google.com> am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev

* commit '01f4253b2d2d6e8e198f0adc57c9eb73ce8c136f':
Make the 'locked' lock task not lock keyguard on exit
7699651ec4fb38efb868c075dfbe10ddc19a1d6a 24-Jul-2014 Antoine Labour <piman@google.com> Merge "WindowManager: fix clipping" into lmp-dev
7db8687d579c47ca5e45f3c50d39f0b324d11c22 24-Jul-2014 Antoine Labour <piman@google.com> WindowManager: fix clipping

The animation code has some logic to avoid committing a new clip rect
when it hasn't changed. However, when we destroy the SurfaceControl and
recreate it later, we failed to reset the cached value, so if the clip
rect hasn't changed, we never set it on the new SurfaceControl.

This patch resets the cached value when creating the SurfaceControl.

Change-Id: I355576709834dd80994c7564330a234b182800e6
ava/com/android/server/wm/WindowStateAnimator.java
b8cb6518d8a0528a565a9d2cfeca17ccf5ff4b4a 23-Jul-2014 Gabriel Peal <gpeal@google.com> Merge changes I925c8738,I1a8ad5c2 into lmp-dev

* changes:
Added Action to PlaybackState
Added QueueState, playUri, and playFromSearch.
ec80cd8e7c2c13123f1370edfa935115eb9a9164 23-Jul-2014 destradaa <destradaa@google.com> Merge "Expose Gps Navigation Messages in the platform. b/16405976" into lmp-dev
c827f813e153b4656bb52be628d7a7697897be78 23-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Reenable logging." into lmp-dev
a7d31bf3076a8c3ed5e9decbdf913534fd15ff66 23-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Reenable logging.

ConnectivityService has been rewritten for L and is in a stabilizing period.
We need the logging to track down bugs people report.
Restoring to Pre-L conditions.

If there's excess logging please report it - it probably indicates a bug.

Change-Id: I7baf891e3bf12e1545afeb92b8d5af0b01e12a7b
ava/com/android/server/ConnectivityService.java
f364f944962c4ec66f5e5b33dafe8480f38f6db6 22-Jul-2014 Gabriel Peal <gpeal@google.com> Added Action to PlaybackState

Added the ability to discover MediaBrowsers

Change-Id: I925c8738ac73afd0bee3dada2ee7ff2d5047e63f
ava/com/android/server/media/MediaSessionRecord.java
f0593bc17b61c872ae2d7705fb598c5e5056e679 22-Jul-2014 Gabriel Peal <gpeal@google.com> Added QueueState, playUri, and playFromSearch.

Added QueueState to MediaSession/MediaController
Added play(Uri) and playFromSearch(String) to MediaController.TransportControls

Change-Id: I1a8ad5c22d05015ab6ff5700dc8a758455f1d89b
ava/com/android/server/media/MediaSessionRecord.java
8ed4d5ac664f2442c9fd9d9861abd6d589dac73b 23-Jul-2014 Jason Monk <jmonk@google.com> Merge "Make the 'locked' lock task not lock keyguard on exit" into lmp-dev
ba3f4c3bed0c5232c15a6de06b9beb5f59f0185d 23-Jul-2014 Jeff Davidson <jpd@google.com> am c8c398e1: am fb28414b: am d0868c89: Implement VpnService.setBlocking().

* commit 'c8c398e192a565811e7e1e4a0e3d54aa0fe7c852':
Implement VpnService.setBlocking().
44e2be10f6e8748a52a913942f067a01f865fb2e 23-Jul-2014 Jeff Davidson <jpd@google.com> am fb28414b: am d0868c89: Implement VpnService.setBlocking().

* commit 'fb28414b5a1d32e023c74c755fa0283290414606':
Implement VpnService.setBlocking().
7968b28ad8e8653d0c1f8eeb7041a67f8d18f71a 24-Jul-2014 Geoffrey Borggaard <geoffreyb@google.com> Merge "Fixes setting password through DevicePolicyManager" into lmp-dev
987672d2621fa5278dbf48cbef46c50d3fafe4c1 18-Jul-2014 Geoffrey Borggaard <geoffreyb@google.com> Fixes setting password through DevicePolicyManager

LockPatternUtils wasn't taking the userId into account when
looking up the salt.
Bug: 16204999

Change-Id: I0626b5a0a55c244122c24fb4446f270918f3187c
ava/com/android/server/LockSettingsService.java
6bbf39cf6b81222f32d2b66b8fa85d562e0ad71c 23-Jul-2014 Jeff Davidson <jpd@google.com> Implement VpnService.setBlocking().

Bug: 12879610
Change-Id: I3a0ad9eae5f7dd9c01f75b9da71810bad38f9fec
ava/com/android/server/connectivity/Vpn.java
01ac45b6ff2334925c8d24b5278b44e5e30f5622 23-Jul-2014 Matthew Williams <mjwilliams@google.com> Fix JobScheduler race condition

The loading of jobs from disk is now done sychronously.

Bug: 16372824
Change-Id: Ica0592d6de51e89662c9e49ed1eb59209b64356c
ava/com/android/server/job/JobMapReadFinishedListener.java
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/JobStore.java
2961ce599ebee4895d2c9720fff7f011e7d4a0cd 23-Jul-2014 Jason Monk <jmonk@google.com> Make the 'locked' lock task not lock keyguard on exit

While here also fix mIsLockTaskLocked to actually be set to a value
so that it can be used.

Bug: 16347391
Change-Id: I27416f4787b28d19d84f895889eea1d3202c1759
ava/com/android/server/am/ActivityStackSupervisor.java
4b3e3931270f8e406fc806bc7fa1c2788256687d 22-Jul-2014 destradaa <destradaa@google.com> Expose Gps Navigation Messages in the platform.
b/16405976

Change-Id: Ic982ea2467d116585780c20c2fa7e974e50f8345
ava/com/android/server/LocationManagerService.java
ava/com/android/server/location/GpsLocationProvider.java
ava/com/android/server/location/GpsMeasurementsProvider.java
ava/com/android/server/location/GpsNavigationMessageProvider.java
ava/com/android/server/location/GpsStatusListenerHelper.java
ava/com/android/server/location/RemoteListenerHelper.java
ni/com_android_server_location_GpsLocationProvider.cpp
627ec760b0de6045ed05ecd5b450251d6d5b94fc 23-Jul-2014 RoboErik <epastern@google.com> am 1edef222: am 67430c74: am 80380f82: Switch Session APIs over to AudioAttributes

* commit '1edef22273242f5f08a45a064e8d197a6bd08892':
Switch Session APIs over to AudioAttributes
397beaf4323f80c8f228db8e9b6ee0165781e13a 23-Jul-2014 RoboErik <epastern@google.com> am 67430c74: am 80380f82: Switch Session APIs over to AudioAttributes

* commit '67430c74d436e58d92b0d53ffdca1de5ded20c58':
Switch Session APIs over to AudioAttributes
cb2303e3656d8f780b338a888cf97d3a8e38be26 23-Jul-2014 Dianne Hackborn <hackbod@google.com> am 6d4507fc: am 9566ecd9: am 79399931: Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev

* commit '6d4507fcbeb8a550156efa7cd94cd69f041b5835':
Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
549d39e5496633852467d3245386151cae88fce9 23-Jul-2014 Sander Alewijnse <salewijnse@google.com> am f3c523e0: am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev

* commit 'f3c523e06217b19ae8389f9ca8be71ed2cd9fe7b':
Add Device Policy API to disable screen capture.
bfa2253e4b8a7e866221d86966b6f19b4db2069f 23-Jul-2014 Dianne Hackborn <hackbod@google.com> am 9566ecd9: am 79399931: Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev

* commit '9566ecd9fbac848ba576282fd9ee315c33b28f0e':
Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
8e1a01a49c425572e6832419453d72110d137788 23-Jul-2014 Sander Alewijnse <salewijnse@google.com> am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev

* commit 'ce1088a641b0027df04e3388a73423294262d547':
Add Device Policy API to disable screen capture.
9db9bf7034d7dcdf596dc22d521b18975d0dd2b9 21-Jul-2014 RoboErik <epastern@google.com> Switch Session APIs over to AudioAttributes

The session apis were using audioStream in several places. This
updates them to use AudioAttributes instead.

bug:16403289
Change-Id: Ic4da9ca5fbea2536e80c71503bd9a9bf7f346997
ava/com/android/server/media/MediaSessionRecord.java
73cc43da360cd04075f0fd0da2ba16ee423e2a2c 23-Jul-2014 Chris Wren <cwren@android.com> am f03ef334: am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking.

* commit 'f03ef334c4e91643ba834d136b489f28cfbaf117':
Honor the sort and group keys for notification ranking.
941d57ad86ee8b30e0d3ae74fb4b01944be06476 23-Jul-2014 Chris Wren <cwren@android.com> am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking.

* commit '43387c0c2cfc0b319f3a6884e5008f1d18e0c8b2':
Honor the sort and group keys for notification ranking.
1031c974855ff4117a6d7866e664295786840319 23-Jul-2014 Chris Wren <cwren@android.com> Honor the sort and group keys for notification ranking.

Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Expose a new API for listeners to get the group key for the notificaiton.

Bug: 15190903
Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
ava/com/android/server/notification/GroupedNotificationComparator.java
ava/com/android/server/notification/NotificationComparator.java
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/RankingHelper.java
839ebf934f0eab8303b2d86de22305e77c23fa5b 23-Jul-2014 Chris Wren <cwren@android.com> am 632fc54e: am 1ef27c1c: am 8980a58d: Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev

* commit '632fc54ee1c4ca2fb29408a6a65be02ba3e66f3a':
Revert "Honor the sort and group keys for notification ranking."
bd65c7ac282d2f4d5cb10cb41c3cd0d96eeef4fe 23-Jul-2014 Chris Wren <cwren@android.com> am 09401565: am 14d65e68: am df09d4c3: Honor the sort and group keys for notification ranking.

* commit '09401565fa471596b37e9780c347c54cedbb84a8':
Honor the sort and group keys for notification ranking.
3cf87144892047d233c34ca6950b18e9b6df9199 23-Jul-2014 Nicolas Prevot <nprevot@google.com> am 06a9e5b8: am b5b6f33e: am ea6f0c52: Fixing cross-user content.

* commit '06a9e5b8fd3abccdc2c24ec53b2fcb484948402b':
Fixing cross-user content.
d611df99dc9b4e57940384fcc70262b385a5edea 23-Jul-2014 Jungshik Jang <jayjang@google.com> am 7722d859: am c1d403f6: am da251030: Add startTimerRecording api to IHdmiControlService.

* commit '7722d859bb4c4e54632ddf7529e4bfca7dff00a7':
Add startTimerRecording api to IHdmiControlService.
3df361a8b1b514ccff1f2b7dbb4fc9cbec854543 23-Jul-2014 Youngsang Cho <youngsang@google.com> am ed979b92: am 5b0fca67: am 76f8d671: Block logging watched histories for passthrough inputs

* commit 'ed979b920c8a15536dc9bec7cbf394726cb68b6b':
Block logging watched histories for passthrough inputs
9246171277a6f45f27247d586e18ed729fdbda13 23-Jul-2014 Chris Wren <cwren@android.com> am 1ef27c1c: am 8980a58d: Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev

* commit '1ef27c1c9e9fb035951ca88881399fa3f57564df':
Revert "Honor the sort and group keys for notification ranking."
636f360ba5036447e1c922277f060f730c84b2d7 23-Jul-2014 Chris Wren <cwren@android.com> am 14d65e68: am df09d4c3: Honor the sort and group keys for notification ranking.

* commit '14d65e68ad753c2384785061ea6e470a995dcab6':
Honor the sort and group keys for notification ranking.
2a9844c5cc0621682f32ae8d60da9722861b4625 23-Jul-2014 Nicolas Prevot <nprevot@google.com> am b5b6f33e: am ea6f0c52: Fixing cross-user content.

* commit 'b5b6f33e777a62fc400e21ab73c2a78ba1c974e9':
Fixing cross-user content.
cfd1fa6357c4ce5f0189b73e4a8886c9a440cc1c 23-Jul-2014 Jungshik Jang <jayjang@google.com> am c1d403f6: am da251030: Add startTimerRecording api to IHdmiControlService.

* commit 'c1d403f661b6c7b9339e983e7f89a4c7e287e72b':
Add startTimerRecording api to IHdmiControlService.
74065729c46cc6f39f42bf71a1c3f4a87977f67c 23-Jul-2014 Youngsang Cho <youngsang@google.com> am 5b0fca67: am 76f8d671: Block logging watched histories for passthrough inputs

* commit '5b0fca67b75204fb886e541719e6f049ed932dc5':
Block logging watched histories for passthrough inputs
4a24fd3c7bab53e4e9c127214e7168db0af8800a 17-Jul-2014 Chris Wren <cwren@android.com> Honor the sort and group keys for notification ranking.

Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Bug: 15190903
Change-Id: I377ed65b9592079446da4a4189f5ab49d28630ec
ava/com/android/server/notification/GroupedNotificationComparator.java
ava/com/android/server/notification/NotificationComparator.java
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/RankingHelper.java
66adae84d7e1475c4422d80860eed17e234ab8a9 21-Jul-2014 Nicolas Prevot <nprevot@google.com> Fixing cross-user content.

Change-Id: I1f1beb514950f808ed9113357c3172bddcb06d9e
ava/com/android/server/am/ActivityManagerService.java
bffb0635aaaaf9140d9120e3f3d95a4f7391a0ac 22-Jul-2014 Jungshik Jang <jayjang@google.com> Add startTimerRecording api to IHdmiControlService.

In order to support timer recording we need separate API,
startTimerRecording. Also added HdmiTimerRecordingSources
which is used to help creating timer recording information
such as timing information and program information.

Besides, in order to distinguish one touch record
and timer recording, rename startRecord with startOneTouchRecording.

Bug: 16160962
Change-Id: I8c3d4034665a2f84ddf07135aee73e17ac17cd82
ava/com/android/server/hdmi/HdmiControlService.java
0c1dcfd1618b1042c74100965f0e79c1c954c5c4 23-Jul-2014 Sander Alewijnse <salewijnse@google.com> Merge "Add Device Policy API to disable screen capture." into lmp-dev
d2a1eec400128f39e1b223a720a88dbd395f3e6e 09-Jul-2014 Sander Alewijnse <salewijnse@google.com> Add Device Policy API to disable screen capture.

WindowManager will set secure flag on SurfaceControl for
all windows of a flagged user to prevent screen capture.
API is consistent with the camera disable API.

Change-Id: Ib180f67f1ad827b6f4aca2af615274256cce58f4
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
cf7ed583080b6c958f5a02817110505bae2a17df 23-Jul-2014 Chris Wren <cwren@android.com> Revert "Honor the sort and group keys for notification ranking."

This reverts commit df09d4c348f9f2aea10391b27d157d8b71a9e189.

Change-Id: Idbc9ed5c5c83cd0cad5a71872bcc203321a11e9e
ava/com/android/server/notification/GroupedNotificationComparator.java
ava/com/android/server/notification/NotificationComparator.java
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/RankingHelper.java
008f6d4e326f6372e165bdf342178ecd1e834e2f 23-Jul-2014 Youngsang Cho <youngsang@google.com> Block logging watched histories for passthrough inputs

Added a system API TvContract.isChannelUriForPassthroughTvInput

Change-Id: I933482831ae2a8b4d6000c4d16520387b5b6a13f
ava/com/android/server/tv/TvInputManagerService.java
e31ebda7c23d30bcd4d5190f7dc6ceb6714fcce5 23-Jul-2014 Dianne Hackborn <hackbod@google.com> am 07116b12: am 2c89b4b3: am dc4a88f7: Merge "Further fix on issue #16013164" into lmp-dev

* commit '07116b128e16169c990d973d3fafed3a9200a26e':
Further fix on issue #16013164
7c145504b681568a577e46ed9dac3ca3a595c11e 23-Jul-2014 Dianne Hackborn <hackbod@google.com> am a070ef75: am cf24cfb1: am 7aeb54cf: Merge "Finish toast app op." into lmp-dev

* commit 'a070ef7564f2561c6679f72c178302f2cce36980':
Finish toast app op.
ac725d37b8951d49f26d2bfad9c9cce9e4200f02 23-Jul-2014 Dianne Hackborn <hackbod@google.com> am 2c89b4b3: am dc4a88f7: Merge "Further fix on issue #16013164" into lmp-dev

* commit '2c89b4b3ad6a9c88d5039296839b885843401d01':
Further fix on issue #16013164
f9e523f4afcee8cad5372c6a416c08bda965d9c4 23-Jul-2014 Dianne Hackborn <hackbod@google.com> am cf24cfb1: am 7aeb54cf: Merge "Finish toast app op." into lmp-dev

* commit 'cf24cfb1a1daf045601b1e13b0012a59b66f6572':
Finish toast app op.
b865079f054356e1483464d7d5f13f8d10a2100b 23-Jul-2014 John Spurlock <jspurlock@google.com> am 908be863: am 4368f19f: am 064c40c0: Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev

* commit '908be8637159bc0e89955023fd327ff4c558dc6f':
Wire up CATEGORY_ALARM and CATEGORY_EVENT.
c82bcdfd00a8166394a1e3d26b0c3470b6907a71 23-Jul-2014 John Spurlock <jspurlock@google.com> am 4368f19f: am 064c40c0: Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev

* commit '4368f19f5011891268da673dee4636cf61f3cae7':
Wire up CATEGORY_ALARM and CATEGORY_EVENT.
22661ccf6613d1d6e3edc1f2c29bdc1bd8da7599 23-Jul-2014 Craig Mautner <cmautner@google.com> am d8d4d6a7: am 0ccbb629: am 21668519: Refactor window manager screenshot

* commit 'd8d4d6a7c416b7c9a826af0f39aff4544d6ac654':
Refactor window manager screenshot
acb2a9adf63b2f5cec4e192f36c6b40a292a4f02 23-Jul-2014 Craig Mautner <cmautner@google.com> am 0ccbb629: am 21668519: Refactor window manager screenshot

* commit '0ccbb629079828bc63b1186946f6e2001fef8ea8':
Refactor window manager screenshot
889497e7f85c26736c83112d411fd9c46e99785b 23-Jul-2014 Carlos Valdivia <carlosvaldivia@google.com> am 2d795ce2: am 8725abad: am 26680d5c: Merge "Allow authenticators to rename accounts." into lmp-dev

* commit '2d795ce265eb5d47924d3a0b137b331bdfd9f4c6':
Allow authenticators to rename accounts.
368c5adaf7a1141bfee3cf622efbc7285e370979 23-Jul-2014 Craig Mautner <cmautner@google.com> Refactor window manager screenshot

For readability, and add rotation compensation.

Fixes bug 16142514.

Change-Id: I1156ec2e0f052f6dec56457d56efe95368f60d91
ava/com/android/server/wm/WindowManagerService.java
1321d01b5038a93eda44c522738f4ebedc15074f 23-Jul-2014 Carlos Valdivia <carlosvaldivia@google.com> am 8725abad: am 26680d5c: Merge "Allow authenticators to rename accounts." into lmp-dev

* commit '8725abadce9cda4894780eaa24781a1f878512d5':
Allow authenticators to rename accounts.
6ff73864076c262d463309290c00d678464502d8 23-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am a9dc918b: am a4a22918: am bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev

* commit 'a9dc918b3dc7c45c4c8d45b838d058d1323e092f':
Cleanup: Delete dead code.
3e47b60378f96f5c761e70c8adb1aea14cd41177 23-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am a4a22918: am bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev

* commit 'a4a229185c60f4abf6674adc6a49e5ab7000fb16':
Cleanup: Delete dead code.
7995e144f2c2e7487ec6fadd57bbbb0cdc757739 23-Jul-2014 RoboErik <epastern@google.com> am 1b15ed72: am 390f77b3: am befdf350: Move return out of debug conditional

* commit '1b15ed72211e4996a9b8ee7651f8cc9823cf8b9b':
Move return out of debug conditional
c231679abc01634f242060c5d779908da0238fbd 23-Jul-2014 RoboErik <epastern@google.com> am 390f77b3: am befdf350: Move return out of debug conditional

* commit '390f77b31b6c0cf71578e636154715fe462bcd93':
Move return out of debug conditional
b7c014c291eff2a97f32ce1ae7e42bd8f825c74c 23-Jul-2014 RoboErik <epastern@google.com> Move return out of debug conditional

Accidentally put the return for not sending volume changes into
the debug conditional.

bug:16379124
Change-Id: I473f6fdf7577ca26559ab9b02f4dc0613ef702e3
ava/com/android/server/media/MediaSessionService.java
79cac9d0f0220a3f19319563ca8f1006a89435fd 23-Jul-2014 John Spurlock <jspurlock@google.com> Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev
333f8dd78f8926dfb8851dbb23333c9f5553e69f 23-Jul-2014 John Spurlock <jspurlock@google.com> Wire up CATEGORY_ALARM and CATEGORY_EVENT.

And remove the alarm package whitelist now that deskclock
uses a category.

Bug:16406214
Change-Id: I6ca400376a9df7646889e394e53e4d491c56a46c
ava/com/android/server/notification/ZenModeHelper.java
a461c35ef53f8aa9f1449150d65a5ab3ace439cb 22-Jul-2014 Alexandra Gherghina <alexgherghina@google.com> am 6ec756fd: am 5f9a77e5: Do Not Merge Per-user API for master sync

* commit '6ec756fd1503ea88bd1ca031eeef733e2a44bfac':
Do Not Merge Per-user API for master sync
0e9ac20d7e0c9aca8cd342d97465adfac4c7e6e1 16-Jul-2014 Alexandra Gherghina <alexgherghina@google.com> Do Not Merge Per-user API for master sync

Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit 222aea8bd997807784dc99ca53f63280d384fdf0)
ava/com/android/server/content/ContentService.java
e0d713afdcda56b80c5464cdc3588586c2cb72c6 22-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am bae0d23d: am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev

* commit 'bae0d23df8e1461168e229e170247433a3a3ab38':
Fix WiFi-Direct.
91bf127892083230bd19e6dac9655538c75703de 22-Jul-2014 Craig Mautner <cmautner@google.com> am 581feb87: am 90ac517c: Create API for launching from recents

* commit '581feb87f8a0bcfd14b2b28fd9f06f4e162f10b6':
Create API for launching from recents
d4da3853ada3ce103046d4d914a1591bc91288f2 22-Jul-2014 Craig Mautner <cmautner@google.com> am 506d2d2a: am 39225289: Add empty ArrayList check.

* commit '506d2d2a32bff5813b7c1017145efa30673d6181':
Add empty ArrayList check.
dc00cbe2c15eef5141656311a6d05c753d7c6db6 21-Jul-2014 Craig Mautner <cmautner@google.com> Create API for launching from recents

Relaunch apps from recents using the same uid and package as was used
in the original launch.

Fixes bug 16358208.

Change-Id: I340800bfee79926b197929360d69f1d570bbf1eb
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/TaskRecord.java
f14e5a2fad4660ecca43fac1cea08e35f2b82b4d 22-Jul-2014 Craig Mautner <cmautner@google.com> Add empty ArrayList check.

Fixes bug 15768779.

Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
ava/com/android/server/wm/WindowManagerService.java
68ea3933f0230f0a1829f281499cbb57380c38c2 22-Jul-2014 destradaa <destradaa@google.com> am ca5ddb3f: am 75c07aec: Merge "Add uncertainty for GPS received TOW field. b/16463499" into lmp-dev

* commit 'ca5ddb3f93039552fa98c56bc8c09071ab0a921e':
Add uncertainty for GPS received TOW field. b/16463499
9115e535a67875d98300fbc63e5055d788148a8e 22-Jul-2014 Geoff Mendal <mendal@google.com> am 9d1dd586: am 6e8aa46d: Merge commit \'e959e4a0\' into lmp-dev

* commit '9d1dd586ef1b992eaf6f4c6ec8cd210bcdf6c4f6':
Revert "Wait for all windows to draw before turning screen on"
af13b025e9d7dcf262e13588c8471b7360ce4070 22-Jul-2014 Geoff Mendal <mendal@google.com> Merge commit 'e959e4a0' into lmp-dev

Conflicts:
services/core/java/com/android/server/wm/WindowManagerService.java
e959e4a01773a0bd1f3fb76b4333e59f03fb2f5c 22-Jul-2014 Justin Koh <justinkoh@google.com> am a63272b4: Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev

* commit 'a63272b4b5eff16f4d6fae4730b8a7087563181c':
Revert "Wait for all windows to draw before turning screen on"
4bd39ec448bfc050428b375a366a25e8afeeaec9 23-Jul-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev
10eaa8574bb220e7dddf9a78057f83dc64ee5687 23-Jul-2014 Dianne Hackborn <hackbod@google.com> Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting

Also add new methods to clear these states, so we can avoid any
nesting issues from getting the tracking state stuck.

Change-Id: Iba0eaba2a9a186355c24d392f16118982c5331ed
ava/com/android/server/am/BatteryStatsService.java
e39e5bff29a77b43bb9f0539125573271c5bd6fa 23-Jul-2014 Dianne Hackborn <hackbod@google.com> Merge "Finish toast app op." into lmp-dev
4eee3cb1df309e794f653f9cfa2d95a5c475c86f 23-Jul-2014 Dianne Hackborn <hackbod@google.com> Finish toast app op.

It was half-done, the window manager would check it
when the window was added, but was not monitoring for changes
to its state like it does for the system alert op.

Change-Id: I0279c4ac6160062cd219372af4bd9d7e4e687460
ava/com/android/server/wm/WindowManagerService.java
551caf64a03a1e63ab087aade5ebb2924b78efd6 23-Jul-2014 Dianne Hackborn <hackbod@google.com> Merge "Further fix on issue #16013164" into lmp-dev
b64afe17064f126eb782c42a238db65f080fc8f0 23-Jul-2014 Dianne Hackborn <hackbod@google.com> Further fix on issue #16013164

Dumb dumb dumb copy/paste error when moving the
uid checking up out of the function.

Change-Id: I01513ccd80750b724dbfa8d9d7d171819c6b959b
ava/com/android/server/AppOpsService.java
75111d83e6b73e8bd139bbe4a8379b07938cb0f5 23-Jul-2014 Carlos Valdivia <carlosvaldivia@google.com> Merge "Allow authenticators to rename accounts." into lmp-dev
71f6ad31cfc6ae8ab89ad08586d5242aa2236e22 23-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Cleanup: Delete dead code." into lmp-dev
03666c705ddabe0e7c5869ab69c2ca8b964164e9 20-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Cleanup: Delete dead code.

Bug: 15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/NsdService.java
ava/com/android/server/connectivity/Tethering.java
ava/com/android/server/connectivity/Vpn.java
a77760d74ad544bbd4f6310fd28b395f24c5467d 18-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Fix WiFi-Direct.

Add a new command to let netd know about routes on a p2p interface.

Bug: 15413694

Change-Id: I36effc438d5ac193a77174493bf196cb68a5b97a
ava/com/android/server/NetworkManagementService.java
c79dd82e5578376a87782d648b5cff4a100555b2 22-Jul-2014 destradaa <destradaa@google.com> Merge "Add uncertainty for GPS received TOW field. b/16463499" into lmp-dev
81cabb8a7fb5b61f16bf49c2757ccb51bc88e708 22-Jul-2014 destradaa <destradaa@google.com> Add uncertainty for GPS received TOW field.
b/16463499

Change-Id: I5dde8a2737d9345eb7f77edc64ab7286254a65e4
ni/com_android_server_location_GpsLocationProvider.cpp
2117f2550c954b71bec35b4d4653d7dc82a86c55 22-Jul-2014 Craig Mautner <cmautner@google.com> am 6b558a18: am 3c36d587: Merge "Convert from elapsed time to absolute time." into lmp-dev

* commit '6b558a183057c352a20d549e355ad54e9446cb38':
Convert from elapsed time to absolute time.
ea025088e954591aa7480deb563d7190311c1abf 22-Jul-2014 John Spurlock <jspurlock@google.com> am 8028a5a8: am 752dc6e1: New NotificationListenerService listener flags api.

* commit '8028a5a8a3f17e54fe6a5d28c50683def1473b9c':
New NotificationListenerService listener flags api.
70aa02ee7f2de1da301995d43b10d8e6f1c336a0 22-Jul-2014 Dongwon Kang <dwkang@google.com> am 1bb343ff: am a792fc8a: Merge "TIF: Revisit types in TvInputInfo and TvContract.Channels." into lmp-dev

* commit '1bb343ff6cb8eace95d909f125954a6763836bdc':
TIF: Revisit types in TvInputInfo and TvContract.Channels.
ec25af3fb376ef5bfbff0629c22c74d634e8d25a 22-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 0b6aeed0: am 68bc0359: Define a constant for HDMI-CEC logical address used for internal source

* commit '0b6aeed02e25756c85beea03ce74f52b8a89377a':
Define a constant for HDMI-CEC logical address used for internal source
b654e98d54192e477c3533c76a8ad6f1fe895e5d 22-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am e3007cba: am 67151b71: Invoke device event listeners when clearing CEC devices

* commit 'e3007cbafdbdef00ee95fbbf0cf59f3d97590a83':
Invoke device event listeners when clearing CEC devices
6cc2fb2df22591cb55b3f1b32a282a5cdf5912ed 22-Jul-2014 Jungshik Jang <jayjang@google.com> am d21c92f8: am 5ef743d9: Merge "Follow up send message errors of hdmi_cec.h in service side" into lmp-dev

* commit 'd21c92f8cedec95547dc81131b472864b1b02beb':
Follow up send message errors of hdmi_cec.h in service side
1221ddbd8e0573e7aedfb051e54d335cf523fdfa 22-Jul-2014 Dianne Hackborn <hackbod@google.com> am d8b0edbf: am 8f5105c6: Merge "Add permissions associated with app ops." into lmp-dev

* commit 'd8b0edbfceff19ee0e9f53e80ee4da4dbf4327b6':
Add permissions associated with app ops.
1a7eaf808eb5c7f34fff085c5bc3e9ff6f4c74d9 22-Jul-2014 Yao Chen <yaochen@google.com> am 334ab599: am 78bb2dad: Merge "Updated media browsing API & tests." into lmp-dev

* commit '334ab59920a85dfc83553fc89f7b90811fb51f4b':
Updated media browsing API & tests.
1fa865f396e94913cfbbd32ce7799c2e8aeb7a08 21-Jul-2014 John Spurlock <jspurlock@google.com> New NotificationListenerService listener flags api.

Give activated listeners the ability to request changes to
listener-level or host-level state.

Currently this consists of the ability to suppress notification alerts
(alerts = the haptic / audio feedback of a notification).

Bug:15888672
Change-Id: I045e3b99d1f15e3f96ebaf17d3083a97e02ecb42
ava/com/android/server/notification/NotificationManagerService.java
29a5d2620711342d4ac5cc7ed0b6aa008cffaa2c 21-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Define a constant for HDMI-CEC logical address used for internal source

Change-Id: Ic7d6a5378361d7ed8ae4b635312b956b063fc95a
ava/com/android/server/hdmi/Constants.java
49b47bbef8a8d27e9707d5d24848040519586a7a 22-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Invoke device event listeners when clearing CEC devices

This updates the client of HdmiControlService so that CEC devices
will disappear when thd CEC control is disabled.

Bug: 16467361

Change-Id: If6fad3be0aa3335aa7f955c0586040250e9c0e06
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
aea54c15e9be7bf9dfe9ab950faa2e488c5d97f9 22-Jul-2014 Jeff Brown <jeffbrown@google.com> am 887a54b7: am e5871d89: Allow dreams to control screen state and brightness.

* commit '887a54b793da79f7a6c012154373ede91b7bf149':
Allow dreams to control screen state and brightness.
970d4132ea28e748c1010be39450a98bbf7466f3 19-Jul-2014 Jeff Brown <jeffbrown@google.com> Allow dreams to control screen state and brightness.

Added setDozeScreenState() and setDozeScreenBrightness() methods to
DreamService. The values specified here only take effect once
startDozing is called and can be changed while dozing.

This required some significant rework of the display power controller
but the result seems quite nice and better represents the policy
we want to apply.

Changed the test dream a little bit to make it flash the screen
every minute using the new functions.

Bug: 15903322
Change-Id: I83bcc34503f1b87727d2b2b3c0ef08507f9f0808
ava/com/android/server/display/AutomaticBrightnessController.java
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/display/DisplayPowerState.java
ava/com/android/server/dreams/DreamManagerService.java
ava/com/android/server/power/PowerManagerService.java
30c687787397c738a3cf89b841e737546a8c7471 22-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 6f5652c9: am aec45c28: Revert "Send TV app the intent for the new active source"

* commit '6f5652c9841346df3fa9eaa530590688c1b22a15':
Revert "Send TV app the intent for the new active source"
469085e4fec12a4b8d9077d47e10fc31d0f62ad3 22-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Revert "Send TV app the intent for the new active source"

This reverts commit 9808af71a190844cd5eb493d87870238a31fa408.

Change-Id: I0e019534c07b230173230d064c6d8bc389fafcbc
ava/com/android/server/tv/TvInputHardwareManager.java
815d89000a35fb8bccb93b9678d10159db3d27c1 22-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 8ea9bdbf: am 9808af71: Send TV app the intent for the new active source

* commit '8ea9bdbf827264315a46cdb11fb718db7a10f655':
Send TV app the intent for the new active source
0f68d62a4b10aff3c99162bf3a8322d38e643088 21-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Send TV app the intent for the new active source

When signalled by an external CEC device about to become a new active
source, TIF(TvInputHardwareManager) sends an intent for TV app to tune to
the input mapped to the device.

Change-Id: I29b28a4365d1454a8bbe947ddb5df4371960c71a
ava/com/android/server/tv/TvInputHardwareManager.java
69c68e1a732d1cad7e5a735c8ed72f5495ba7a15 22-Jul-2014 Amith Yamasani <yamasani@google.com> am b0cae189: am f8b67f1f: Rename setApplicationBlocked to setApplicationHidden

* commit 'b0cae1897384f7175ec3b9ee08fd535fff1d6e51':
Rename setApplicationBlocked to setApplicationHidden
e5bcff624fb58b6f95be8ddff7f5b6b3bf5d19c7 20-Jul-2014 Amith Yamasani <yamasani@google.com> Rename setApplicationBlocked to setApplicationHidden

This corrects the expected behavior of the app state. Hidden apps
can be installed by the store to be brought out of hidden state.

Bug: 16191518
Change-Id: Id128ce971ceee99ba1dea14ba07ce03bd8d77335
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/PackageSettingBase.java
ava/com/android/server/pm/Settings.java
ava/com/android/server/pm/UserManagerService.java
f193b9a61d0b14d13bb7f8aec42a21154672e5ec 18-Jul-2014 Carlos Valdivia <carlosvaldivia@google.com> Allow authenticators to rename accounts.

Bug: 16390602

Change-Id: I4f7250726a2c7677e0ccaa6e5f995153893d8360
ava/com/android/server/accounts/AccountManagerService.java
421a7f7906e44f0b7fd7bdeea483fe907f822916 21-Jul-2014 Jeff Sharkey <jsharkey@android.com> am c7a62d72: am a56503ee: Detect bundled app ABI for cluster-style layout.

* commit 'c7a62d728f1546e8feda4f1d22a835593c8d36a3':
Detect bundled app ABI for cluster-style layout.
603862517569cbebed9a7bd231c3fb80292d4bcd 21-Jul-2014 Jeff Sharkey <jsharkey@android.com> Detect bundled app ABI for cluster-style layout.

Now that build system switched to cluster-style layout for bundled
apps, we need to detect primary/secondary ABI based on that layout.

Bug: 16456263
Change-Id: If6daf60ee1815bb6fde560a0c373b4f2bc8bd3a8
ava/com/android/server/pm/PackageManagerService.java
c025fa146b60c26e9ba1197a386927f6ab0f3ac4 21-Jul-2014 destradaa <destradaa@google.com> am 3fafcc8a: am d26d2bf6: Merge "Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308" into lmp-dev

* commit '3fafcc8acab04076f697208c2d342d9292007957':
Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308
8f370c94546f3075d7057a56a6611fdba591dd3f 21-Jul-2014 destradaa <destradaa@google.com> am a4d0d8c2: am 77e1c1a5: Merge "Update GPS HAL raw measurements support." into lmp-dev

* commit 'a4d0d8c29e68ee4f9bf28399b344ee72eb492baa':
Update GPS HAL raw measurements support.
807badbebcccea9eded94b65a6c62185ca8e4eca 22-Jul-2014 Craig Mautner <cmautner@google.com> Merge "Convert from elapsed time to absolute time." into lmp-dev
494f6bdd9a6d9bf7dad623128c37813cf9d737c0 21-Jul-2014 Craig Mautner <cmautner@google.com> Convert from elapsed time to absolute time.

Using uptime to determine most recent task doesn't work across
reboots.

Fixes bug 16370277.

Change-Id: Icef3342aba3fc009c307175b7524530c4cb617d2
ava/com/android/server/am/TaskRecord.java
2102dd725540bcf51bf324a2775fbcffe45dd32f 19-Jul-2014 destradaa <destradaa@google.com> Update GPS HAL raw measurements support.

Align the GPS framework with the GPS HAL
b/16374800

Remove localTime field from API
b/16241708

Update Property containers for measurements to use bit masks
b/16238371

Change-Id: Id4db16c3153d0020bf2edb5a67f59353662762d0
ni/com_android_server_location_GpsLocationProvider.cpp
38c1a5f5a94ea2fd0bea604a2f8c202e871d9bb2 21-Jul-2014 Craig Mautner <cmautner@google.com> am b7bb95b0: am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead"

* commit 'b7bb95b0f3cd8b2ccb61cfa75a586fe1df1be123':
Skip broadcasting to a receiver if the receiver seems to be dead
5854500459b98ee768c08b7bca98fc6c561f12db 21-Jul-2014 Dan Sandler <dsandler@android.com> am 00c3f554: am 8bfa8dbc: Defend against null ApplicationInfos.

* commit '00c3f554f17f0a82f0feca9013de804426c149de':
Defend against null ApplicationInfos.
09afc2e4ea4f22dc1ef439244f6f0f1572e5a676 18-Jul-2014 Dan Sandler <dsandler@android.com> Defend against null ApplicationInfos.

Bug: 16303792
Change-Id: Id2d7a70f92718ecda8e3ff418c4e109f6982a75f
ava/com/android/server/notification/NotificationManagerService.java
f8f1c49e7a70b7eaa8bd5e2d9f1a36c4b5679768 21-Jul-2014 Wonsik Kim <wonsik@google.com> am 39ac147e: am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev

* commit '39ac147e42ccaf1fc5450fc81572231a7e6b3449':
TIF: fix indexOfValue usage
e2879e597770c2bafb225cfe8cb4313564c6cf67 21-Jul-2014 Jungshik Jang <jayjang@google.com> am 13dc029e: am 7506f4c9: Merge "Add two apis for one touch record." into lmp-dev

* commit '13dc029e32c3a8fbe1e87dfa0387ad303b0e83ba':
Add two apis for one touch record.
d6dbca92c0cd56f440f201e29d1ff2e9685232ae 21-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 1dc7352e: am d0f94173: Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev

* commit '1dc7352eacde37dac5459f0bc82c868e9548b521':
TIF: Extend multiple TV input per service for HDMI logical devices
35fb483a8ffd4ae47d5afcaad662456ce82e0c18 21-Jul-2014 Jungshik Jang <jayjang@google.com> am a86a6f2c: am 9d42d1f3: Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev

* commit 'a86a6f2c03959cb5a2d5fbde96fdf42246ab43de':
Do no send <Feature Abort> as response of <Feature Abort>
b018fd8d96b18cfb1a2feaf943d7cac769a3921b 21-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am d4a48882: am 2a1ff5ad: Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev

* commit 'd4a48882cca68b99cc4336257b831ccdd8ec6e6d':
Invoke callback for HdmiControlService.deviceSelect() for internal source
27da640f129d6151028baa23795ce43c4ae51a11 21-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am e51029b9: am 1e6393b8: Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev

* commit 'e51029b9046dfbb15f1e72ad7a20d5959fa79ee9':
TIF: Register IHdmiInputChangeListener to physical input manager
a725e7932587fe37881e7d71114bbfde89a7ddfe 21-Jul-2014 Jae Seo <jaeseo@google.com> am 0e29adb6: am bf1a0ff0: TIF: Add sendAppPrivateCommand()

* commit '0e29adb65b8eea3092370862db329eac195bcd35':
TIF: Add sendAppPrivateCommand()
a759b111a1c9cb00284038f8a1554bf29709b952 19-Jul-2014 Jae Seo <jaeseo@google.com> TIF: Add sendAppPrivateCommand()

Added a way to send a private command from the application to the TV
input. This can be used to provide domain-specific features that are
only known between certain TV inputs and their clients.

Change-Id: I7548311a64147b8ff27562ec680b941e2ec10bc0
ava/com/android/server/tv/TvInputManagerService.java
767912d738e9004b45d1455378193f5a42470d8d 21-Jul-2014 Dianne Hackborn <hackbod@google.com> am 39285ff1: am 1648dbb4: Merge "Fix issue #16400873: Apps that show ads as new tasks stay in recents..." into lmp-dev

* commit '39285ff113de9cbeb0304942f318f0f48ee697f3':
Fix issue #16400873: Apps that show ads as new tasks stay in recents...
6e0683f4dd78c9c577fbbc88398f48b58ec0a547 21-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> am 50c7e24f: am c741502b: Merge "Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE" into lmp-dev

* commit '50c7e24f3a10fa4bc15f7a8b2f4bab2ae91459e0':
Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
52d820ab29f8ec841e58f327d8fc250081d95629 20-Jul-2014 Wonsik Kim <wonsik@google.com> am e2d65e08: am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev

* commit 'e2d65e08ad9533ab5d94b52dd61d40cd6643a61f':
TIF: revise API names
eaeac08489956dd3c2eca5eb8a19283e034a9cd0 20-Jul-2014 John Spurlock <jspurlock@google.com> am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.

* commit '3897183d7bd884c4a01b22dccce75df48e93ab4a':
Zen mode filtering should use new usage constants.
8f199a44fdfcdcebec968831ce3c1f9d01a39330 20-Jul-2014 Wonsik Kim <wonsik@google.com> am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev

* commit '1042ee6be6294ad07ccda31571641996abc88bde':
TIF: misc fix for TvInputHal
3ab509a29b34dfafe0fdec037d6843d2d3cad095 20-Jul-2014 Jeff Brown <jeffbrown@google.com> am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev

* commit '958361e92371fd7d3b40fbbd91077ec4d7abe374':
Allow dreams to wake up gently.
253aa5d4582bf731471ede1c02ac046f2c1422a4 20-Jul-2014 Jeff Brown <jeffbrown@google.com> am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.

* commit '610014e6501d3543f33aedcc7f302288afcc4df4':
Add new Display.STATE_DOZE_SUSPEND power state.
aa75604f2c9ca08c20dc44cb84ea429916cd3312 20-Jul-2014 Jae Seo <jaeseo@google.com> am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev

* commit 'c936967b84ef7ba70f948bcd99b8355fbdd3c9a4':
TIF: Add a way to notify whether the current program content is allowed
a1fd6bc6612aaf10938f7f394aa146ec26f58be1 20-Jul-2014 Christopher Tate <ctate@google.com> am 32523262: am 12e9b896: Fix which index goes where

* commit '32523262b62c4598ffd50873d290c1c601b9f842':
Fix which index goes where
f47665c1be8eedf9494f523b56d9d82d119a8eb2 20-Jul-2014 Prashant Malani <pmalani@google.com> am af5f3b92: am c61f26fa: Make the booting flag update unconditional

* commit 'af5f3b92a7acec0301067ed1cdad857056326e3b':
Make the booting flag update unconditional
c2332a4d003ee3ea8972862711bc8b1a90d80722 20-Jul-2014 Adam Lesinski <adamlesinski@google.com> am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API

* commit 'b11e7d48398c8e6e57578dabcf71eeef6a4e8bfd':
First iteration of a public UsageStats API
3052ccee2375f6bad1840faa20d6da41e119ebaa 20-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> am 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life.

* commit '8a717ee8b26cdd6d916818451add978c1776bd6e':
Quit NetworkMonitors at end of life.
dc2cfff87c751faea9f71472a16e1375e6022686 22-Jul-2014 Dianne Hackborn <hackbod@google.com> Merge "Add permissions associated with app ops." into lmp-dev
33f5ddd1bea21296938f2cba196f95d223aa247c 22-Jul-2014 Dianne Hackborn <hackbod@google.com> Add permissions associated with app ops.

Change-Id: I575ad7a3ceea59486ca601f69760b14f6269511d
ava/com/android/server/pm/PackageManagerService.java
7b41467704f941b11af6aace3e40993afc7f6c6f 18-Jul-2014 John Spurlock <jspurlock@google.com> Zen mode filtering should use new usage constants.

Refactor stream-based calls to usage-based calls.

Bug:15279516
Change-Id: I3f7757d8123c14670e2ad5f8e6aa4e9803efe7ec
ava/com/android/server/AppOpsService.java
ava/com/android/server/VibratorService.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenModeHelper.java
ava/com/android/server/power/ShutdownThread.java
5dc219142a756d57355b511c8f8ab913c01710da 18-Jul-2014 Jeff Brown <jeffbrown@google.com> Add new Display.STATE_DOZE_SUSPEND power state.

Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/display/LocalDisplayAdapter.java
4a79daeaf72fe0c47f9d0605d6efe0c61885fe94 19-Jul-2014 Christopher Tate <ctate@google.com> Fix which index goes where

Change-Id: If4cf7efd4d7962eb5c10b487482653d86d92d2c6
ava/com/android/server/job/JobSchedulerService.java
84b08adcbb71fcaa860987f341310c7902a5a7ac 16-Jul-2014 Prashant Malani <pmalani@google.com> Make the booting flag update unconditional

In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.

Bug: 16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560

Conflicts:
services/core/java/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/ActivityStackSupervisor.java
0debc9aff4c0cbc28e083a948081d91b0f171319 17-Jul-2014 Adam Lesinski <adamlesinski@google.com> First iteration of a public UsageStats API

UsageStats API that allows apps to get a list of packages that have been
recently used, along with basic stats like how long they have been in
the foreground and the most recent time they were running.

Bug: 15165667

Change-Id: I2a2d1ff69bd0b5703ac3d9de1780df42ad90d439
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/UsageStatsService.java
17d47989ee53c9e54f250d29a343ba949edf0ff9 17-Jul-2014 Yao Chen <yaochen@google.com> Updated media browsing API & tests.

Change-Id: I3a1e3eead99a98b1890e05843dd90203cee517b7
ava/com/android/server/ConnectivityService.java
1fd9aeef08fac363ec3ef2eb61cea519a04c51fd 18-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Quit NetworkMonitors at end of life.

We were creating and orphaning a thread for each network.
Cleanup after ourselves.

bug:16119890
Change-Id: I8c8a9fe471e43f31f712844915992084074e8047
ava/com/android/server/connectivity/NetworkMonitor.java
5bebd959592f788ba4e48f46fc63aba1651e687d 18-Jul-2014 Youngsang Cho <youngsang@google.com> am 2ec6fb80: am e94cfccd: Merge "TIF: Add unblock content" into lmp-dev

* commit '2ec6fb8085f78dceda26d1f1634f6e27b630166a':
TIF: Add unblock content
e670d86ff9d1d013bae60484423e814c7b1c7c8f 18-Jul-2014 Youngsang Cho <youngsang@google.com> am 7c8bbd53: am c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev

* commit '7c8bbd53c6622248377794a7ea6289b1c952a2f6':
TIF: Add onInputAdded and onInputRemoved
31380e84246844cf709ea13769679240ff2b48e6 19-Jul-2014 Jae Seo <jaeseo@google.com> Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
bbcd206a798c8c2845200daf7a2d4cb7b29056f3 19-Jul-2014 Jae Seo <jaeseo@google.com> TIF: Add a way to notify whether the current program content is allowed

Now we have a complete set of API to tell the entire cases (allowed and
blocked), which makes possible for the application to rely more on
actions taken by TV input services transferring the responsibility for
parental control.

Bug: 13172379
Change-Id: I7b0dcf16b870782c76a428a1dac6ef1a528b7d40
ava/com/android/server/tv/TvInputManagerService.java
427f74293b8fca24803a12ec10013e88db8d3586 18-Jul-2014 Youngsang Cho <youngsang@google.com> Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev
7c053de8ba708b7d3aa060dc7b831da1f5747c31 18-Jul-2014 Christoph Studer <chstuder@google.com> am aa3bb5bf: am c6a6ae78: Merge "Cancel notification group children when summary is canceled" into lmp-dev

* commit 'aa3bb5bf9f84ba195feef245ab247b4903fb7e66':
Cancel notification group children when summary is canceled
8e6b51b0fb810ac990c863cc0579e2b2700ab7d6 15-Jul-2014 Jaewan Kim <jaewan@google.com> TIF: Add onInputAdded and onInputRemoved

Bug: 16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
ava/com/android/server/tv/TvInputManagerService.java
c13eacf40ea2dc20808960399397003e2a48347a 18-Jul-2014 Youngsang Cho <youngsang@google.com> am 9dc7566a: am 57df5b3d: Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev

* commit '9dc7566a2c425144fc8ca33dc68df60c85c69337':
TIF: Add a notification for surface change from TvView to TvInputService
4d9ed9ccb956f7811bb0d0dde5a2250b65a3e74a 18-Jul-2014 Jae Seo <jaeseo@google.com> am eb39352e: am cd12bfc7: TIF: Add a method to get TvInputInfo for a given TV input

* commit 'eb39352e64f10c086c69028b2adab259589add19':
TIF: Add a method to get TvInputInfo for a given TV input
353bdd484f07e98db894143336aef60d6dc49ec1 18-Jul-2014 Jae Seo <jaeseo@google.com> am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev

* commit 'b719bf5720ea501fa6324d866e49e65b59b1a182':
TIF: Add TvParentalControlManager
b375805f3b1672e68d1511565af4700e5fa8491d 13-Jul-2014 Jae Seo <jaeseo@google.com> TIF: Add a method to get TvInputInfo for a given TV input

This is going to be needed by applications to get information about the
inputs that are just added thus not included in the previously retrieved
input list.

Bug: 16166859, Bug: 15838097
Change-Id: Icecd03fcea208a0c4d41caab1eec64e574f40877
ava/com/android/server/tv/TvInputManagerService.java
b0026ccd29b4669df49dc774b20c0b9482881f22 18-Jul-2014 Wonsik Kim <wonsik@google.com> am 719c0ebd: am 2a7c2e38: Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev

* commit '719c0ebdaceb1f714d66ff35c80cb3765f1caae9':
TIF: one-to-many relationship for TvInputService to TvInputInfo
e4da19a9f128ae826ae14efbf6cf3bf2fdd6ad40 18-Jul-2014 Michael Wright <michaelwr@google.com> am e9f933cd: am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev

* commit 'e9f933cd6bdecb96212d5edf9ba54c7c12c46f03':
Add MediaProjection APIs.
3aa88cd61a478a13132197ae12f376a81611faca 18-Jul-2014 Ben Murdoch <benm@google.com> am 5ba41787: am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev

* commit '5ba4178783a48d3269e3404a1ba62263afd5932e':
Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
eccc5480a63c57a336ee9bf262e8b0633e60ba2b 18-Jul-2014 destradaa <destradaa@google.com> am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev

* commit 'e23838004e5db510c6e86919b2dcf16e67e3339b':
Fix exceptions in ActivityRecognition platform stack.
f9f74746870dd68887565c785eb862b7b4ef3a1b 18-Jul-2014 Andres Morales <anmorales@google.com> am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition

* commit '77bf359b2d6b81fc18efe9ab888699df27ab81f9':
Permit settings to "wipe" the persistent partition
9f7c25ebeba866d0db696f5db0d29fa8c6a86768 22-Jul-2014 Dongwon Kang <dwkang@google.com> Merge "TIF: Revisit types in TvInputInfo and TvContract.Channels." into lmp-dev
fe9259e6a78ceb08efc43e8bca4981ee18a0a0ef 18-Jul-2014 Dongwon Kang <dwkang@google.com> TIF: Revisit types in TvInputInfo and TvContract.Channels.

For the types in TvInputInfo, TYPE_TUNER represents all the TV inputs
having channels in TvProvider. Also, String is used for the types in
TvContract.Channels for further extension.

Change-Id: Iee1163b449d9f9723ff665178f2967bb8c0ad71d
ava/com/android/server/tv/TvInputHardwareManager.java
75df3bf9789de68fba88f8faa44b7c0e9b44aafe 21-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev
5ad57168da6456e8e4935aaa8512a7f77b74b0a1 21-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Invoke callback for HdmiControlService.deviceSelect() for internal source

The call should be always successful if device to switch to is internal
TV source as setting it as the active source doesn't require communication
with other devices. Added the missing callback invocation.

Change-Id: I9968098316a955509f4de0e7af6f4407087ad4a2
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
6f306e21f4d0b62866d8622b4d4698f6d76de2b2 18-Jul-2014 Youngsang Cho <youngsang@google.com> Merge "TIF: Add unblock content" into lmp-dev
903d6b72cd572665309633e925485464d08bb25a 16-Jul-2014 Jaewan Kim <jaewan@google.com> TIF: Add unblock content

When a TV content is blocked by the parental control settings,
TV input service will notify TV to request user's PIN code verification.

If the verification succeeds, TV input service will be notified back
that content is unblocked so it can keep playing the content.

Bug: 13172379
Change-Id: I7b31d762eb54612c4d8779ee133211f32fb73b05
ava/com/android/server/tv/TvInputManagerService.java
c66ca1267cfa4aca70d3dceaf5962ff77ee030b3 18-Jul-2014 Youngsang Cho <youngsang@google.com> Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev
e821d711db1799dc51661a3ed6188f3cd942bae7 16-Jul-2014 Youngsang Cho <youngsang@google.com> TIF: Add a notification for surface change from TvView to TvInputService

Bug: 15447352
Change-Id: I3e91609c5eb03be84cc7c88507457b9e74750de8
ava/com/android/server/tv/TvInputManagerService.java
68ad9d762ddc35488cd6b4894fe05f9d936d2f4c 17-Jul-2014 Craig Mautner <cmautner@google.com> am 64dc5b09: am 20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev

* commit '64dc5b09f1d398541486dd7beb777c71c1a4f0ec':
Restore calling identity before checking permission
902f129dd1d66ac0ad88f7ac4495daaabb656b05 21-Jul-2014 destradaa <destradaa@google.com> Fix GpsLocationProvider to return GpsStatus and Nmea events.
b/16393308

Change-Id: Idda9e769b96bcbc3e1beb9f506a853a6403ea254
ava/com/android/server/location/GpsLocationProvider.java
c7a845de4a9578e8093b6abcb90c6836d360d5b3 17-Jul-2014 Michael Wright <michaelwr@google.com> Merge "Add MediaProjection APIs." into lmp-dev
c39d47a8e7c74bd539104b0efab898ef6fc43ddf 09-Jul-2014 Michael Wright <michaelwr@google.com> Add MediaProjection APIs.

The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.

The screen sharing case is implemented, but all of audio capturing
is still forthcoming.

Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/LogicalDisplay.java
ava/com/android/server/display/VirtualDisplayAdapter.java
ava/com/android/server/media/projection/MediaProjectionManagerService.java
b35fba026543ae50e770d33991f2fe2c3f948729 22-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Follow up send message errors of hdmi_cec.h in service side" into lmp-dev
30a356a4197f3c582bef8ad85184b42ce27f0fd7 21-Jul-2014 Jungshik Jang <jayjang@google.com> Follow up send message errors of hdmi_cec.h in service side

Change-Id: Icc64e6324250230c939b04ab37c999f50afe7bf2
ava/com/android/server/hdmi/Constants.java
38feae971c43700c9cb15aafbf8bd37340675a50 21-Jul-2014 Wonsik Kim <wonsik@google.com> TIF: fix indexOfValue usage

SparseArray.indexOfValue() was used in place where comparison using
equals() on value was desired, but the method actually uses == instead
of equals().

Change-Id: Id9fb3317d1e0f0cb60ce6512f6d0c0a7bcf2fb20
ava/com/android/server/tv/TvInputHardwareManager.java
04d926cb136f6ae82f91292d3feebb3e5766e56b 21-Jul-2014 Ji-Hwan Lee <jihwan@google.com> Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev
4f9f57cede3de2e2aa3045e04b485b176ab22dbd 19-Jul-2014 Ji-Hwan Lee <jihwan@google.com> TIF: Extend multiple TV input per service for HDMI logical devices

Remove ITvInputManager.registerTvInputInfo() and let addTvInputInfo*()
cover the registration.

Bug: 15570939
Change-Id: Ic36701de96696e7fe32fc1faa0d5f6fde53f6666
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
189bff29e6f5cba13d5cfe2c27a3c9dbc795e105 21-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev
187423c0bc4b27479bc8c23bd86969429094b296 25-Jun-2014 Wonsik Kim <wonsik@google.com> TIF: one-to-many relationship for TvInputService to TvInputInfo

The scope of this change is to provide a skeleton code for supporting
multiple TV input per service.

Bug: 16138420
Change-Id: Ic51355902d5e0424b8fc8a75c495d4781a7ed744
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
a63272b4b5eff16f4d6fae4730b8a7087563181c 22-Jul-2014 Justin Koh <justinkoh@google.com> Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev
528b4b75729443f805617f9628b352f6854978cc 22-Jul-2014 Justin Koh <justinkoh@google.com> Revert "Wait for all windows to draw before turning screen on"

This reverts commit 0a589b929e18d05d1345d97283c3025058ddca18.

Change-Id: Ia73555cd7797b5d172f33db9f46ebc211af6fc1e
ava/com/android/server/wm/WindowManagerService.java
5fe8dcf78de73ce33132204eb1862a43c6ee732d 21-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Add two apis for one touch record." into lmp-dev
a6b2a7a59ab79b2d91412c1095d1c49b8dc9d507 16-Jul-2014 Jungshik Jang <jayjang@google.com> Add two apis for one touch record.

This change introduces new two apis for one touch record.
1. setRecordRequestListener
It's used to get notified when a recorder device initiates
"one touch record". As return of callback, client should
generate "record source" and return it.
2. startRecord
It's used to initiate "one touch record" from Tv.

Along with this, add HdmiRecordSources which is a helper
class assisting buidling byte array form from the given
record source information.

Bug: 16160962

Change-Id: I403d37b752c9b7f799c6d8188a071ef420fe8ac2
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/OneTouchRecordAction.java
6e8abd7fd8e2f8e832a12e16d41c994678088185 21-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev
7474faca5bab2fba5749cff7ed15558231307e38 18-Jul-2014 Jinsuk Kim <jinsukkim@google.com> TIF: Register IHdmiInputChangeListener to physical input manager

This lets the manager receive the callback from HdmiControlService
when a CEC device requests that it shall be the active source. It will be
transformed to an intent with a channel URI associated with
the corresponding TV input.

Change-Id: I02d4b24d5d05ad7a093e3b996942cbc43fd1ce8b
ava/com/android/server/tv/TvInputHardwareManager.java
61acf46d6ad82c70f1bea742a74ad8f79ede0b4a 20-Jul-2014 Wonsik Kim <wonsik@google.com> Merge "TIF: revise API names" into lmp-dev
9bf671f8ee72b156f16fcf05a3d1c6e093ecba67 18-Jul-2014 Sungsoo Lim <sungsoo@google.com> TIF: revise API names

- TvInputManager: TvInputCallback -> TvInputListenter
- TvParentalControlManager: ParentalControlCallback -> ParentalControlListener
- TvView: unblockContent -> requestUnblockContent

Change-Id: I58220e86a4e59ee7d8f28fab833f09cd603b1e38
ava/com/android/server/tv/TvInputManagerService.java
610ccd9117fc1611fcc576d1cb1f717f1ef3fcbf 19-Jul-2014 Wonsik Kim <wonsik@google.com> TIF: misc fix for TvInputHal

- Fixed synchronization issues
- Add a few debugging logs
- Removed unused types from TvInputHal.

Change-Id: Ia5eb8a496cc3e98cb2c2ed0f77a6a313d33bf6c9
ava/com/android/server/tv/TvInputHal.java
ava/com/android/server/tv/TvInputHardwareManager.java
74b5b4005b2a7853cebc825432c31b5047b4d262 17-Jul-2014 Amith Yamasani <yamasani@google.com> am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev

* commit '562b7f0d1373404682e35bd37c99907d3d94e29a':
Split telephony restrictions into outgoing calls and sms
33e5a6be31b95f6b932952ff681d541cede29b82 17-Jul-2014 Jeff Sharkey <jsharkey@android.com> am 37f7e245: am 375d5b90: Merge "Support cluster-style installs for bundled apps." into lmp-dev

* commit '37f7e24584b0a85adc6d699818e3e863c261e4ed':
Support cluster-style installs for bundled apps.
25dd00a5192e064c13dc367d22230fd31c3bab48 17-Jul-2014 Craig Mautner <cmautner@google.com> am 73c69b27: am c2d339a6: Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev

* commit '73c69b2727b311d12f1ca8ad197db7cbe83d162c':
Additional cleanup after stack deletion.
1e4603547ad62e4267f7b249f757a8874d3c5788 17-Jul-2014 Craig Mautner <cmautner@google.com> am 96de06e6: am b1c0b008: Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev

* commit '96de06e63e63fa66c4c5b419164c74b512d00ae8':
Wait for all windows to draw before turning screen on
02e130fccfbeb524c68bd3478679d1a6f163bac4 17-Jul-2014 Alexandra Gherghina <alexgherghina@google.com> am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager

* commit '14b5a9b452d8b47617f5d908778caaf745527fe9':
Ads per-user APIs to manage accounts through the AccountManager
a44b14da0c29f2c3affab9a6da069d8f63f5bb4a 17-Jul-2014 Kenny Guy <kennyguy@google.com> am 0dfd3e04: am 41482465: Merge "Allow app restrictions for uninstalled packages." into lmp-dev

* commit '0dfd3e04f5da364e3500d3848ba3d21b3215716e':
Allow app restrictions for uninstalled packages.
963295ea105314e28e4ca9563aa09cb7440de4c3 11-Jul-2014 Andres Morales <anmorales@google.com> Permit settings to "wipe" the persistent partition

One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.

This adds one last API method that allows settings
to wipe the partition.

Bug: 14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
ava/com/android/server/PersistentDataBlockService.java
ni/com_android_server_PersistentDataBlockService.cpp
162d9433502c05c544ddb10d38f9c4b129a82352 17-Jul-2014 Prashant Malani <pmalani@google.com> am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev

* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
Make the booting flag update unconditional
329a85ba903a6d46f332c3db106c3ffb4cef851e 18-Jul-2014 Christoph Studer <chstuder@google.com> Merge "Cancel notification group children when summary is canceled" into lmp-dev
d6babbb6ce67d914c1f46dfbaf2a4ab284c2a16b 22-Jul-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Per-user API for master sync"
b39fcda2ea82ab6d7a39f2960748e49718661d69 22-Jul-2014 Sreeram Ramachandran <sreeram@google.com> am bf4a734a: am bae0d23d: am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev

* commit 'bf4a734ae78e9b39bf3a81f6ac63dc785fade1a0':
Fix WiFi-Direct.
7e949f74b281a5efaede5fc03e5388b763bf207c 22-Jul-2014 Craig Mautner <cmautner@google.com> am 4dbb0aab: am 581feb87: am 90ac517c: Create API for launching from recents

* commit '4dbb0aabb98986ed8105f85d6d46c6d4b2f78408':
Create API for launching from recents
005bbdd9967980e9c30b6ee1661ac208c76a71bd 22-Jul-2014 Craig Mautner <cmautner@google.com> am 75a17dc7: am 506d2d2a: am 39225289: Add empty ArrayList check.

* commit '75a17dc774ef812ee667f0578d9dc72db3355f3f':
Add empty ArrayList check.
4df06552d0df952d3f5c7425d224c1f648376f09 22-Jul-2014 destradaa <destradaa@google.com> am 1143f217: am ca5ddb3f: am 75c07aec: Merge "Add uncertainty for GPS received TOW field. b/16463499" into lmp-dev

* commit '1143f217878953368effccd22322089b9e1efb91':
Add uncertainty for GPS received TOW field. b/16463499
92087b30bac63ca1df93dc7d61e8af4d1b1c9487 22-Jul-2014 Geoff Mendal <mendal@google.com> am 2d633859: am 9d1dd586: am 6e8aa46d: Merge commit \'e959e4a0\' into lmp-dev

* commit '2d6338591e98fe560a1a97e8b4f0186b8edabc17':
Revert "Wait for all windows to draw before turning screen on"
66c82ef3c62776f985f8b23cc5a567ab1a95dfeb 22-Jul-2014 Craig Mautner <cmautner@google.com> am 20c6a03b: am 6b558a18: am 3c36d587: Merge "Convert from elapsed time to absolute time." into lmp-dev

* commit '20c6a03b4f6aee06421329bb002e466621427a43':
Convert from elapsed time to absolute time.
015fe21e2fb7f46d910fed440c5f485b9261a9a8 22-Jul-2014 John Spurlock <jspurlock@google.com> am 8a497588: am 8028a5a8: am 752dc6e1: New NotificationListenerService listener flags api.

* commit '8a497588b3df725c87ca4f684e15578ef7b4bfe9':
New NotificationListenerService listener flags api.
63551821f7becd6bb5b30bb2c2dfafe713ecdac0 22-Jul-2014 Dongwon Kang <dwkang@google.com> am 0de4f4dd: am 1bb343ff: am a792fc8a: Merge "TIF: Revisit types in TvInputInfo and TvContract.Channels." into lmp-dev

* commit '0de4f4dd6353937f36c5fccb0a95450f94ad873b':
TIF: Revisit types in TvInputInfo and TvContract.Channels.
a2792caec53b3dbcc39e6d7897e738a9fcf3fc4b 22-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 2142f849: am 0b6aeed0: am 68bc0359: Define a constant for HDMI-CEC logical address used for internal source

* commit '2142f8494c6496a21b508d85d16c2c34afe12c1f':
Define a constant for HDMI-CEC logical address used for internal source
a50c6d2922fde9c4277a059e47a14f82f91e4e6c 22-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 6e4255cc: am e3007cba: am 67151b71: Invoke device event listeners when clearing CEC devices

* commit '6e4255cc3dc673cd86dae2e687a6e9cafb207eb3':
Invoke device event listeners when clearing CEC devices
abe3c8026b4371789c70601047f33353c4232f6c 22-Jul-2014 Jungshik Jang <jayjang@google.com> am 1ea13c20: am d21c92f8: am 5ef743d9: Merge "Follow up send message errors of hdmi_cec.h in service side" into lmp-dev

* commit '1ea13c20b0fe3972675e82f25c5474a0e19cdd6c':
Follow up send message errors of hdmi_cec.h in service side
4944bc0c407b5afb267b5920533e2dece6bc9827 22-Jul-2014 Dianne Hackborn <hackbod@google.com> am 4db59328: am d8b0edbf: am 8f5105c6: Merge "Add permissions associated with app ops." into lmp-dev

* commit '4db593286f561ad5af1c32f9dbd12ebd8ca0d242':
Add permissions associated with app ops.
7a47bad49a2396d95a06934f7739b4edff4c843a 22-Jul-2014 Yao Chen <yaochen@google.com> am 509e9e88: am 334ab599: am 78bb2dad: Merge "Updated media browsing API & tests." into lmp-dev

* commit '509e9e8897eee21ef7b0253f3c3ba026cddfdf36':
Updated media browsing API & tests.
ef3ee09a1c18b2bdb3ec25a433fdce3d3366d3a5 22-Jul-2014 Jeff Brown <jeffbrown@google.com> am f831885b: am 887a54b7: am e5871d89: Allow dreams to control screen state and brightness.

* commit 'f831885ba9e3f8e3c42cf6565a9d431580809ee2':
Allow dreams to control screen state and brightness.
dbcdec931f98332c1153f3ceae4e927109d2b7e9 22-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am 1bda03fe: am 6f5652c9: am aec45c28: Revert "Send TV app the intent for the new active source"

* commit '1bda03fe07b7e35aac7079e52635f4727afab871':
Revert "Send TV app the intent for the new active source"
2194d8869faa92af23facf798a1e3625d6acc513 22-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am caff7008: am 8ea9bdbf: am 9808af71: Send TV app the intent for the new active source

* commit 'caff7008c62fa790142f35ca74625f1659cce049':
Send TV app the intent for the new active source
d84e59c70f7adc48adbdfbba823a8083dfec7e38 22-Jul-2014 Amith Yamasani <yamasani@google.com> am 5d5fa324: am b0cae189: am f8b67f1f: Rename setApplicationBlocked to setApplicationHidden

* commit '5d5fa324871437c3bd240ae231adae9bbea6b0ba':
Rename setApplicationBlocked to setApplicationHidden
930f93605c37361afd255b998d67d30426d47934 21-Jul-2014 Jeff Sharkey <jsharkey@android.com> am 31bbf83f: am c7a62d72: am a56503ee: Detect bundled app ABI for cluster-style layout.

* commit '31bbf83f930e3aef8e5aba865b3a29a9127a818b':
Detect bundled app ABI for cluster-style layout.
96e92d7df8ea1cd1639f96dff4c06efbd89550cb 21-Jul-2014 destradaa <destradaa@google.com> am 0c391da3: am 3fafcc8a: am d26d2bf6: Merge "Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308" into lmp-dev

* commit '0c391da32542c1186b81128e9a6725eb5744999c':
Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308
2774d535c7e0a5f972b34a5e24177e2fccfa32f9 21-Jul-2014 destradaa <destradaa@google.com> am 584ca2bf: am a4d0d8c2: am 77e1c1a5: Merge "Update GPS HAL raw measurements support." into lmp-dev

* commit '584ca2bf83097c8e3b321808e647b1a565f683ed':
Update GPS HAL raw measurements support.
ddd0e4049f690eb535e7fc4c2925f0c13cf67d2a 21-Jul-2014 Craig Mautner <cmautner@google.com> am ca22b33f: am b7bb95b0: am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead"

* commit 'ca22b33f6026c5bfe1af32edb0890c9319f31d1e':
Skip broadcasting to a receiver if the receiver seems to be dead
f13cdabb9357112061cc770a7ba9e0fa7cd67266 21-Jul-2014 Dan Sandler <dsandler@android.com> am 61681416: am 00c3f554: am 8bfa8dbc: Defend against null ApplicationInfos.

* commit '616814161410d9794d7de89a5f04742f74e622eb':
Defend against null ApplicationInfos.
58ba7fa3a9a1c065fe892370021e1a6cf3cff26f 21-Jul-2014 Wonsik Kim <wonsik@google.com> am 168ec8b1: am 39ac147e: am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev

* commit '168ec8b13227d9756dc4c49c3a0cd20a5f627776':
TIF: fix indexOfValue usage
b66de10fa42ae465a36bc33b1b913d77b196e2a3 21-Jul-2014 Jungshik Jang <jayjang@google.com> am 353dcd70: am 13dc029e: am 7506f4c9: Merge "Add two apis for one touch record." into lmp-dev

* commit '353dcd7034fa69f8061c2079be5523f5b4102387':
Add two apis for one touch record.
166ff6cc6d154d904a6c1040833188197a03d677 21-Jul-2014 Ji-Hwan Lee <jihwan@google.com> am 6ed883cf: am 1dc7352e: am d0f94173: Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev

* commit '6ed883cf469c99e45d4a53a5fd5b6e9fc7503fb4':
TIF: Extend multiple TV input per service for HDMI logical devices
5013b471b050f2fdeb72203a96f2b9300226ffc4 21-Jul-2014 Jungshik Jang <jayjang@google.com> am d33d1732: am a86a6f2c: am 9d42d1f3: Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev

* commit 'd33d1732261446120fe85b67acde7097870d5b09':
Do no send <Feature Abort> as response of <Feature Abort>
be3b63668a8bd4164434e9af2a553ca74905c8a2 21-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am d01a0137: am d4a48882: am 2a1ff5ad: Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev

* commit 'd01a01374b6407c34b4b30ad74db25299f36fc07':
Invoke callback for HdmiControlService.deviceSelect() for internal source
d94922f96859c43bfd213ecb6cb057df4c8d7047 21-Jul-2014 Jinsuk Kim <jinsukkim@google.com> am a5c8b021: am e51029b9: am 1e6393b8: Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev

* commit 'a5c8b021023b786f918ee2bef33b99272f130628':
TIF: Register IHdmiInputChangeListener to physical input manager
a06dd24bcff94b365838ca90206bd2bd3c1e339c 21-Jul-2014 Jae Seo <jaeseo@google.com> am 31f31f10: am 0e29adb6: am bf1a0ff0: TIF: Add sendAppPrivateCommand()

* commit '31f31f10de63b562b2137c7ca7b22472bfb9a7e3':
TIF: Add sendAppPrivateCommand()
526e8434995dfe135660658e131f33e6cca0a5c4 21-Jul-2014 Dianne Hackborn <hackbod@google.com> am 65f62f23: am 39285ff1: am 1648dbb4: Merge "Fix issue #16400873: Apps that show ads as new tasks stay in recents..." into lmp-dev

* commit '65f62f236395b44a0c168f1ec72855197927a885':
Fix issue #16400873: Apps that show ads as new tasks stay in recents...
e093bc6fafc467ee91a712ad77ac4996dbb3b69c 21-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> am 1b357e1f: am 50c7e24f: am c741502b: Merge "Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE" into lmp-dev

* commit '1b357e1f8cef221bbbf0029ac72bf6a0a87784cb':
Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
af377def968985e7d1a22f6b0791652c46655745 21-Jul-2014 Wonsik Kim <wonsik@google.com> am 2c1c0a74: am e2d65e08: am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev

* commit '2c1c0a74df0751556ad889e37e51e1523f9a6e21':
TIF: revise API names
999b83af8b26caee29f0b48d123db86124385c32 21-Jul-2014 John Spurlock <jspurlock@google.com> am 4704c806: am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.

* commit '4704c8067743f36df6fc9622090f422e6bdec2c5':
Zen mode filtering should use new usage constants.
0c585845fee8dd28fef45b991b8d3b9e46e709fb 21-Jul-2014 Wonsik Kim <wonsik@google.com> am afa87298: am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev

* commit 'afa8729857c54b746d23804e077aa6034b47cce3':
TIF: misc fix for TvInputHal
e53b1eb276941ea9cbd9bfd8807e38fa67509797 21-Jul-2014 Jeff Brown <jeffbrown@google.com> am 5fbc6cae: am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev

* commit '5fbc6cae0c643be46de3c7c720c8e26a182514fa':
Allow dreams to wake up gently.
1d959784232ec5eff680e5bfc79e7e4f89ff2175 21-Jul-2014 Jeff Brown <jeffbrown@google.com> am 22193893: am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.

* commit '22193893f7a79f1351caf157a8d6932e7ec3c825':
Add new Display.STATE_DOZE_SUSPEND power state.
dbff278e839a52abfa814308d341b0cdbd06f2ce 21-Jul-2014 Jae Seo <jaeseo@google.com> am e3576308: am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev

* commit 'e3576308987b508384c8689940ec71fbfb39b580':
TIF: Add a way to notify whether the current program content is allowed
24f448d7b3a28478d7af207c3d04b68af2535073 21-Jul-2014 Christopher Tate <ctate@google.com> am 0eebcfd7: am 32523262: am 12e9b896: Fix which index goes where

* commit '0eebcfd7582d576110a42acb799b8a8c639f693f':
Fix which index goes where
e15ecb21f49424062e8ead83c34997d2f17e4cab 21-Jul-2014 Jay Civelli <jcivelli@google.com> Merge "Fix removeListener in TrustManagerService."
979a32e4a0133e0b55210247aa776f57c17b9b9a 19-Jul-2014 Jay Civelli <jcivelli@google.com> Fix removeListener in TrustManagerService.

The removeListener method was not removing listeners.

Change-Id: Icd5366f03f8fc9c3d283c7b4416b9cff3c75cc59
ava/com/android/server/trust/TrustManagerService.java
54a463498316594ba7e0567db5d4f541a7a1e827 18-Jul-2014 Jae Seo <jaeseo@google.com> Merge "TIF: Add TvParentalControlManager" into lmp-dev
6057102dbb746593a7d59cf377c969b62e38c664 15-Jul-2014 Jae Seo <jaeseo@google.com> TIF: Add TvParentalControlManager

Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.

Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.

Bug: 13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
ava/com/android/server/tv/TvInputManagerService.java
dc00a84af15ff3594a6dfa512be21095bf9fee82 17-Jul-2014 Ben Murdoch <benm@google.com> Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.

This allows the WebViewUpdateService to receive notifications that
an update has been installed and we need to trigger recreation of
the relro file.

bug: 16329377
Change-Id: I088e61487416add997995db304beca0cde71390c
ava/com/android/server/webkit/WebViewUpdateService.java
6ccb5f894e11a0ee59c0632643f265427731536e 17-Jul-2014 destradaa <destradaa@google.com> Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
9353e1a2b2e8f02377c3f73565964ffb0927c776 17-Jul-2014 Prashant Malani <pmalani@google.com> Merge "Make the booting flag update unconditional" into klp-modular-dev
3b0224dc3c2e7ffb93dc56970395003d0e387545 16-Jul-2014 destradaa <destradaa@google.com> Fix exceptions in ActivityRecognition platform stack.

b/16348349

Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
ava/com/android/server/location/ActivityRecognitionProxy.java
69eef8a0d250ae1b50b510499014e109bd2c6112 17-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Support cluster-style installs for bundled apps." into lmp-dev
1e9189a276e967a7a74ff44a44cf627764396954 17-Jul-2014 Jeff Sharkey <jsharkey@android.com> Support cluster-style installs for bundled apps.

Bug: 16319961
Change-Id: I499b904dfd56f236a1b574c29a44272ed814be0f
ava/com/android/server/pm/PackageManagerService.java
13420f2311757554c314f620c83cb55153b67612 19-Jul-2014 Dianne Hackborn <hackbod@google.com> Fix issue #16400873: Apps that show ads as new tasks stay in recents...

...even when I hit back or close the activity in UI

Change the semantics of NEW_DOCUMENT to have the recents entry be
removed by default when its activity is finished, with various ways
to explicitly turn off this behavior.

Change-Id: Idc717706d27de80f28b53ad76f9e375d85118d71
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/TaskRecord.java
89c3b29a9bfa0ae9858b913bc1ab6604c4613a15 20-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE

AudioAttributes: rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE to
USAGE_NOTIFICATION_RINGTONE in the list of usage values.
Temporarily keep the old definition to prevent transient build
breakages, will be removed after telephony packages have been
updated.

Bug 16401631

Change-Id: I9398443fd7ba3c30e9d371c5c5a2934b9ea6f30a
ava/com/android/server/VibratorService.java
ava/com/android/server/notification/ZenModeHelper.java
f6d466895b74d620d646abbec1c8911f3a0ce0bb 18-Jul-2014 Jeff Brown <jeffbrown@google.com> Allow dreams to wake up gently.

This change adds a new DreamService.wakeUp() method to allow a
dream to wake itself up gently and perform a transition before
finally finishing. The power manager will ask a dream to wake
up gently in most cases but may force it to happen immediately
when necessary.

If the dream takes too long to finish itself then the dream
controller will douse it with water summarily after 5 seconds.

Change-Id: Ib0564c5650cd5a454e1acc5aa91fe46995eecfa7
ava/com/android/server/dreams/DreamController.java
ava/com/android/server/dreams/DreamManagerService.java
ava/com/android/server/power/PowerManagerService.java
e2e280ec591d59f47d55b8a8552de2f4c7fb1636 17-Jul-2014 Craig Mautner <cmautner@google.com> Merge "Restore calling identity before checking permission" into lmp-dev
85c11a8831ba9572813f122674b3680ae4d14010 17-Jul-2014 Craig Mautner <cmautner@google.com> Restore calling identity before checking permission

Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.

Fixes bug 16215650.

Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
ava/com/android/server/am/ActivityStackSupervisor.java
999d394adee533c55fce38bd632ffd4f1af91362 03-Jul-2014 Alexandra Gherghina <alexgherghina@google.com> Ads per-user APIs to manage accounts through the AccountManager

Bug: 16056552
Bug: 14642886
Change-Id: I17ff6c2515285e63c84cecf2f861d10666c393c5
ava/com/android/server/accounts/AccountManagerService.java
cf04fc99c25324407e6d9b349bc16a7d03b6ec36 17-Jul-2014 Torne (Richard Coles) <torne@google.com> am 8829ffe0: am 07119f4a: Use the WebView\'s loader library to load the real library.

* commit '8829ffe031d612248a1a02d89e923f4c6c947fb0':
Use the WebView's loader library to load the real library.
Remove WebView library preloading mechanism.
1887a0781edcd0ec0f79a17f7a092b6f366a3f65 17-Jul-2014 Kenny Guy <kennyguy@google.com> am bad2ccf9: am 6ec1e21d: Merge "Check for exported and category before starting activity." into lmp-dev

* commit 'bad2ccf92776fd19c042ef76d0415fdee2f06bef':
Check for exported and category before starting activity.
1423ab75a43d5ad0c4f17c15b4eefa3357c88152 17-Jul-2014 Nicolas Prevot <nprevot@google.com> am a2a8501e: am 9a4cf569: DO NOT MERGE

* commit 'a2a8501ed552ec2c7679f079b2118a6eed2827ac':
DO NOT MERGE
ec18364c7b8ef3e05a5c8e25075e1edb5976181c 17-Jul-2014 Dianne Hackborn <hackbod@google.com> am 68f35ec2: am dbec91c0: Implement issue #16330060: Inform ActivityManager about WebView...

* commit '68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
Implement issue #16330060: Inform ActivityManager about WebView...
df3ef4fb1e8dff706a7478d4784863820c527e0b 17-Jul-2014 John Spurlock <jspurlock@google.com> am 11d850c1: am efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev

* commit '11d850c11157aab9804d28169f9c72cca431fc1e':
Update data limit notification icon + strings.
18a49791fac4b4c6d578a72b9a0539a91200f6f5 17-Jul-2014 John Spurlock <jspurlock@google.com> am 7aeea625: am 45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev

* commit '7aeea625a5cd90de691c9037310553f14eb73560':
Add a zen-specific event sink, include in dumpstate.
33721c11437c6a63d3eecc9b7d2b53177cfba6be 17-Jul-2014 Amith Yamasani <yamasani@google.com> am d63203df: am b31b07c8: Merge "Allow content provider access across users" into lmp-dev

* commit 'd63203dfa38bf1b40ba976bfad1e9fcfeb761ddf':
Allow content provider access across users
a9f9992d7b20006830050ba246d74d9c34d6982a 17-Jul-2014 Jungshik Jang <jayjang@google.com> am d26e2a0c: am 6d98d91f: Merge "Hook up system audio mode" into lmp-dev

* commit 'd26e2a0cc786608f4cb88213202f8424e29e7e9e':
Hook up system audio mode
1da67f0cb48894f3e270ec03f13c27834761e7fa 17-Jul-2014 Dianne Hackborn <hackbod@google.com> am d8f0526c: am 8b353ef1: Merge "Maybe fix issue #16167054: Wakelock is acquired and released in..." into lmp-dev

* commit 'd8f0526c252b142faffddf035b3d32d35f39e7bf':
Maybe fix issue #16167054: Wakelock is acquired and released in...
551a327424b2dffa92f36631b2ea9808c7c4fbaa 17-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> am 004a427e: Merge "Make a network the default when it connects if we have no default." into lmp-dev

* commit '004a427e630e1db09df00e8f826627f919183c89':
Make a network the default when it connects if we have no default.
dd718ab5d6796b3e09389028cc19a4e548009919 17-Jul-2014 Stuart Scott <stuartscott@google.com> am b8948923: Merge "MSIM: dump sub specific info" into lmp-dev

* commit 'b8948923b3f5eaf2eac96788294bc8c82cf0cfa9':
MSIM: dump sub specific info
1f095c10f038ab74d034de83a8d3aa36dcea09dc 17-Jul-2014 Jeff Sharkey <jsharkey@android.com> am 2158503f: Merge "Install sessions only inherit APK files." into lmp-dev

* commit '2158503ff835f60d1a39f5bac724dd90e0900403':
Install sessions only inherit APK files.
08cfaf672604422dd355d6703aec78f3aa5ee74e 08-May-2014 Torne (Richard Coles) <torne@google.com> Use the WebView's loader library to load the real library.

Load libwebviewchromiumloader and use it to load the real WebView
library, to enable sharing of the relro segment between different
application processes without requiring that the library be preloaded in
the zygote. A system service is added to track whether the relro segment
file has been prepared, and block loading of the library until it has
been.

Bug: 13005501
Change-Id: I846b37c7b8e2a4eb8a39e4fd455bccbb2048c173
ava/com/android/server/webkit/WebViewUpdateService.java
aa9b0f15753541ff8e4d62e6497c11800c737077 17-Jul-2014 Craig Mautner <cmautner@google.com> resolved conflicts for merge of 0a931069 to lmp-dev

Conflicts:
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: I68e8290566b51fadb5671abdd9d05faf28502e22
45374c9afad9ddc21966239d38823bd214145d24 17-Jul-2014 Craig Mautner <cmautner@google.com> Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev
efc81e7d5edaa096a90ec17516549f9df49899fa 17-Jul-2014 Craig Mautner <cmautner@google.com> resolved conflicts for merge of 75f31740 to lmp-dev

Conflicts:
services/core/java/com/android/server/wm/WindowManagerService.java

Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b
d35858662cad5c3cad2b242ad6de7d65bc545944 17-Jul-2014 RoboErik <epastern@google.com> am b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev

* commit 'b21fab77c0758da3dcb2fa0029fef92df4d5902a':
Change adjustVolumeBy to adjustVolume
e702404c5a9d46765acb76f63ea6338d0a42b030 08-Jul-2014 Nicolas Prevot <nprevot@google.com> DO NOT MERGE

Remove cross-profile intent filters when removing a user.

When a user is being removed: removing cross-profile intent filters that have
this user as their source.
This makes sure that if the user id gets reassigned without restarting the phone,
we do not have old information from the preexisting profile.

Change-Id: Ie3a2aa0cbbe6c9eb9e945e650fd907e5cc012409
(cherry picked from commit d44e2d7340c70406d8b5eb8b3d6c6c0daaa8705f)
ava/com/android/server/pm/Settings.java
0a93106964eec2462ec86e372def1b0d1526cd7d 17-Jul-2014 Justin Koh <justinkoh@google.com> am 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev

* commit '65d7c332d7b613f23a26066051cc7496e0efa994':
Additional cleanup after stack deletion.
75f317403f9bf7bbd3de8ec50868cb727f17ac45 17-Jul-2014 Justin Koh <justinkoh@google.com> am 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev

* commit '77cdac05ba80925f6cdc4c349af0fa7567c36146':
Wait for all windows to draw before turning screen on
fee756ff91ab4d8f0e09ddb050d22d88ebb66ae7 17-Jul-2014 Dianne Hackborn <hackbod@google.com> Implement issue #16330060: Inform ActivityManager about WebView...

...state changes.

Add a new API to tell the activity manager about a new dependency
one process has on another package. Start using it already for
when apps is Context.createPackageContext() to load code from another
app.

Also do some work on getting the monitoring of proc/uid states
in shape so it can be used by unundled code, along with an
AppImportanceMonitor class for doing so.

Some small fixes and additions to VoiceInteractionService.

Improve handling of unaccounted/overcounted battery use so that
they aren't shown to the user unless they are significant.

Change-Id: I22dd79a73f4e70103d3f8964494aebc8a31f971c
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ProcessRecord.java
1827fdcbf6a53378f05620790e4798201341097b 17-Jul-2014 Jungshik Jang <jayjang@google.com> Do no send <Feature Abort> as response of <Feature Abort>

Cec service replies <Feature Abort> back to original device
if incoming message is not handled by any of feature action or device.
It's applied to <Feature Abort> message itself, but it can cause
weird sideeffect of it.
This change just ignore <Feature Abort> even though it's not handled
by any of local device or feature actions.

Bug: 16359564
Change-Id: I925e89ca4db49a637dd296447c04eee1ba679c6b
ava/com/android/server/hdmi/HdmiCecController.java
bb4d6a20bdb14903067e486b33f842fac388e338 17-Jul-2014 Amith Yamasani <yamasani@google.com> Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
390989da1967f9d385212cd2e22a50589ce69046 17-Jul-2014 Amith Yamasani <yamasani@google.com> Split telephony restrictions into outgoing calls and sms

DISALLOW_TELEPHONY renamed to DISALLOW_OUTGOING_CALLS and introduced
DISALLOW_SMS.

Outgoing emergency calls should always be permitted.

Change-Id: I0a38ef6e2df9dcf62d16fd93622ad61f4327614f
ava/com/android/server/pm/UserManagerService.java
f05b231485fdbf4deedd22aecc51d9b0a9550e47 17-Jul-2014 Kenny Guy <kennyguy@google.com> Merge "Allow app restrictions for uninstalled packages." into lmp-dev
d21b2181390fb96e3a0742be9b985a52d4de2d2c 17-Jul-2014 Kenny Guy <kennyguy@google.com> Allow app restrictions for uninstalled packages.

Stop cleaning up app restrictions for packages
that aren't installed.
Remove app restriction file if restrictions is
set to an empty or null bundle.
All user types may now have restrictions if a
profile or device owner is present.

Bug: 15565914
Change-Id: I55f38ca0ad7794b9fc2967113973dc035a416558
ava/com/android/server/pm/UserManagerService.java
78fd9d6b36b78abb57bf2a29e314202bdf26f480 17-Jul-2014 Kenny Guy <kennyguy@google.com> Merge "Check for exported and category before starting activity." into lmp-dev
2df1892f411de6fa93ba487e3c4d23a079b74fcb 17-Jul-2014 Kenny Guy <kennyguy@google.com> Check for exported and category before starting activity.

Make LauncherAppService check that component passed to
startActivityAsUser is exported and has the category
Intent.CATEGORY_LAUNCHER before starting it.

Bug: 15989072
Change-Id: I29d03fae49ff0ca8d7f7524f5e71895d62ff3cae
ava/com/android/server/pm/LauncherAppsService.java
0a589b929e18d05d1345d97283c3025058ddca18 17-Jul-2014 Craig Mautner <cmautner@google.com> Wait for all windows to draw before turning screen on

Was previously only waiting for windows on the primary display to
draw which meant that windows on ActivityViews had not yet drawn.
This fix checks redraws all outstanding Surfaces before unblanking
the screen.

Fixes bug 15092354.

Change-Id: Id550db003a5f56931eb68464085596e47d25481d
ava/com/android/server/wm/WindowManagerService.java
9034620dd5a13e4b76cf6c31fb1fd7e5b79678e3 17-Jul-2014 Amith Yamasani <yamasani@google.com> Merge "Allow content provider access across users" into lmp-dev
ebf1fd99d67875c36c7dcd09b2246b6c3e22e9ae 17-Jul-2014 Amith Yamasani <yamasani@google.com> Allow content provider access across users

If the package has INTERACT_ACROSS_USERS. This had recently
regressed. Bringing back the functionality needed for multiuser
call log syncing.

Bug: 16298776
Change-Id: I4fdc3d676bb8a2bf78f5c27c41a74c0491e343cd
ava/com/android/server/am/ActivityManagerService.java
0d192a9e279133f80a288d34e50c64a5c91c1a5b 16-Jul-2014 Dianne Hackborn <hackbod@google.com> Maybe fix issue #16167054: Wakelock is acquired and released in...

...battery history even though CPU is in suspend

There is a race in the power manager between noting a wake lock
acquire and ensuring the device is staying awake.

Change-Id: I3d76f99d73dca119b09f253f0e31448408c88a3c
ava/com/android/server/power/PowerManagerService.java
bcc0eae1dc48b9a00adc8f321a86dd2805cb82a2 17-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Hook up system audio mode" into lmp-dev
377dcbd53af4529c352d453424539b069909fce4 15-Jul-2014 Jungshik Jang <jayjang@google.com> Hook up system audio mode

Whenever system audio mode is changed, it should notify to AudioManager
so that AudioManager changes internal output or mute status accordingly.
To have more clear cut between last setting and current system audio mode,
renamed mSystemAudioMode into mSystemAudioActivated and added
getLastSystemAudioMode() which returns last system audio mode value stored
in global settings (NVM).

Bug: 16002150
Change-Id: I5d01d879c1c5a9a3f4b0cf2d25e9e74c26c52fa0
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/SystemAudioActionFromAvr.java
ava/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
ava/com/android/server/hdmi/SystemAudioStatusAction.java
27b02b7aba848167e263e5fec9c1c7102b334731 14-Jul-2014 Paul Jensen <pauljensen@google.com> Make a network the default when it connects if we have no default.

When a network comes online, is a candidate for being the default network
(i.e. satisfies default NetworkRequest), and the device has no default
network, then make the new network the default network for the purposes
of routing network traffic. This does not affect NetworkRequests or
NetworkCallbacks. This ignores but does not affect network validation.

Benefits:
1. Offers a fail-safe in case network validation returns a false negative.
For example: It would be nice if every Android device didn't fail when
clients3.google.com/generate_204 went down.
2. Offers a method to debug connectivity issues.
For example: If WiFi is failing, disabling Cellular would rule out
interference from WiFi network validation.
3. Reduces delay between no connectivity and any connectivity.
4. Offers a fail-safe in cases of unreliable networks.
For example: You need rescuing from a remote location with a weak signal
offering 90% packet loss. You just want your distress call to go out
but are infuriated to find network validation blocks connectivity.

Change-Id: I78621a1fe8ed2a336591f65bf7b07a6cbcc7ba5e
ava/com/android/server/ConnectivityService.java
65d7c332d7b613f23a26066051cc7496e0efa994 17-Jul-2014 Justin Koh <justinkoh@google.com> Merge "Additional cleanup after stack deletion." into klp-modular-dev
ee36c77acd3b92c64e53e19c570e2482382db870 16-Jul-2014 Craig Mautner <cmautner@google.com> Additional cleanup after stack deletion.

- Remove activity from PendingActivityLaunch list when it is removed
from stack. This prevents the delayed launch causing
IllegalArgumentException in b/16045752.
- Move PendingActivityLaunch from ActivityManagerService to
ActivityStackSupervisor.
- Immediately call onTaskListEmptyLocked() in cases where no
activities are found in stack.

Fixes bug 16045752.

Change-Id: Ia69a449e7f5e08ab6e36157d0fd793c4d2fdaca4
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
1375e73ed879b8cadf4c0a60077d58d1d0954cca 17-Jul-2014 John Spurlock <jspurlock@google.com> Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev
6ae82a747c77fbdba45d2deaf127ef068c294aa1 16-Jul-2014 John Spurlock <jspurlock@google.com> Add a zen-specific event sink, include in dumpstate.

Useful for tracking zen events (since boot) that are
too old to be included in the standard log.

Change-Id: I91633d35b26091bb18523a76ebdba9d286d0cd41
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenLog.java
ava/com/android/server/notification/ZenModeHelper.java
aedebda776ee3a68eda498a79bf14855e5f5d62e 14-Jul-2014 John Spurlock <jspurlock@google.com> Update data limit notification icon + strings.

- Use a more specific disabled cellular data icon.
- Reword framework strings to use "Cellular" instead of "Mobile"
and avoid "enabled/disabled"
- Update SystemUI's network limit dialog to follow suit.

Bug:16185238
Change-Id: Ie9191990fab17cd7dc04395fad39f84bfff8349d
ava/com/android/server/net/NetworkPolicyManagerService.java
2b3b2bc80f1a892faf95b6c839088777c1d81838 16-Jul-2014 Narayan Kamath <narayan@google.com> am baba92bd: Merge "Dexopt for Context.createPackageContext when code is included." into lmp-dev

* commit 'baba92bd1da887db7c3e834fe7d2a7081936aecf':
Dexopt for Context.createPackageContext when code is included.
514fcafacd754f092f2424d3eed09153b23d37be 16-Jul-2014 Narayan Kamath <narayan@google.com> am 4adbb78f: Merge "Adjust nativeLibraryDir for package contexts of multiArch installs." into lmp-dev

* commit '4adbb78fa8330ea635d938af117b47a75512a504':
Adjust nativeLibraryDir for package contexts of multiArch installs.
192fd37d3eadeb816128d05ce183900473b8f8fb 16-Jul-2014 Craig Mautner <cmautner@google.com> Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp
f33f4d7f60eb11ef288961cd00dec0ff06373a15 16-Jul-2014 Craig Mautner <cmautner@google.com> am 15c2da7c: am 2e7b2521: Merge "[ActivityManager]: Update home process when home activity resumed"

* commit '15c2da7ce51ad1c1cbb07602644fa7291e8c7896':
[ActivityManager]: Update home process when home activity resumed
58e7d25ca7e20ab22c7f108dcee74fb0083fc025 16-Jul-2014 Jeff Sharkey <jsharkey@android.com> am 14c39031: Merge "Clearing "cache" shouldn\'t include "code cache."" into lmp-dev

* commit '14c39031ae495097457be8f194fcbc4bb66e386e':
Clearing "cache" shouldn't include "code cache."
8929a5f91b3de68656778022387f1dc0efe7d6c7 16-Jul-2014 Jason Monk <jmonk@google.com> am bc0f6147: Merge "Finalizing lock-to-app UX" into lmp-dev

* commit 'bc0f6147ddc6718a30d12b89d9a39e65c568ef28':
Finalizing lock-to-app UX
50bad3121dc865f8ffd3786e15d534ff4dfb1981 16-Jul-2014 Jeff Sharkey <jsharkey@android.com> am 5ddccbd2: Merge "Add code cache directory for apps." into lmp-dev

* commit '5ddccbd263e50c6c2d3b63ea290e0db661a726f5':
Add code cache directory for apps.
9a445771f57dd15b06db0dbefd66c368d84eec2d 16-Jul-2014 Jeff Sharkey <jsharkey@android.com> Install sessions only inherit APK files.

Also track historical install sessions for debugging purposes. Hide
signature verification API for now. Clear code cache only after
killing the app being upgraded.

Bug: 14975160
Change-Id: I52fc7f11d2506f792236d8a365c8cfed21b46c30
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
ac17c2a8c9ba85efdd35f0262d05a41554eb3775 16-Jul-2014 RoboErik <epastern@google.com> Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
1ff5b1648a051e9650614f0c0f1b3f449777db81 16-Jul-2014 RoboErik <epastern@google.com> Change adjustVolumeBy to adjustVolume

This makes volume adjustments take a direction instead of a number of
steps and renames the API appropriately.

Change-Id: I6a31cbc42d889a38aa63446686a424cb2b8b2270
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
5fcaa0c6705ae42be8ff507b362fb8e2393a606a 16-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Clearing "cache" shouldn't include "code cache."" into lmp-dev
78f3cf971b33aa5788f59234fbf3b93b0d0197ec 16-Jul-2014 Jeff Sharkey <jsharkey@android.com> Clearing "cache" shouldn't include "code cache."

Bug: 16187224
Change-Id: I075b651d1ff89d4f0232497d28a6b11270cba4d9
ava/com/android/server/pm/PackageManagerService.java
d0a2de06a7fb4daaf91a75e9e04a2cb54ebc6fba 16-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Add code cache directory for apps." into lmp-dev
76ae2f07e04ae5288a8c485a0c37e844743e012b 16-Jul-2014 Craig Mautner <cmautner@google.com> am 07c3b195: am d543c3e1: Merge "[ActivityManager] Do not finish root activity when reset task"

* commit '07c3b19556b03a51c661b21c19c16deebab6065b':
[ActivityManager] Do not finish root activity when reset task
4d4d4dc4e0bdbe9cceac04b4b1d92c1c71b7bac0 16-Jul-2014 Alexandra Gherghina <alexgherghina@google.com> Per-user API for master sync

Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
ava/com/android/server/content/ContentService.java
e4ef156b61fcdbeb4eb62a1426e1b56cbd95c1b2 04-Jul-2014 Christoph Studer <chstuder@google.com> Cancel notification group children when summary is canceled

Bug: 15865959
Change-Id: I29f8f5357f85eac3d4129ff9a15168f52caaa613
ava/com/android/server/notification/NotificationManagerService.java
4ed745d359ada6986ac15d8718452e5c55f40170 16-Jul-2014 Jeff Sharkey <jsharkey@android.com> Add code cache directory for apps.

This provides a directory where apps can cache compiled or optimized
code generated at runtime. The platform will delete all files in
this location on both app and platform upgrade.

Bug: 16187224
Change-Id: I641b21d841c436247f35ff235317e3a4ba520441
ava/com/android/server/pm/Installer.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
78a130144bdd047665f00782c481d31edb3e5fb7 16-Jul-2014 Jeff Sharkey <jsharkey@android.com> Mark resource-only splits as hasCode=false.

PackageManagerService now skips dexopt for split APKs that don't
declare they have code. Also surface more detailed error messages
in logs.

Bug: 14975160
Change-Id: Ie6078dba724815020cee59b7fc52317e88ca097a
ava/com/android/server/pm/PackageManagerService.java
7c673820d7fc981b7e30ae51cbcb767fab757796 16-Jul-2014 Stuart Scott <stuartscott@google.com> Merge "MSIM: dump sub specific info" into lmp-dev
2f32ac25e94b9451f9004c8a5679762d3fdd9acd 15-Jul-2014 Sandeep Gutta <sangutta@codeaurora.org> MSIM: dump sub specific info

Add support to dump subscription specific info
in TelephonyRegistry.

Clean cherrypick from partner repo.

Change-Id: I8f9471ef76de95f96943b3d89156a2fc1a041360
ava/com/android/server/TelephonyRegistry.java
da96e137bcc8191c584ada7b5de31eaae92f244f 15-Jul-2014 Jeff Sharkey <jsharkey@android.com> Parse more split APK manifest details.

Allow split APKs to define activities, services, receivers,
providers, and metadata. However, support for many manifest items
are explicitly omitted.

Only dexopt split APKs that include code.

Bug: 14975160
Change-Id: I2fbf99e2a62328aa2185e5924755af33060282fc
ava/com/android/server/pm/PackageManagerService.java
2053168eb4506e2f8795afdbe9731c6451e1589c 14-Jul-2014 Narayan Kamath <narayan@google.com> Dexopt for Context.createPackageContext when code is included.

The package manager now keeps track of per ISA dex-opt state.

There are two important things to keep in mind here :

- dexopt can potentially be very slow. In cases where the target
package hasn't been dexopted yet, this can take multiple seconds
and may cause an ANR in the caller if the context is being
created from the main thread.
- We will need to remove the constraint that dexopt can only be
requested by the system (or root). Apps will implicitly be
requesting dexopt by asking for package contexts with code included.
It's important to note that unlike dalvik, the dexopt stage in ART
isn't optional. ART cannot load classes directly from dex files.

bug: 15313272
Change-Id: I0bd6c323a9c1f62f1c08f6292b7f0f7f08942726
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/BackgroundDexOptService.java
ava/com/android/server/pm/PackageManagerService.java
d8723bd3d68fc62134729a767ffead821add128e 16-Jul-2014 Narayan Kamath <narayan@google.com> Merge "Adjust nativeLibraryDir for package contexts of multiArch installs." into lmp-dev
7dba6eb3ac4fd6c8195cb0d0425866de50a9e114 16-Jul-2014 Narayan Kamath <narayan@google.com> Adjust nativeLibraryDir for package contexts of multiArch installs.

When we're creating a package context for a multi-arch app,
adjust the native library directory to match the bitness of
the process creating the context.

This change also removes apkRoot (which wasn't really being used)
and replaces it with a fully constructed secondary library path.
The secondary library path is a transitional measure until we
can reorganize the system image so that we can use nativeLibraryRoot
for system paths as well (nativeLibraryRootRequiresIsa will then
be true for all packages except for legacy installs).

bug: 16013931

Change-Id: I5ae090334b377b9e087aecf40075fab81b20b132
ava/com/android/server/pm/PackageManagerService.java
febcb9d42bb6b458a3bbe59730476518f5a252d7 16-Jul-2014 Jason Monk <jmonk@google.com> Merge "Finalizing lock-to-app UX" into lmp-dev
d4e632bbb62eb2aaa231c2a70c5bc3dbe1a248ef 16-Jul-2014 Adrian Roos <roosa@google.com> Merge "Fix windows not showing when SHOW_WHEN_LOCKED changes" into lmp-dev
93d837fd01bd529812bfe9b07b47fc35a5c4c394 16-Jul-2014 John Spurlock <jspurlock@google.com> Merge "Zen: handle exit conditions across reboots." into lmp-dev
61e9bf246f3eacf1b11305eb86a8cb2a217adc5c 16-Jul-2014 Narayan Kamath <narayan@google.com> Fix install --abi for apps with no native code.

We will need to record the overriden ABI in the package
settings (and applicationInfo) so that we launch the app
with it.

Change-Id: Ib71aae69d006a4b0e85e7101c0e0cebf1a950997
ava/com/android/server/pm/PackageManagerService.java
50806fc4ceff4bb093a18bdecb506163e68b9cbb 15-Jul-2014 John Spurlock <jspurlock@google.com> Zen: handle exit conditions across reboots.

- Use the persisted exit condition (and a new
persisted exit component) to immediately resubscribe
to the manual exit condition (if present)
- Fire false immediately for old countdown conditions.
- Add a new zen lens to noman dump, and a bit more info.
- Refresh the current exit condition when reopening the panel.

Bug:15844990
Bug:16212455
Change-Id: I8bfaf1b2a6cf3d8818002a9db5c527ad3aa4c05c
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/CountdownConditionProvider.java
ava/com/android/server/notification/NotificationManagerService.java
14bff9f55eccaf279419cb529711039e13e1e1d7 16-Jul-2014 Prashant Malani <pmalani@google.com> Make the booting flag update unconditional

In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.

Bug: 16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560
ava/com/android/server/am/ActivityStackSupervisor.java
4a0ffb004a62595b6aac598445908013ab9d9915 15-Jul-2014 Adrian Roos <roosa@google.com> Fix windows not showing when SHOW_WHEN_LOCKED changes

Removes WindowStateAnimator's copy of the window flags, which was
not updated when they changed.

Bug: 15574002
Change-Id: I1ca3f8d5b521727fcb8da14ff1f8231e47b1e9b9
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowStateAnimator.java
2bb7e341684ee875bece9fc3c5e03326ae0367d1 15-Jul-2014 Paul Jensen <pauljensen@google.com> Fix T-Mobile provisioning detection.

Add User-Agent to HTTP request for captive portal.

bug:16316314
Change-Id: I32d4f75f4eb114574dd2a39d241cb085383b4f94
ava/com/android/server/connectivity/NetworkMonitor.java
d44a5b35aeff84cade6f7d44bee2c4c48e5f7fc8 16-Jul-2014 Joe LaPenna <jlapenna@google.com> Revert "MSIM: dump sub specific info"

This reverts commit bc586ea61bacf05c509cb8dae44e9d8f22fc780d.

Change-Id: Ia85003f2f4eb17970fd5945dd8d432a701db9bba
ava/com/android/server/TelephonyRegistry.java
0e4586dfa4d62ab9000ef35f144517ab9600c9c8 16-Jul-2014 Stuart Scott <stuartscott@google.com> Merge "MSIM: dump sub specific info" into lmp-dev
09abc62b4fe9031ee0118787b65b11b65197468e 15-Jul-2014 Sandeep Gutta <sangutta@codeaurora.org> MSIM: dump sub specific info

Add support to dump subscription specific info
in TelephonyRegistry

Cherrypicked from partner gerrit.

Change-Id: I9525b8ff8b8884e5099df762d0eafe27fdb186ab
ava/com/android/server/TelephonyRegistry.java
fdb1956ff71ff57fcdaafaaeb7f42c19de3d7c2f 12-Jul-2014 Dianne Hackborn <hackbod@google.com> Fix issue #15681802: Missing RESET:TIME in complete battery histories

But wait, there's more!

- Keep track of sync durations in the aggregated stats.
- Add events for users that are running and in the foreground.
- Rework the activity manager's tracking of stuff using
battery in the background to be based on proc stats, which
allows it to be better about determing when it should reset
its tracking of background work.
- Also add tracking of scheduled job execution, like we are
doing for syncs.
- And once I started hooking battery stats in to
JobSchedulerService, I found a few things I couldn't stop myself
from changing: (1) make it very explicit that it doesn't start
scheduling jobs until we have reached the point in system boot
where third party apps are allowed to run, and (2) adjust
the various for loops to not use iterators.

Change-Id: I69d812e27bcfee9e58a614f0f6b1c7545d7530b1
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/am/ProcessRecord.java
ava/com/android/server/content/SyncManager.java
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/JobServiceContext.java
ava/com/android/server/job/JobStore.java
ava/com/android/server/job/controllers/JobStatus.java
015e922fa76e7a08ad7e5b38a49bfe537d6651f7 15-Jul-2014 Chris Wren <cwren@android.com> Merge "Implement application-level high priority bit." into lmp-dev
fdc4e4af7305514359e041dbec742f4b6561e393 15-Jul-2014 Paul Jensen <pauljensen@google.com> Fix hiding of sign-in to network notification.

Don't rely on the NetworkAgent still being connected when we go to
hide the notification. The notification is hidden when the
NetworkAgent is disconnected so that wasn't a safe assumption.
By using the NetID as the notification identifier we also fix the
issue of multiple notifications of the same network type inadvertently
hiding the incorrect notification with the same network type.

bug:16317917
Change-Id: I01fdc466a0f430af9fc378445586ec7b83b3ac83
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkMonitor.java
54bbef435ed857fc68941672799fc8001c101119 10-Jul-2014 Chris Wren <cwren@android.com> Implement application-level high priority bit.

Enable checkbox in settings and wire it to NotificationManagerSerivce.
Add RankingHelper to collect ranking configs and logic.

Bug: 15080024
Change-Id: Ib1d3b0b5ca4fcfdc52c2cb6838a009b9addf1094
ava/com/android/server/notification/NotificationComparator.java
ava/com/android/server/notification/NotificationIntrusivenessExtractor.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/NotificationSignalExtractor.java
ava/com/android/server/notification/PackagePriorityExtractor.java
ava/com/android/server/notification/RankingConfig.java
ava/com/android/server/notification/RankingHelper.java
ava/com/android/server/notification/ValidateNotificationPeople.java
bb742462781a73bb25516067c8fe6311c1c8a93e 08-Jul-2014 Craig Mautner <cmautner@google.com> Launch activity behind launching task.

Use ActivityOptions.makeLaunchTaskBehindAnimation() to launch tasks
behind the current task. Includes animations for launching and
launched tasks.

Fixes bug 16157517.

Change-Id: I0a94af70b4748592e94673b958ee824cfb3d7ec0
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/wm/AppTransition.java
ava/com/android/server/wm/AppWindowAnimator.java
ava/com/android/server/wm/AppWindowToken.java
ava/com/android/server/wm/WindowManagerService.java
d7671a710035cb761fed444c13c61ccef6a1489f 15-Jul-2014 Narayan Kamath <narayan@google.com> Merge "Don't throw errors on sharedUid adjustment." into lmp-dev
0b23e20be6121286567726e995cf3617c022a844 15-Jul-2014 Craig Mautner <cmautner@google.com> Merge "Add null check" into lmp-dev
3b1dac8c5aea2aaf12453aa8063630bd6bde0a92 15-Jul-2014 Craig Mautner <cmautner@google.com> Add null check

Fixes bug 15847145.

Change-Id: Ia4d223da578bc38516824dd82dd3c5b8d58328dd
ava/com/android/server/am/ActivityStack.java
377ea31c43afe02d452fe462b2b09f23e58d6347 15-Jul-2014 Narayan Kamath <narayan@google.com> Don't throw errors on sharedUid adjustment.

Given that this is "best effort" anyway, stop short of
aborting installs when ABIs can't be adjusted. Otherwise
it will be impossible to test or upgrade an APP that has
a shared UID and changes ABIs. All apps that use a given
sharedUid are expected to use the same instruction set.

Change-Id: Ia9ffd1eb2df7c6ec9a39b23fc40e58794c013749
ava/com/android/server/pm/PackageManagerService.java
6bdede0aad33a3abd72ae7ab8bd24f346a8d8409 15-Jul-2014 Narayan Kamath <narayan@google.com> Merge "Fix multiArch installs where only some archs are available." into lmp-dev
f5f1828d968e427b95fe219af022434f1cdfaeb4 15-Jul-2014 Narayan Kamath <narayan@google.com> Fix multiArch installs where only some archs are available.

In this case, NO_MATCHING_ABIS shouldn't result in a failure
when we're trying to match against one of SUPPORTED_32_BIT_ABIS
or SUPPORTED_64_BIT_ABIS.

There shouldn't be a general requirement that packages must
contain both 32 and 64 bit libs because it might legitimately
exclude one or the other for reasons such as compatibility
etc.

bug: 16299358

Change-Id: I5f66b0a54b63b93b36371b584e9cf6bed07c507a
ava/com/android/server/pm/PackageManagerService.java
69ea974f1712c83a9ad194187237edf1169f9064 15-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Public API for PackageInstaller!" into lmp-dev
6c833e07a05c48ca60ee4d72421bf8b1e78dc710 15-Jul-2014 Jeff Sharkey <jsharkey@android.com> Public API for PackageInstaller!

Flesh out documentation and finalize first cut of API. Also surface
installLocation and splitNames through PackageInfo.

Bug: 14975160, 15348430
Change-Id: Ic27696d20ed06e508aa3526218e9cb20835af6a0
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
969167dc05a6485a32d160895871cff46fd81884 24-Jun-2014 Wonsik Kim <wonsik@google.com> TIF: Revisit availability changes

Bug: 15838097, Bug: 15973274
Change-Id: Ida060696cb6222c8ced576d86c100c25d94dc5c0
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
be1da5e5ccc626e3f24e55205f0d6edea33bd3d7 15-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Apply hdmi control options to operation" into lmp-dev
6b879024facabe97ea793e171b225ea85d956a8c 15-Jul-2014 Ruchi Kandoi <kandoiruchi@google.com> Merge "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode." into lmp-dev
0fe32ae50bcbf6d2a281bdc407ce56f3d05632c5 11-Jul-2014 Ruchi Kandoi <kandoiruchi@google.com> PowerManager: Adds a call to reduce refresh rate while device is in
BatterySaverMode.

Adds a binder call to the surface flinger to change the refresh rate
while the device is in BatterySaverMode.

Change-Id: I9b5fdcc279757ceb4b9917cb0445643b50133a04
ava/com/android/server/power/PowerManagerService.java
a2ff611fd6312510f03a2556c2932f87ba3144af 15-Jul-2014 Alan Viverette <alanv@google.com> resolved conflicts for merge of dca272b8 to lmp-dev

Change-Id: Ifbd10ace66f7488f225bfae6e26bab60ab56e651
01e9a97fe68dbba42a0edd0ad965ccfe2b8efe7d 10-Jul-2014 George Mount <mount@google.com> Don't lose ActivityOptions during orientation change.

Bug 16188506

Change-Id: I056153e6ddbaf328dd65b8b27a91ae773c33ea22
ava/com/android/server/am/ActivityStack.java
7779bf1ce8243d9f856c05db3cc5a37a8227a970 14-Jul-2014 Jason Monk <jmonk@google.com> Finalizing lock-to-app UX

Simplifications have happened to remove the enter/exit layouts
and just use a toast to notify the user, and the in text icons
have been removed.

The enter dialog now has a checkbox to see if the lockscreen
should be locked on exit (since it isn't in settings anymore).

Also updated strings.

Bug: 15836599
Change-Id: I3ab685bf3672c8a7f9d83d12e81f0099968cdfde
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/LockTaskNotify.java
ava/com/android/server/am/LockToAppRequestDialog.java
49a22e82025ea947d81681a0abb7ef00600eac3b 13-Jul-2014 Alan Viverette <alanv@google.com> Add window elevation for dialogs, clean up surface insets API

BUG: 13211941
Change-Id: I9d605d0b2fb24f9bf8e73fbecd520b6b52ae5751
ava/com/android/server/wm/WindowStateAnimator.java
44583d351ec7ccbe0813cc7c0fa36b9bc5a936a3 14-Jul-2014 RoboErik <epastern@google.com> Merge changes I51f2e466,I5b67cb3e into lmp-dev

* changes:
Make PlaybackState immutable with a builder
Add API to set a default session in Activity
c785a78fb483fe54012175c53d3758b2412de7b9 14-Jul-2014 RoboErik <epastern@google.com> Make PlaybackState immutable with a builder

bug:15862252
Change-Id: I51f2e466bd2c41bbe80d20aa9785126a7ac6ab3f
ava/com/android/server/media/MediaSessionRecord.java
9f92ffa9278db42655b4d422d887eed0a199886b 14-Jul-2014 dcashman <dcashman@google.com> Merge "Initial KeySet API." into lmp-dev
9d2f441f9bb2c8dcac1150e2cba1d15a86a4efb1 09-Jun-2014 dcashman <dcashman@google.com> Initial KeySet API.

Previously submitted but reverted due to doc-compilation bug.

Bug: 6967056
Change-Id: I9bd7ef299a4c92c4b327f5b5d7e951f0753b4c8a
ava/com/android/server/pm/KeySetHandle.java
ava/com/android/server/pm/KeySetManagerService.java
ava/com/android/server/pm/PackageManagerService.java
1e6fede85e459d918f6670c9dad130c4e32f744f 14-Jul-2014 Colin Cross <ccross@android.com> Merge "GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf" into lmp-dev
7c030eddbc5529c89224a070a6e88ad319fe12c7 28-Jan-2014 Colin Cross <ccross@android.com> GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf

The property ro.hardware.gps can be specifid to allow a single system
image to work with differrent GPS chips. The HAL layer will use it to load
/system/lib/hw/gps.<ro.hardware.gps>.so. Add support to GpsLocationProvider
to use the same property to find /etc/gps.<ro.hardware.gps>.conf, falling
back to /etc/gps.conf if the property is not set or the file is not present.

(cherry picked from commit 0246363b223f539ad01898b8ad0093fc6a58c5a3)

Change-Id: I3a3f7ae94b818b81550137c375adc9bf7ce3da99
ava/com/android/server/location/GpsLocationProvider.java
ad11eb52fe62b6696df2194cb9e176f7d799e844 14-Jul-2014 Jeff Sharkey <jsharkey@android.com> Pass install result message; path selection.

Oops, forgot to include message argument to invoke the new-style
callback. Also use more robust way of generating cluster APK
directory names, and add more logging details on rename failure.

Change-Id: Ifa8abdd1db58b73e13b9a8077ec126cf20a0d90e
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
544b62bb863788727587ee292596451e461fc0a7 14-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Apply hdmi control options to operation

Use the flag mAudioDeviceOff/mAutoWakeup to conditionally perform
the operation

Change-Id: I1595d8a64170d5047e621491a09279e04e3b4302
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
dca272b8c21f2910424496b97cd9b7a558008876 11-Jul-2014 Michael Kolb <kolby@google.com> am 0cb38d2e: Merge "Add configuration for activity thumbnails" into klp-modular-dev

* commit '0cb38d2e5ab32fd34c8129f3c2d1c158bad9abc3':
Add configuration for activity thumbnails
d2b5f7da35d5c674daa506efa38fa3ec0b4b4216 11-Jul-2014 Aaron Whyte <awhyte@google.com> am f5e67474: Allow overlays to configure ConnectivityService\'s network sampling to not wake the device. This can increase clockwork device battery life. Bug:15455204

* commit 'f5e6747440cc0d29c663a792e32d9618f842ecf2':
Allow overlays to configure ConnectivityService's network sampling to not wake the device. This can increase clockwork device battery life. Bug:15455204
bc2b9d30cd93d224b865ed9f0630c2e6d90c376d 14-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Make sure to finish routing control action" into lmp-dev
dd233f3d25386ecd2ddb1b48c58f2a84e11f4286 14-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Make sure to finish routing control action

After HdmiControlService performs routing control action,
make sure it is finished all the time.

Change-Id: I38e130ee5d8712a18aac7a46cad0950a23713469
(cherry picked from commit 7d05469196721aaa888447149d3b93c8689ff72e)
ava/com/android/server/hdmi/RoutingControlAction.java
eba1c0bb707eec7189028762bd64e4de5a92e9dc 14-Jul-2014 Dongwon Kang <dwkang@google.com> Merge "do not merge. Implement onVideoAvailable/Unavailable in TIF." into lmp-dev
9b08edff236fc68d836eccfaa1a5f028dc390cec 04-Jul-2014 Dongwon Kang <dwkang@google.com> do not merge. Implement onVideoAvailable/Unavailable in TIF.

Use cases:
- VIDEO_UNAVAILABLE_REASON_TUNE: to show spinner on channel change.
- VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL: to show a message and spinner on weak TV signal.
- VIDEO_UNAVAILABLE_REASON_BUFFERING: to show spinner on buffering.
- VIDEO_UNAVAILABLE_REASON_UNKNOWN: to show spinner.

Bug: 14126559
Change-Id: Ide2b68c74bd96d4ea1b9d85ab099a277253d05c7
(cherry picked from commit 1edfd8eb985ee41095c60f4aaf7029f56abff614)
ava/com/android/server/tv/TvInputManagerService.java
1677476a3be4798b37a49fa1a1a89300edd95172 14-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Shortens the key length in HdmiControlService

The key length for SystemProperties should not be over 31

Bug: 16274152
Change-Id: I25ffaf2fc502819a7aea12372717cd00497fd3be
ava/com/android/server/hdmi/Constants.java
1a937b04e63539cb1fab1bde601031d415c7156f 02-Jul-2014 Jeff Brown <jeffbrown@google.com> Initial draft of new MediaRouter APIs.

This patch introduces basic infrastructure for the new MediaRouter
API. The code is fully documented but incompletely implemented.
It is being submitted not to facilitate API reviews.

MediaRouter is a new class that applications used to discovery,
connect to, and control media devices as represented by media
destinations and their routes. Routes may offer a variety of
capabilities. This new class is a much more powerful replacement
for the existing MediaRouter.

MediaRouteService is a base class for creating media route services
which third-parties can implement to make routes available to
applications. It is analoguous to the MediaRouteProvider
infrastructure of the old media router support library but it
is designed to be integrated into the framework and enable a
variety of new usages such as remote display projection.

Stay tuned for more...

Change-Id: I2c7c6013d9f751d71e83697e7fc9e49bf7751fef
ava/com/android/server/media/MediaSessionRecord.java
01a500ed1c6ae3fff66678144ae637aa8cad0ecc 11-Jul-2014 Jeff Brown <jeffbrown@google.com> Delete first draft of media routing APIs.

The new APIs will not be as tightly integrated into MediaSession.

Change-Id: I5cfd37d9d8d0c5d46c55edb5cf0772a8f1ef13ab
ava/com/android/server/media/MediaRouteProviderProxy.java
ava/com/android/server/media/MediaRouteProviderWatcher.java
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
ava/com/android/server/media/RouteConnectionRecord.java
f5e6747440cc0d29c663a792e32d9618f842ecf2 10-Jul-2014 Aaron Whyte <awhyte@google.com> Allow overlays to configure ConnectivityService's network sampling to not wake the device.
This can increase clockwork device battery life.
Bug:15455204

Change-Id: Ifc551e6a522627dc8e5cfdfb8f56d4e3cbeea936
ava/com/android/server/ConnectivityService.java
0cb38d2e5ab32fd34c8129f3c2d1c158bad9abc3 11-Jul-2014 Michael Kolb <kolby@google.com> Merge "Add configuration for activity thumbnails" into klp-modular-dev
5f6238e4a7b2b54c4852852bd9bf045f387a5e42 10-Jul-2014 Michael Kolb <kolby@google.com> Add configuration for activity thumbnails

Bug: 15750584

Change-Id: I0b2bfb46022b46d7649f6d9ba9ba74cdfc70a6ea
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
906cf8e8a65027314ff71e0895b5e7e2263f1cbd 13-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Package installation listener events."
a10311434778ea1be1621c2251c0c8c2966f337b 13-Jul-2014 Jeff Sharkey <jsharkey@android.com> Package installation listener events.

Flesh out implementation of install session observers. Carve out 20%
of published install progress for final system operations such as
dexopt, etc.

Add dumpsys output for active install sessions. Create explicit
fsync() instead of overriding meaning of flush(). Hack to throw
IOExceptions over Binder calls.

Bug: 14975160, 15348430
Change-Id: I874457e40c45d2661bc0a526df9285ffea4bb77c
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
e0b0bef75b66f0a87039c8f58c17b1596a2baebe 13-Jul-2014 Jeff Sharkey <jsharkey@android.com> Surface detailed error messages from PMS.

We now both log detailed error messages and relay them back to any
observer. Start refactoring PMS to throw when errors are encountered
internally to make it easier to reason about flow control; already
uncovered a few instances of errors being silently ignored!

Change-Id: Ia335c5e31bd10243d52fd735c513ca828e83dca0
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerException.java
ava/com/android/server/pm/PackageManagerService.java
2c1c31c7ae9bd972b974a5cc2d8b0942746af612 10-Jul-2014 Jae Seo <jaeseo@google.com> TIF: Add a way to enable/disable caption

This is required to handle the case that an application wants to turn
on/off the caption explicitly (e.g. TvView in PIP). TV input service
implementation must respond to the request immediately to avoid any
legal implication since the captioning is imposed by the law in many
countries.

Bug: 14121898
Change-Id: I9600debae709fdc99065d7a0138ae69d1dffc9ba
ava/com/android/server/tv/TvInputManagerService.java
9726eeb2b01a0e5a3d52139f3bc48d4690af1ea9 12-Jul-2014 dcashman <dcashman@google.com> Merge "Revert "Initial KeySet API.""
5de7377feca5242fe7127e2d4dc7792d4886d365 12-Jul-2014 dcashman <dcashman@google.com> Revert "Initial KeySet API."

This reverts commit 9a643fe02bc960e266484547dda5572b094a4c72.
ava/com/android/server/pm/KeySetHandle.java
ava/com/android/server/pm/KeySetManagerService.java
ava/com/android/server/pm/PackageManagerService.java
405912bce074e9e59a246e2357a108e50dffabf8 09-Jun-2014 dcashman <dcashman@google.com> Initial KeySet API.

Bug: 6967056
Change-Id: I47a01bd5dc25591cc70f58f38920ad0a021094ae
ava/com/android/server/pm/KeySetHandle.java
ava/com/android/server/pm/KeySetManagerService.java
ava/com/android/server/pm/PackageManagerService.java
97affee67b6d88da40af41b36f02ecb2b823daff 11-Jul-2014 Jungshik Jang <jayjang@google.com> Start system audio initialization mode on new device discovery.

If a new device is avr and current tv setting is system audio mode,
we should launch SystemAudioAutoInitiationAction.

Bug: 15843140

Change-Id: I8db89e9be21572e304e6eebb5948a7981df14e90
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/NewDeviceAction.java
09ffc846af78f949d2847003db9f793bfb5eefaa 11-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Store active source/active port in HdmiControlService when disabled

This lets the service keep track of the latest change made by TV app
or TIF regarding active source/port.

Bug: 16222083
Change-Id: I0f1a4520eb3e52ca5024567b0f1fbe4fd59e8cbf
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
af2acf0447aff34450cde2bcfb35dff9cf631729 11-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Keep preferred address for HdmiControlService

Uses SystemProperties to store/retrieve preferred logical address

Bug: 15843075
Bug: 15844858
Change-Id: Ie1304805cbec4e11ef4b44a5cceb108121c60581
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
d79fdf1c62671abac376c71aca8fa19484a1ecf2 21-Jun-2014 dcashman <dcashman@google.com> Remove KeySetManagerService lock.

The KeySetManagerService is a part of the PackageManagerService, which is
responsible for maintaining the association between packages, keysets and
public keys. This information is a critical component of the
PackageManagerService data, and should require the holding of the
PackageManagerService's lock. Remove the existing KeySetManagerService lock
and require the mPackages lock to be held instead.

Bug: 6967056
Change-Id: I803f8388e42469d30562b40212cf497320851268
ava/com/android/server/pm/KeySetManagerService.java
ava/com/android/server/pm/PackageManagerService.java
bb580670350b76fa2fcc5ee873f99b7970759cbf 10-Jul-2014 Jeff Sharkey <jsharkey@android.com> Progress toward installer public API: callbacks.

Instead of surfacing all the existing cryptic error codes, we're
going to classify them into broad categories when surfacing through
public API. This change introduces InstallResultCallback and
UninstallResultCallback, and wires them up to existing AIDL
interfaces.

Also start defining general SessionObserver for apps interested
in general progress details, such as Launcher apps. Details about
active sessions are returned through new InstallSessionInfo objects.

Bug: 14975160
Change-Id: I068e2b0c30135f6340f59ae0fff93c321047f8f9
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
2c1d7b3b9f7afeddca69a90e395624907e2b63bf 12-Jul-2014 Yuncheol Heo <ycheo@google.com> Merge "Handle TODO in SystemAudioActionFromTv."
c516d65fd96cdc39f9935ddb80d26ee6499a77bf 11-Jul-2014 Yuncheol Heo <ycheo@google.com> Handle TODO in SystemAudioActionFromTv.

- Added onFinishedCallback to handle the deferred starting of FeatureAction.

Bug: 15843078, Bug: 15841546
Change-Id: I6cb5fba91d6115e8bb02c38601a72ed315c22e2f
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/SystemAudioActionFromAvr.java
ava/com/android/server/hdmi/SystemAudioActionFromTv.java
ava/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
a4fa3b5aa53cf677b623fe346c585cb8a0c1ce26 09-Jul-2014 destradaa <destradaa@google.com> Add support in the platform for Activity Recognition Hardware.

Change-Id: I7c4fff3526583475a5edf1f4ba8fede4e9419ead
ava/com/android/server/LocationManagerService.java
ava/com/android/server/location/ActivityRecognitionProxy.java
d05f67f9721e1f9194a1f57cf7481b4be65366b3 11-Jul-2014 Yuncheol Heo <ycheo@google.com> Handle <Feature Abort> after <System Audio Mode Request>.

- Fix some wrong return values.

Bug: 15841647
Change-Id: Ia4596e87204196b48429d55da4945f84de51a07b
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/SystemAudioAction.java
31ab41726b84c31a6aa45c929aad4ad04d32a992 12-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Delete unused APIs in NetworkManagementService.

Change-Id: Idc6c0ac0d3a4149821fc7820b7f37d4209fc55d3
ava/com/android/server/NetworkManagementService.java
a228ae95ea2f842c0e84f237c64bf032689410dd 09-Jul-2014 Craig Mautner <cmautner@google.com> Add task affiliation

Introduces new flag Intent.FLAG_ACTIVITY_LAUNCH_BEHIND which
causes the newly launched task to affiliate with the launching task.
(Later this flag will also launch the task behind the current task).
This shows up in a new member of the RecentTaskInfo class. This also
causes the recents list returned by getRecentsInfo to be rearranged
so that affiliated tasks are together.

Fixes bug 16157517.

Change-Id: Ia1386af50da2f01809278b62d249f05c6a0de951
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskPersister.java
ava/com/android/server/am/TaskRecord.java
d2794789c8ddcdb5876bb7c609438aac6edd2bfe 12-Jul-2014 dcashman <dcashman@google.com> Merge "Initial KeySet API."
9cd6e647c63be7ba726687943e139a04ed1846f7 11-Jul-2014 Aaron Whyte <awhyte@google.com> resolved conflicts for merge of d2b5f7da to master

Change-Id: I8ec28728c12d7cc3ce2c4f3d09d9ce6162504618
ea8a8a6076f04360de2d25b3e5853cde8026cd5f 24-Jun-2014 destradaa <destradaa@google.com> Update location framework to accept raw data from GPS HAL.

Change-Id: Ib4feca004b53fa89dcece4299974ab08913455a0
ava/com/android/server/LocationManagerService.java
ava/com/android/server/location/GpsLocationProvider.java
ava/com/android/server/location/GpsMeasurementsProvider.java
ava/com/android/server/location/GpsStatusListenerHelper.java
ava/com/android/server/location/RemoteListenerHelper.java
ni/com_android_server_location_GpsLocationProvider.cpp
06b6cdaed5c68816faac9d2354c6caf61e65e19d 12-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Remove unnecessary code and APIs.

This stuff has been replaced by setNetworkForUser() in NetdClient.

Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
50999ea9cb1fc0a869e7428cabe323831bdbba17 11-Jul-2014 Jae Seo <jaeseo@google.com> Merge "TvInputManagerService: Suppress warning in dump() and fix typo"
0f8fc345ea61928265fdd6d461bf1babe353fbe4 02-Jul-2014 Jae Seo <jaeseo@google.com> TvInputManagerService: Suppress warning in dump() and fix typo

Change-Id: I21eaa5592b5f355cc7227e9047ade0869ebe9e9b
ava/com/android/server/tv/TvInputManagerService.java
398b6c26c3c46724e4c44b81d9a2541720f8750b 11-Jul-2014 Narayan Kamath <narayan@google.com> Fix an abi <-> instructionSet mixup.

We should be calling is64BitInstructionSet and
not is64BitAbi.

Change-Id: I5b099af19f1d7409f65f63493d3f13a830f4fb5d
ava/com/android/server/pm/PackageManagerService.java
3c58775a126c9c9b2f86bc22bd82cedbdcb06024 11-Jul-2014 Dianne Hackborn <hackbod@google.com> Merge "Allow INTERACT_ACROSS_USERS for service access."
083baf99ff1228e96ede96aac88c8200c4fdc2b2 11-Jul-2014 Winson Chung <winsonc@google.com> Fixing a few potential crashes, preparing for Task affiliations framework changes.

- Deferring widget host listening to speed up startup
- Ensuring that we animate to the right task position in the stack and not just the front-most
- Removing assumption that we can only get screenshots for the most recent task
ava/com/android/server/am/ActivityStack.java
409297da182267465adbc21cfb75a23e8d678117 11-Jul-2014 Dianne Hackborn <hackbod@google.com> Allow INTERACT_ACROSS_USERS for service access.

But only if the two users are in the same profile. Also
apply the same rule for the recently allowed interaction
across content providers.

The activity manager now keeps track of which users are in
the same profile group, and the handleIncomingUser function has
an option to allow a non-full caller to do the interaction
if the two users are in the same profile group.

Spread this joy all over the place.

Also turn off multi-user on Svelte devices.

Change-Id: I231484ea2a6bfccbb3cd51357d7a387bd75039ea
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
557b26de560a0bed3f04afd035b0a5f97f05f43c 11-Jul-2014 Narayan Kamath <narayan@google.com> Merge "Fix broken dexopt logic."
fd12a35dfc5fa30d8221ed6214f8df1f04e569ef 11-Jul-2014 Narayan Kamath <narayan@google.com> Fix broken dexopt logic.

The logic was incorrect in the presence of multiple paths
(cluster installs) or multiple instruction sets (multi arch)
because of an early return in the case of sucessful dexopt.

- Rewrite this logic to make it (hopefully) clearer.
- Fix a related bug in getAppDexInstructionSets.
- Add instruction set to the dexopt logs.

bug: 16013931
Change-Id: I18c9755583f0a6f8be70469ec2062269564f0f41
ava/com/android/server/pm/PackageManagerService.java
6b58d328b7066a54a05a3b36fcaa93d1f913013e 11-Jul-2014 Amith Yamasani <yamasani@google.com> Merge "Fix apparent delay in removing a managed profile"
70fcf0c75fee68873a2f1abfe26c8afd669c51ba 11-Jul-2014 Amith Yamasani <yamasani@google.com> Fix apparent delay in removing a managed profile

Bug: 15268575

When returning the list of profiles, don't include dying users.

Change-Id: Ifeaed5c7c2b93922cddea22057dd890a1b3750fc
ava/com/android/server/pm/UserManagerService.java
1397751c7f74a268d7bd7caf35de604b3edf13f0 11-Jul-2014 Paul Jensen <pauljensen@google.com> Merge "Define NETID_UNSET in ConnectivityManager."
bcc76d345cdad2eff0f64d1dca9f92f94c8b9f07 11-Jul-2014 Paul Jensen <pauljensen@google.com> Define NETID_UNSET in ConnectivityManager.

This allows some cleanup and removal of dead code.

bug:15489928
Change-Id: Iaf0507bc2e8ec6dcc253f01f61c5b221d46581f9
ava/com/android/server/ConnectivityService.java
1f213914c45c23c653f721690da2ce0718e63139 02-Jul-2014 Dongwon Kang <dwkang@google.com> Support multiple tracks in TV Input framework.

Added API: getTracks/selectTrack/unselectTrack/onTrackInfoChanged
(onVideo/Audio/ClosedCaptionStreamChanged callbacks are removed in favor of onTrackInfoChanged)
Use cases: audio and closed caption track selection
Background: go/tif-multi-track

Bug:14073704, Bug:14121898, Bug: 16049453
Change-Id: I199ed16f690d4e757da0bb30c8bc8222a6fa1d7a
ava/com/android/server/tv/TvInputManagerService.java
a9f10629f4bc1a82761917645ff4d2b6d42e47b3 11-Jul-2014 Jungshik Jang <jayjang@google.com> Start address allocation when hdmi cec is re-enabled.

When a user turns hdmi cec on from system settings or other possible way,
hdmi control service should start over from logical address allocation.
As device discovery action from bootup is slightly different from
one from enabling hdmi cec, added additional params to all notification
method which is called when logical address allocation is done.

Bug: 16222082

Change-Id: Ib73be5f642646918b470d769dc563753c4ff48d3
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
7ecfbaed6e902aea151bc1919cf7771bbd868fc4 11-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Read/Write flags from/to system settings

Use Settings for storing several flags/values to keep the data persistent
across power cycle, and also to make them configurable via system Settings UI.

Bug: 16185931

Change-Id: I98650863e4237fd91c1b35717f14a570e049427c
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
8ed86c467afa107f7aafacb85ca64c979cf56dc2 11-Jul-2014 Jungshik Jang <jayjang@google.com> Implement retransmission of cec request.

BUG: 16218422
Change-Id: I4a6692ba8815e9a0ae26c872656b31b678d54fd6

Conflicts:
services/core/java/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiConfig.java
d3dc721c0a7addef43852d60bfd2472616332ef6 11-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "HdmiConfig class holding constants that may need customization"
5fba96df30b6b50b3cb9fe1d783320b1cc3bd6ea 11-Jul-2014 Jinsuk Kim <jinsukkim@google.com> HdmiConfig class holding constants that may need customization

Put in one place some constants used in HdmiControlService that
may need customization. This makes it easy to do the job.

Bug: 16160911

Change-Id: I59786a48d336cfca722daa82c1f0dceb88c5e5e4
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/DevicePowerStatusAction.java
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiConfig.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/OneTouchPlayAction.java
ava/com/android/server/hdmi/RequestArcInitiationAction.java
ava/com/android/server/hdmi/RequestArcTerminationAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
ava/com/android/server/hdmi/SystemAudioStatusAction.java
f9e44ea716fff610abfc6762eb19aecc7e95b84d 11-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Update HdmiControlService JNI to the change in HAL definition"
284c31b92e4e0d0b8095ae50c61db9c83c9d577c 11-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Update HdmiControlService JNI to the change in HAL definition

Change-Id: Iab235785c4d0242ab5845d1f8ad62d78770ff9c4
ni/com_android_server_hdmi_HdmiCecController.cpp
7468f1db0a6b8d386c015ad466a204994a9e8420 11-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Revamp HDMI-CEC system audio mode integration with audio service."
6f34f5ab8ab1b1db7887e5405d8b0031e105ab05 08-Jul-2014 Jungshik Jang <jayjang@google.com> Revamp HDMI-CEC system audio mode integration with audio service.

In previous change we use setForceUse(FORCE_MEDIA, XXX) method
in order to set specific audio output type, such as LINE, HDMI_ARC,
and SPDIF. But it turns out that it conflicts with bluetooth
a2dp which uses the same setForceUse(FORCE_MEDIA, yyy).

This change is based on several conditions.

1. When other non-speaker devices are on, prevent system audio
from turing on.
2. In order to keep track of other devices' connectivity and to
turn off system audio if other device like bluetooth or
headphone preempts current output, register OnAudioPortChangeListner
to audio manager.
3. All possible system audio outputs can be merged with other
outputs without priority.

Change-Id: Id4e47d99db64b9f77a17c2c28c47787ab8980bf7
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
1d599da8424cef8d07cb4c533bd212d992d8f676 12-Jun-2014 Christoph Studer <chstuder@google.com> NotificationListenerService API: Avoid unnecessary allocations

Instead of producing Ranking objects, RankingMap just populates
them now, allowing developers to re-use objects and avoid
unnecessary allocations.

Also rename isInterceptedByDnd() to meetsInterruptionFilter(),
since DND is not a concept anymore.

Bug: 15415840
Bug: 16099064
Change-Id: If9861cbdf14593e641a4d4ffd1b967647eb8e2b8
ava/com/android/server/notification/NotificationManagerService.java
1c52d02679af9e4322d7182824443b006579b1ed 10-Jul-2014 destradaa <destradaa@google.com> Merge "Mark FLP constants as public, so they can be consumed by geofencing."
b2e93efcac593f5f27722219b274bd0fa5c1b0fe 11-Jul-2014 Erik Pasternak <roboerik@android.com> Revert "Make PlaybackState immutable with a builder"

Will resubmit tomorrow for Build Breakage Friday as this change needs new SDK prebuilts for unbundled app branches.

This reverts commit aa746b27610680a2c0fbdf7d81a6455c4597f05e.

Change-Id: I28ba7e1b09234a5eb1b725aed043b9de98e1bc16
ava/com/android/server/media/MediaSessionRecord.java
5a4e01114361b7dad4fc5465b4da00fd444fc098 09-Jul-2014 RoboErik <epastern@google.com> Make PlaybackState immutable with a builder

bug:15862252
Change-Id: I8944b7753cd6a36a74b0091f71a386f77040c4ab
ava/com/android/server/media/MediaSessionRecord.java
c068bb5a0468bf605b0398e6f0ea5721917de4ee 07-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Support HdmiControlService.sendKeyEvent for both TV/playback device

Added another parameter deviceType for HdmiControlService to
run the specified local device for sendKeyEvent.

Bug: 15844076
Change-Id: I598ef320ae94bba0ace38701ae0ca12fd0625559
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
84f1294a958b42000755dc6570e3eda72ab42140 11-Jul-2014 Jeff Sharkey <jsharkey@android.com> Always derive native library paths at runtime.

Over time, we've unpacked native libraries at various places with
respect to their source APK. Persisting this path in PackageSettings
has caused more pain recently with the switch to supporting multiArch
and cluster installs.

This change switches us to always derive the native library paths at
runtime based on the type of install. This also ensures that
transitioning between a bundled system app and an upgraded system
app will always build the right path.

We still persist the last generated path into PackageSettings to make
cleanup at uninstall time easier.

Bug: 16208505, 16206748, 16212206
Change-Id: Ieb82a424ca4a92b5674983453c50ba4b695abfb0
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/PackageSettingBase.java
ava/com/android/server/pm/Settings.java
989eb371bf8f572fed1e65c6d8aeeb2548be89a7 17-Jun-2014 dcashman <dcashman@google.com> Change key-set/public-key manifest relationship.

Separate definition of public keys and keysets in the manifest to better
represent their relationship. The 'key-set' tags should have nested additional
'public-key' tags that indicate which of the defined 'public-key' tags are
associated with them. The first use of a given 'public-key' name should define
its value; subsequent uses may refer to it only by name. 'key-set' and
'public-key' names may not intersect.

Also, change 'keys' tag to 'key-sets' to avoid issues with previous keysets
implementation.

Bug: 6967056
Change-Id: I7534e4a42326e97b67b55509187c0d3c21a2bb32
ava/com/android/server/pm/KeySetManagerService.java
ava/com/android/server/pm/PackageManagerService.java
3d4fe363b25293577faae3fddf85e6f73f76b0cd 11-Jul-2014 Alan Viverette <alanv@google.com> Merge "Add accessibility action to open power long-press dialog"
e34560b21989eea54a139a0586d156ba573cc2ea 10-Jul-2014 Alan Viverette <alanv@google.com> Add accessibility action to open power long-press dialog

Also fixes an infinite recursion bug in the WindowManagerService
implementation of WindowManagerInternal.

BUG: 16129909
Change-Id: I4f9d32f4e6c3ad460652c5e5271540fa5032a1f5
ava/com/android/server/wm/WindowManagerService.java
900c67fc51fc2672458dd1c9641250f2ecc01a31 09-Jul-2014 Matthew Williams <mjwilliams@google.com> Add job persistance as a setter in the API

Bug: 15936795
Change-Id: I11e5a722bab5838dc151670256ed09dfaa7fdaa7
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/JobStore.java
ava/com/android/server/job/controllers/JobStatus.java
41cd577c12a3525663101ff9217ded509bb869d6 11-Jul-2014 Amith Yamasani <yamasani@google.com> Send USER_FOREGROUND and USER_BACKGROUND to all related profiles

Also do a check for null applicationInfo object during user creation.

Bug: 16211029
Change-Id: Ib49c241cf3698735e273edf5704bef277f1142a5
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/Settings.java
4fc1d105fc279bf7df6c876e160672866bdad8e7 09-Jul-2014 Jungshik Jang <jayjang@google.com> Revamp disabling device in local device.

When a cec deivce turns into disabled mode such as power off, standby,
and cec feature disabled, cec service should execute cleanup tasks.
Including cleaning up all feature actions, each device should run
their own cleanup.
It should stop system audio mode and arc for tv, while it should
send inactive source for for playback device.
Along with this, to prevent stale feature action, added timeout
to local device so that if there is stale action, it enforce to
finish it.

Bug: 16118520

Change-Id: I5ce30ab0f4459b6e2834f8d31b6a7ff789b35d07
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
b3e114af17c91a409e766e111e472f600f7b866c 11-Jul-2014 Jungshik Jang <jayjang@google.com> Clear timout when all pending actions are cleared.

Remove disable_device_timeout message when all pending
actions are cleared, PendingActionClearedCallback#onCleared
is called.

Change-Id: I32e37c94c6a6dfc149da3bb0553d2a3238bae479
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
b69aafbfaddd8a6ac84b366b5db640cdd7e95354 11-Jul-2014 Jungshik Jang <jayjang@google.com> Hook up missing volume-change with AudioManager.

Whenever new volume change is notified from system audio,
hdmi control service should delegate it to AudioManager.
Note that, it should set FLAG_HDMI_SYSTEM_AUDIO_VOLUME,
which prevents audio manager from notifying volume-
change event back to hdmi control service.

Change-Id: I6621f517a4d20226aea9159bbae6b699e2c2ffd0
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
8219a25e31b52c701e45ebae82219c64ea18134b 11-Jul-2014 Kenny Guy <kennyguy@google.com> Merge "Enforce block uninstall in PackageManager"
7c940e94c97ce3c86f2d54ad567127fc11cc8074 11-Jul-2014 Yohei Yukawa <yukawa@google.com> Merge "Polish new IME API for L part 2: CursorAnchorInfo"
ad8dff5b1343fa8246674c240d9dd95346f6f802 11-Jul-2014 Narayan Kamath <narayan@google.com> Use the correct ABI list while copying native libs.

copyNativeBinariesIfNeededLI returns an index into the list
it was handed, so using Build.SUPPORTED_ABIS here is incorrect.

bug: 16013931

Change-Id: I35e0dad4b5e0c1dc1199f381d8b99cd228719092
ava/com/android/server/pm/PackageManagerService.java
0023d0e0c4f5339b299d1eacbd4e7181c2fd271f 10-Jul-2014 Yohei Yukawa <yukawa@google.com> Polish new IME API for L part 2: CursorAnchorInfo

This CL addresses feedbacks from internal customers for new
input method APIs that are mainly used for physical keyboard
support in L.

For performance reasons, #onUpdateCursorAnchorInfo is not called
back by default and each input method has to enable this
event notification explicitly whenever fine-grained character
locations are needed.

In L-preview, InputMethodSession#setCursorAnchorMonitorMode was
introduced for this purpose. However, we got several feedbacks
to be addressed.
- The effect of #setCursorAnchorMonitorMode is not preserved
during focus change. IMEs need to call
#setCursorAnchorMonitorMode every time when #onStartInput is
called. This is tricky and hard to understand.
- As #onUpdateCursorAnchorInfo is a new API, not all
applications/text editors have supported it. Therefore IMEs
can't always rely on it. However, there is no way to query
if the attached target is supporting this new API or not.
It would helpful for IME authors if we can provide a
reliable way to query if the attached input target is
supporting the new API or not.

In order to address these issues, the triggering method has
moved from InputMethodSession to InputConnection in this CL,
as an analogy of existing InputConnection#getExtractedText API,
which has provided similar functionality including optional
reactive event callbacks from the application to the IME.

BUG: 15812658
BUG: 16118603
Change-Id: I3c6b69bd9d79b199afe68d838f25effa6048e5cc
ava/com/android/server/InputMethodManagerService.java
17ff2b2b3a28da2f34e82ce1a623865fc249e87c 10-Jul-2014 destradaa <destradaa@google.com> Mark FLP constants as public, so they can be consumed by geofencing.

Change-Id: I6e73692064a9f58eeac6ba1118c37ac500df0d9f
ava/com/android/server/location/FlpHardwareProvider.java
1b88da54a684cf12f36b74bbc7c9548f35180fbe 10-Jul-2014 Kenny Guy <kennyguy@google.com> Enforce block uninstall in PackageManager

Bug: 14127299
Change-Id: I144233b97e5774f6a5d1d2b49f3f0f8a360557ac
ava/com/android/server/pm/PackageManagerService.java
aef5fcdcb5ff13cbdc64f18b315750b8a9a7fe3e 10-Jul-2014 Narayan Kamath <narayan@google.com> Don't assume all system apps are bundled.

Calling setBundledAppAbisAndRoots will end up
setting a path that points to /system/ if it's called
on a system app that was subsequently updated.

bug: 16208505

Change-Id: I0bf85e0341029b3d4d209a402d30c2ce357daaf2
ava/com/android/server/pm/PackageManagerService.java
6bc2c2c34f2b23eae79ad733c97a691734055c4f 07-May-2014 Paul Jensen <pauljensen@google.com> Convert Vpn from NetworkStateTracker to NetworkAgent.

This eliminates the need for the ConnectivityService.VpnCallback class.
This requires shifting VPNs to the new "network" netd API.
VpnService.protect() is modified to no longer go through ConnectivityService.
NetworkCapabilities is extended to add a transport type for VPNs and a
capability requiring a non-VPN (so the default NetworkRequest isn't satisfied
by a VPN).

bug:15409918
Change-Id: Ic4498f1961582208add6f375ad16ce376ee9eb95
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
ava/com/android/server/connectivity/NetworkMonitor.java
ava/com/android/server/connectivity/Vpn.java
ni/com_android_server_connectivity_Vpn.cpp
47d8d1b0a8641a1c346da39f5052ae5aa845d117 10-Jul-2014 Wink Saville <wink@google.com> Ignore hasService in updateTelephonySignalStrength

A possible reason for empty triangle is there is no service, I'm
temporarily ignoring hasService in updateTelphonySignalStrength and
adding more debug.

Add logSSC to see history of Service State Changes.

Bug: 16148026
Change-Id: Ia463997eac7b062653b3cef00570d3fffc115ad3
ava/com/android/server/TelephonyRegistry.java
e9b9b1e7845d93015363c627d76b719f33120158 10-Jul-2014 Yuncheol Heo <ycheo@google.com> Verify the CEC message source and the destination.

- Depending on the message type, the direct destination or the broadcast
destination can't be used, and neither the unregistered source can be
allowed.

Change-Id: I7fe2151025afbf155ae663331d5d97d4910c4a98
ava/com/android/server/hdmi/HdmiCecMessageValidator.java
74185a3982491a0072f155079a9f848e7ed677da 10-Jul-2014 Adrian Roos <roosa@google.com> Merge "Add AlarmClock API to AlarmManager"
c42a1e1071937ae48b7aa5d6291a32c29078b74b 07-Jul-2014 Adrian Roos <roosa@google.com> Add AlarmClock API to AlarmManager

Adds a new kind of alarm that represents an alarm clock and
a way to query the next scheduled alarm clock.

Deprecates Settings.System.NEXT_ALARM_FORMATTED.

Bug: 14589952
Change-Id: I297eeeff36d07adcda010afac183d0f5ee37dc99
ava/com/android/server/AlarmManagerService.java
70779c71ddf7e6756d054e2de934c9fe35756e5d 10-Jul-2014 Narayan Kamath <narayan@google.com> Merge "Multi-arch application installs."
ff110bd61a69f7ed8602ae14b27f7befec76b2e7 04-Jul-2014 Narayan Kamath <narayan@google.com> Multi-arch application installs.

Each application now has two ABIs, the primary
and the secondary. The app is always launched with
the primary, but the secondary might be used by other apps
that load the given applications code. This implies we
must:

- dex2oat the app both ways.
- extract shared libraries for both abis.

The former is relatively straightforward but the latter
requires us to change the layout for shared libs that we
unpack from applications. The bulk of this change deals
with the latter.

This change continues to fill in nativeLibraryPath during
scans for backwards compatibility. This will be removed in
a future patch.

Change-Id: Ia943dd11ef815c5cbfc60f17929eaa2a652a385a
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/Installer.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/PackageSetting.java
ava/com/android/server/pm/PackageSettingBase.java
ava/com/android/server/pm/PendingPackage.java
ava/com/android/server/pm/Settings.java
3c45c29109d23981d8b707c809b3b43ce2e20fc3 09-Jul-2014 RoboErik <epastern@google.com> Pipe volume keys to adjustVolume instead of sendMediaKeyEvent

We were calling sendMediaKeyEvent with a KEYCODE_VOLUME key, which was being
ignored because it's not a media key. This redirects the volume keys to use
the adjustVolume methods instead. It also sends the appropriate flags to
make the lock screen consistent with the home screen and the volume keys
only affect active playback when the screen is off.

bug:15900519
Change-Id: I9f3853a2385869353a58debae6e6ca9933ba06ce
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
0161bbc6e54744d5e0348af3d123858818f966e9 03-Jun-2014 Colin Cross <ccross@android.com> ActivityManager: use Process.killProcessGroup to kill forked processes

Place newly-created processes in a process group, and use
killProcessGroup to kill any forked processes.

Bug: 15313911
Change-Id: I0f3e2eeebd9a910dae3f6b2801826c92aea03030
ava/com/android/server/am/ActivityManagerService.java
503dca6f58b9c774165dfe270bc1bc3bebac64f5 10-Jul-2014 Alan Viverette <alanv@google.com> Merge "Add API for specifying popup window shadows and shadow insets"
7237965c0d6f86a5f6e71d23645c37022edc4175 10-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Refactor wifi p2p's startDhcpServer function"
9c7e2c2cb491268db0322ad78856faf0582e61d1 23-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Refactor wifi p2p's startDhcpServer function

Add getTetheredDhcpRanges() interface and call it before calling
mNwService.startTethering to update dhcp ranges. This will allow
p2p apps to run well concurently with other tethering apps.

Manual import of AOSP change 81546 by jianzheng.zhou@freescale.com

Change-Id: Iebc62f95bdcedde80e2c1d3e9580d3f625c3b50b
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Tethering.java
ff6ecccdc8c32129eed036793fef4a05becfe447 10-Jul-2014 Paul Jensen <pauljensen@google.com> Merge "Enable network validations and add app to handle captive portal login."
869868be653cb8eedd338e8347dfee1520d38cec 15-May-2014 Paul Jensen <pauljensen@google.com> Enable network validations and add app to handle captive portal login.

Network validation prevents networks claiming to provide internet connectivity
from becoming the default network in cases where internet connectivity is not
found to actually exist.
If a captive portal is encountered the appropriate broadcasts and notifications
are surfaced to allow apps to handle signing in. If no app handles signing in,
my system app will handle it.

Bug:15409233
Bug:15409354

Change-Id: Ie240d7eac4bdbab8cc7578782bd72d8b26de7951
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkMonitor.java
d706933527d592e7ecf93c78bec775790b73c123 10-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Add Network inspection API."
73b6cbae0cf6ca71453c526895a735130e72c9c0 23-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Add Network inspection API.

Adds getNetworksNetworkInfo.
Adds getAllNetworks.

Cleans up some synchronization issues.

Change-Id: I82c7a4b554e3c6c1adfe6027cc54b028ed6dbac9
ava/com/android/server/ConnectivityService.java
ddef7e776b35aba0f7b4eb4978e93361b49c145f 10-Jul-2014 Dianne Hackborn <hackbod@google.com> Get rid of security exception spam during boot.

Change-Id: If7a516e463722280bf597f7dd601e7a0f6e379c8
ava/com/android/server/power/PowerManagerService.java
ccb11e183763db5cbaca96abe461adf480ed8e44 09-Jul-2014 Alan Viverette <alanv@google.com> Add API for specifying popup window shadows and shadow insets

BUG: 14569120
BUG: 13211941

Change-Id: Ia21596b25a0471344d42d59377074f67fce00042
ava/com/android/server/wm/WindowStateAnimator.java
06505d234ddf66cb71d1f7defd096bdf68bc222d 09-Jul-2014 Robin Lee <rgl@google.com> am 1f0180bf: am 74803e55: Merge "Make misc config directory during user creation"

* commit '1f0180bfa877373b239a5675f715288db829fa75':
Make misc config directory during user creation
d5c72cbc23496bff5feac78455afb323c08bbeca 10-Jul-2014 Alan Viverette <alanv@google.com> Merge "Remove icon from base alert dialog, use light theme"
c65ff211af9b425ad709d835fbf4ee349472b4e6 10-Jul-2014 Alan Viverette <alanv@google.com> Remove icon from base alert dialog, use light theme

BUG: 16160305
Change-Id: I3cc5b5f0f02ddffb19b06b4796dedb98a6083454
ava/com/android/server/am/BaseErrorDialog.java
30303faea63473003e3d038d987cebf9a63f31dd 10-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Extend pm to support sessions and split APKs."
ec55ef0934b8e0d1bb705434947de817f7be57f1 08-Jul-2014 Jeff Sharkey <jsharkey@android.com> Extend pm to support sessions and split APKs.

Separate commands to create an install session, stream files into the
staging area, and then commit the install. Streaming can accept data
from stdin across adb, avoiding extra copy from push.

Extend FileBridge to support blocking close(). Always destroy
session regardless of result.

Bug: 14975160
Change-Id: Ic3f462e7d1901079b785e210228950cdfa676466
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
ed51d70df82951377c244d05839fee699255d3a5 10-Jul-2014 Colin Cross <ccross@android.com> Merge "ActivityManager: pass the main uid of the app to lmkd"
54f5884b3518d9650b3d91d6a9856e79e955a335 10-Jul-2014 Andres Morales <anmorales@google.com> Merge "Service for reading and writing blocks to PST partition"
68d4acd205e8c2da524e62734ca42847306cc029 02-Jul-2014 Andres Morales <anmorales@google.com> Service for reading and writing blocks to PST partition

Permits apps with permission
android.permission.ACCESS_PERSISTENT_PARTITION to obtain
a read and write data blocks to the PST partition.

Only one block ever exists at one time in PST. When
a client writes another block, the previous one is
overwritten.

This permits storing a block of data that will live
across factory resets.

Change-Id: I8f23df3531f3c0512118eb4b7530eff8a8e81c83
ava/com/android/server/PersistentDataBlockService.java
ni/Android.mk
ni/com_android_server_PersistentDataBlockService.cpp
ni/onload.cpp
c522d1646ac353aec302252fa53976c1fa46ad3d 02-Jul-2014 Jim Miller <jaggies@google.com> Decouple critical policy power update from SCREEN_ON broadcast

This attempts to fix a bug where ordered broadcasts like
ACTION_SCREEN_ON are substantially delayed by misbehaving
receivers. Instead, we immediately send the state to mPolicy
so that it can wake/sleep the device without delay.

Fixes bug 14313639

Change-Id: I21a191f90e0a19f1ee75c160ecc4e63e8def709e
ava/com/android/server/power/Notifier.java
dbbf07a5c7f514f2168f236e1df3b2ca70d4ab2f 09-Jul-2014 Jeff Sharkey <jsharkey@android.com> Upgraded system apps could be mono or cluster.

Derive old-style paths for monolithic installations, otherwise
assume cluster installation.

Bug: 16163776
Change-Id: I03f1a12f9c07f6177a5c09be2bfe967416c07652
ava/com/android/server/pm/PackageManagerService.java
d908edd810dd22d8ec512a19c32637df464e9d0a 13-Jun-2014 Colin Cross <ccross@android.com> ActivityManager: pass the main uid of the app to lmkd

The uid and pid will be used to together to find any forked processes
and kill them.

Bug: 15313911
Change-Id: I2edb51527e5d1a977c0fad0e6c959c8438bb4be9
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ProcessList.java
61659e5daaea80104d4d0fd567e78b5f757b5df4 10-Jul-2014 Dianne Hackborn <hackbod@google.com> Add tracking of uid process states in battery stats.

We now keep track of how long each uid had processes in
various states: foreground, active, running. This is based
on a collapse of the various activity manager process states
into these three bins.

You'll see these in a checkin like this:

8,10013,l,st,61504,61504,83109

Also fix issue #16021555: App showing up as on "top" even
when the screen is off. This is "fixed" by just saying we
always report the current app at the top of the activity stack,
regardless of the state of the screen.

Change-Id: I1204904225101243eb00b43425d9806bffdd2ab9
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BatteryStatsService.java
75a77e7d6cbfc287c6126efd28b338b48b7ea70c 09-Jul-2014 Yuncheol Heo <ycheo@google.com> Add HdmiCecMessageValidator to verify the incoming messages.

- Remove all param's length-check-logics in the package.

Bug: 16051295, Bug: 16117332, Bug: 15841545
Change-Id: If48ad9731f4f4613fd22aa3d9ada7ba3142bc999
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageValidator.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiUtils.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/SystemAudioStatusAction.java
ava/com/android/server/hdmi/VolumeControlAction.java
3bc1bafabaedffede8963703cf3bfde2054ef91a 07-Jul-2014 Craig Mautner <cmautner@google.com> am 6d6d2189: am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."

* commit '6d6d2189625a679948920861b957948b505cb53f':
[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
9d8a30d9e1c17877cd45686a8f6aa70142c33573 07-Jul-2014 Craig Mautner <cmautner@google.com> am a7f02a5c: am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."

* commit 'a7f02a5cda27147fe7076805187fb6fbc60fdcfb':
[ActivityManager] Avoid keeping restarting home when only home activity exists.
0a9927025041a6dde3f3878bdd868a69ab1b3266 07-Jul-2014 Craig Mautner <cmautner@google.com> am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."

* commit '09c1af5d5c43f716fb4093eae6cf5442e7bb88d1':
[ActivityManager] Prevent kill a restarted process again.
53cc7d7998a9a656fe89ec8eba40ad479bded274 07-Jul-2014 Craig Mautner <cmautner@google.com> am 7611a5d3: am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm."

* commit '7611a5d32889f54b1763cf076a442a0575c69b51':
[ActivityManager] Ensure alive process is not killedByAm.
284d0906cde8922983f35edaac79900806026d82 09-Jul-2014 Robin Lee <rgl@google.com> am 06505d23: am 1f0180bf: am 74803e55: Merge "Make misc config directory during user creation"

* commit '06505d234ddf66cb71d1f7defd096bdf68bc222d':
Make misc config directory during user creation
fe0538098403b49ebd9219bf77236471bb5ca63b 30-Jun-2014 Julia Reynolds <juliacr@google.com> Restrict factory reset with user restrictions.

Bug: 15985879
Change-Id: I524bd8a790798a85a679aa195e634f6e0227d09f
ava/com/android/server/MasterClearReceiver.java
6752cba4642ea9103f3013336c005f06968fd442 09-Jul-2014 Nick Kralevich <nnk@google.com> Merge "ConfigUpdateInstallReceiver: pass content via content provider"
3269ca6b0f29b897dcf11520cfcaee3e847695c2 09-Jul-2014 Wink Saville <wink@google.com> Enable a couple more lines of debug in TelephonyRegistry.

Bug: 16148026
Change-Id: I8b934652e47a273fa66a86d031efb24c33c4fe39
ava/com/android/server/TelephonyRegistry.java
27c6745f7246cb2420f5d9aabf2059773eccca20 09-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Add empty OneTouchRecordAction."
3dcdd71e203f7751155ec83468e0f8092e8ea80b 07-Jul-2014 Jungshik Jang <jayjang@google.com> Add empty OneTouchRecordAction.

It's to remove a TODO in HotplugDetectionAction.

Bug: 15844113
Change-Id: I74d5ed6ba220fb079b64b766a1354df1ea8e00ab
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/OneTouchRecordAction.java
b34acf94b53e10e6c67503957e8f5e4a8faf2f1e 09-Jul-2014 Wink Saville <wink@google.com> Merge "Add debug to TelephonyRegistry."
f4cd25b2c867ad74f983f1bacae3925005685a69 09-Jul-2014 Wink Saville <wink@google.com> Add debug to TelephonyRegistry.

Also change all debug to use the new log method and send the debug
to Rlog rather than Slog. This way we don't spam the main log buffer
just our radio log buffer while we're debugging 16148026.

Bug: 16148026
Change-Id: I5571f7d07405ddb3c208efd1756106b78343c843
ava/com/android/server/TelephonyRegistry.java
5e6643c1376130e402d30da647fdfebd86b7f2fc 09-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Clean up IPackageManager install surface area."
513a074de68a4772a9900e90f38e74ff92c15e7c 09-Jul-2014 Jeff Sharkey <jsharkey@android.com> Clean up IPackageManager install surface area.

Also more removal of encryption support.

Change-Id: If525dc5a8422134515f225a8ac4731e968069468
ava/com/android/server/pm/PackageManagerService.java
8d479b0c2ddb150182bcf510876a240cb869661b 08-Jul-2014 Jeff Sharkey <jsharkey@android.com> Derive library path for upgraded system apps.

Bug: 16156270
Change-Id: I368433063ff33d15129c8076ddc6f1e2a0963e54
ava/com/android/server/pm/PackageManagerService.java
65b1a7c0ba4213d625b1cb36d1405cf8767310d4 08-Jul-2014 Jeff Sharkey <jsharkey@android.com> Offer to scan cluster packages at boot.

Bug: 14975160
Change-Id: Ib637f68354b3d4ce4b5b23d875d8e94ccd497fd2
ava/com/android/server/pm/PackageManagerService.java
d746057f2414cba2bdc69257cc5be8cb681bb592 07-Jul-2014 Jeff Sharkey <jsharkey@android.com> Change new file installs to be cluster-based!

Now that all the other pieces are in place, we're ready to start
installing new file-based packages as a cluster (the new unified
directory-based layout). This greatly simplifies the renaming
process.

Also add helper methods to ApplicationInfo to give a much clearer
mapping between it and internal field names, since we can't change
the public API.

Add recursive restorecon().

Bug: 14975160
Change-Id: I72a63c5ddbc594c2fec4a91dd59f73ef253fbfd7
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
539a7ef5c93b3a4d6ad7db0d278b1aa5814c0393 07-Jul-2014 Alexandra Gherghina <alexgherghina@google.com> Removes cross profile package information when removing an user

This makes sure that if the user id gets reassigned without restarting the phone,
we do not have old information from the preexisting profile.

Also renames method which needs write locks.

Bug: 15928463
Change-Id: I30b0f85cf90d3e0c289a37bcbaec8da63499a170
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
4bb015d90ae2aa3ce30778f3f584e0b7124f7505 05-Jul-2014 Joe LaPenna <jlapenna@google.com> CW on Master: Disable CaptivePortalTracker, EthernetService

BUG: 15143878

Change-Id: I6c534a28c1fcd475982ae70e7f3af69f3a219e24
ava/com/android/server/ConnectivityService.java
4ec2023349f19b2fd2461aa3c9b208eb799a662e 09-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Derive library path for upgraded system apps."
f621a5b1b3268cafaf5b398f7cde0727a46891be 08-Jul-2014 Makoto Onuki <omakoto@google.com> Merge "Cross-user provider access no longer requires ..._FULL"
4451419fc675e02acd6df2664e6c4eafcca9c261 08-Jul-2014 Makoto Onuki <omakoto@google.com> Cross-user provider access no longer requires ..._FULL

Now only INTERACT_ACROSS_USERS is required.

Change-Id: If5bdbfb055d9d57a3180885f2aea652b889e7705
ava/com/android/server/am/ActivityManagerService.java
9eb38a6ffa8c4f113a274ce6b390e5d138018a25 08-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove dead code."
8283f8802d7e4d78c7eb031ddac07a4cfdc30771 08-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Remove dead code.

Also adds a TYPE_VPN so the VPN can be strongly typed.

Change-Id: Ibf39450c480f16ce5ab4c25b47965691b844fb92
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Vpn.java
56d69f01a7fe5bc426ffb31709a052c159d0f91e 08-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Offer to scan cluster packages at boot."
1e47ff9f8faa2927084b3da1e2d7d16ef0477637 08-Jul-2014 Wonsik Kim <wonsik@google.com> Merge "Implement support for buffer producer profile"
0b2691b6873f9d328884c5a9e5ab1fe308f3ee36 23-May-2014 Wonsik Kim <wonsik@google.com> Implement support for buffer producer profile

Bug: 15177117
Change-Id: I7776a8b2959281f10cba742ab75f15f80f6feecf
ni/com_android_server_tv_TvInputHal.cpp
98d29489081350d64ee397df83a552aa85651d8e 08-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Change new file installs to be cluster-based!"
b93ccca6139a7ee2dba5c110e5f8213a2bd231e5 26-Jun-2014 Dongwon Kang <dwkang@google.com> Add onChannelRetuned callback in TV Input Framework.

Use cases:
- Channel change from STB which is bound to a TV input.

Bug: 14126559
Change-Id: Icddab61be6cb11162c03960fdb41fee8504bcd61
ava/com/android/server/tv/TvInputManagerService.java
88085ad05bd62be8f3c53917e3449a8fc5c37f10 08-Jul-2014 Winson Chung <winsonc@google.com> Merge "Refactoring to support groups."
ffa2ec664479bff6b4b61d4c349d9db2cb37ca16 04-Jul-2014 Winson Chung <winsonc@google.com> Refactoring to support groups.

- Removing RecentService, determining animations just in time
- Fixing a few issues with animations of newly picked up tasks from the pool
- Moving helper classes into sub package

Change-Id: Ie10385d1f9ca79eea918b16932f56b60e2802304
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/TaskRecord.java
95f621a1a4a0891075f1f9daf8e0323aab488793 07-Jul-2014 Craig Mautner <cmautner@google.com> am 3bc1bafa: am 6d6d2189: am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."

* commit '3bc1bafabaedffede8963703cf3bfde2054ef91a':
[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
3a0dbfb206dbde546fffa35902cf13101667eb79 07-Jul-2014 dcashman <dcashman@google.com> Record properSigningKeySet values to packages.xml

PackageKeySetData records all of the defined keysets which are a subset of an
apk's signing keyset. It also records the original superset for all of these
in an easy-to-access 'proper' signing-keyset which is consulted as the official
source for a package. This value was not being recorded, causing
PackageManager to re-gather the certificates for a package on each boot after
a fix for a different bug. Record it.

Bug: 16076095
Change-Id: If5a7f6d70dd4784284d7bab466dab0311aa13c28
ava/com/android/server/pm/Settings.java
f16c5e7ae0cb7a16720d70fda26e5660e4838894 07-Jul-2014 Mike Reed <reed@google.com> Merge "kNative_8888_SkColorType is now kN32_SkColorType"
4a9c3891d4f890109e02bc83fecf9bcdf56a9395 07-Jul-2014 Mike Reed <reed@google.com> kNative_8888_SkColorType is now kN32_SkColorType

Change-Id: I13421a21de611203c62c1c1c36570a8cc803907b
ni/com_android_server_input_InputManagerService.cpp
6ea0d0a2592395b8980c24304733daec628e947e 03-Jul-2014 Dianne Hackborn <hackbod@google.com> Fix cleanup of voice sessions.

They would leave active voice activities lingering around.

Change-Id: I5b6716ab303636ebdf2f13c3172552a73dae3bb1
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
92aa5a2f15032f3e5a5394ca96d0b6fd03f0b405 07-Jul-2014 Emily Bernier <ember@google.com> Re-commit of reverted change 458959

Using correct parameters for Slog.w().

Change-Id: I0ab7a1b114431f15fe3652e98c75e7baab7a2d95
ava/com/android/server/MountService.java
255edb556e289a53d1c62a700028c25dab90010e 08-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Fix broken build."
8866c810b6778714da69ebc023ed432491caad92 08-Jul-2014 Jungshik Jang <jayjang@google.com> Fix broken build.

Change-Id: I9b0fe05a090238f27f226111e344f68c119ef4f7
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
8f2ed357a23fac4a55da43d20138b438b4ac79a7 07-Jul-2014 Jungshik Jang <jayjang@google.com> Handle <Set Osd Name> in TV.

When TV receives <Set Osd Name> it should update the name of
device and should notify them who are listening device changes.

Bug: 16115666
Change-Id: Ic3b60def8858ca5b7041202135d5dcaf47fa06e7
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
42230728b8212738c2351939c5577730f05a58de 07-Jul-2014 Jungshik Jang <jayjang@google.com> Add port number to hot plug event handler.

This is to remove a TODO about adding port number to
jni interface.

Bug: 15844074
Change-Id: I4dba0879527035a4cabad6cc80e359e6c1fd39b0
ava/com/android/server/hdmi/HdmiCecController.java
ni/com_android_server_hdmi_HdmiCecController.cpp
c4ae64d541e72b9d4d5b0e101e432223c9ffcc15 08-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Intent definition for HdmiControlService for OSD display"
24c23c1dd82870be4c09f3c5b6ae354de722de94 07-Jul-2014 Jungshik Jang <jayjang@google.com> Remove a TODO checking device power.

Since we enforce to run poll devices when hot plug event is fired,
we don't need to have arc management triggered by separate +5 power change.

Bug: 15841645
Change-Id: I619f8975688f63cb09cb7a296de52b558b494901
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
c7eba0f1db8928ca779933a564a06989e22a8532 07-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Intent definition for HdmiControlService for OSD display

Intent action/extra for TV app to show a message on screen about events
HdmiControlService need to report for user's attention. The app
needs system permission HDMI_CEC to receive the intent.

Change-Id: I4fbe4621efa20a17ca64a3ca8f2df64bee03c51b
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
347a60449981fc934e5a84122df87c1447665548 07-Jul-2014 Yuncheol Heo <ycheo@google.com> Fix the initial values of HDMI HAL options.

- We define the default value of OPTION_CEC_ENABLE as enabled, but OEM's
default was disabled.
- Fix the initial value of OPTION_CEC_SERVICE_CONTROL as enabled.

Change-Id: If4a69fd2a87739b9f6f7b9a5a5a2a5cdd514d48f
ava/com/android/server/hdmi/HdmiControlService.java
119160a68195bcb2f5bdf4a269807e01228eca97 07-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Add vendor-specific command API for HdmiControl

Vendor-specific commands are not handled by the service. This CL
opens an API for vendors to implement customized handling of
CEC commands specific to their needs.

Change-Id: I8bfa3b891bd7994a903b3b41d7c2b27464167afa
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessage.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/VendorSpecificAction.java
620a5466ce5f401aafa6a438383016640ec51d1a 07-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove unused api."
0df9858802d80e4275326521813c580176fb24f2 07-Jul-2014 Craig Mautner <cmautner@google.com> am 9d8a30d9: am a7f02a5c: am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."

* commit '9d8a30d9e1c17877cd45686a8f6aa70142c33573':
[ActivityManager] Avoid keeping restarting home when only home activity exists.
a8f569c10a423ced5be7e019c3df2bca11b052f5 07-Jul-2014 Jason Monk <jmonk@google.com> Add toast when user tries to leave lock-to-app

The toast will describe how to exit when entered normally, but when
entered by a DPM whitelisted app it will just notify them they are in
the mode.

Bug: 15780115
Change-Id: I75ac8540c31a75ac68e34b3b5c8260e191894b39
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/LockTaskNotify.java
851d2d5d5680ab26eccd2b26a4acc29a1d637c94 28-Jun-2014 RoboErik <epastern@google.com> Don't send remote volume changes for local playback

bug: 15913248
Change-Id: I701d0a446ef981deae171b9e882c29906593b3c8
ava/com/android/server/media/MediaSessionService.java
e585bfe80c1a4c49a17f19006129f1c45af174e2 02-Jul-2014 Paul Jensen <pauljensen@google.com> When adding a NetworkRequest, cancel linger for satisfying Network.

This fixes a problem where a requested network can later suddenly disappear if
it was lingering when the request arrived and later the linger timeout expired.

bug:15927234
Change-Id: Ib3fae45820ce4421e3bc5b623937a16d5f1efa0f
ava/com/android/server/ConnectivityService.java
b633657be45091cbb123843a36d8b44dece5676f 07-Jul-2014 Craig Mautner <cmautner@google.com> am 0a992702: am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."

* commit '0a9927025041a6dde3f3878bdd868a69ab1b3266':
[ActivityManager] Prevent kill a restarted process again.
17c3e0fbfcd404fb253288b386d7b39368d5852a 02-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Remove unused api.

bug:15595155
Change-Id: Ifd79365bd45f20f531782244f471a4cfc32a4135
ava/com/android/server/ConnectivityService.java
5a19b1c75390881a13dc06e942cf5c9992650c1f 08-Jul-2014 John Spurlock <jspurlock@google.com> Merge "Implement new volume UI design."
ae641c9ccd3f81214cee54a5f13804f1765187ad 01-Jul-2014 John Spurlock <jspurlock@google.com> Implement new volume UI design.

- Add segmented zen-mode picker to the rocker UI.
- Add a new "no interruptions" value to the zen setting.
- Implement expandable condition subpanel on the rocker UI.
- Remove the old circle&slash icons.
- Suppress alarm sounds if in "no interruptions" mode.
- Add warning re: alarms to the condition UI.
- Allow rocker UI to display over the keyguard.
- Remove Notifications QS tile.
- Realign volume rocker to the top of the screen.
- Add support for new "days" sleepMode.
- New icon policy rules for "volume" slot.
- New important icon (star).

Associated Settings change:
I6ed56791784968adfbd684f490dbbebed285a2dd

Bug:15831713
Change-Id: I35afe38646f04d2ba0dbac11c2c6356120a33694
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenModeHelper.java
468f7da79715cd7445a854ee118312cff4f2f1fd 08-Jul-2014 George Mount <mount@google.com> Merge "Introduce onNewActivityOptions for return activity"
eb8abf7207aa118065999514f9248affbdd94de1 03-Jul-2014 Craig Mautner <cmautner@google.com> Introduce onNewActivityOptions for return activity

When an activity that is already translucent returns to the
previous activity using a scene transition the receiving activity
did not receive its ActivityOptions for its side of the animation.
The new method onNewActivityOptions() delivers those options.

Fixes bug 14869070.

Change-Id: I09b136b3213aae5d3521894e17a7500ac793f3d2
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
b0a11172eabed683cca50f19e566ceb11aa79c86 08-Jul-2014 Craig Mautner <cmautner@google.com> Merge "Add Media Playing API"
ee2e45acbff28986c2ced636b7550d0afbb0eeb7 27-Jun-2014 Craig Mautner <cmautner@google.com> Add Media Playing API

These methods permit an activity to play or continue playing media
behind a translucent activity above it. Particularly the home
activity in Android TV. Methods exist to notify the upper activity
when playing starts or stops and for notifying the playing activity
when to stop playing and release its resources.

Methods are called when either activity's state changes or new
activities are launched.

Fixes bug 14469711.

Change-Id: I7ba10c5a4683504931cffa228488f5281e5bbf86
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
20319280783fdffb560b503a3df4794b0ae44370 08-Jul-2014 Jason Monk <jmonk@google.com> Merge "Fix UserManagerService.setUserIcon throwing expt."
9a944532af0f07d8b916556d229c21d3eda91a59 08-Jul-2014 Jason Monk <jmonk@google.com> Fix UserManagerService.setUserIcon throwing expt.

setUserIcon sends a broadcast that requires INTERACT_ACROSS_USERS.
Since the function directly checks MANAGE_USERS permission, added
a clear calling identity.

Alternative solution would be to make function check for one of
INTERACT_ACROSS_USERS permissions before performing any actions.

Change-Id: Ibbf27d4e188d059671024e4bb62f92a2daea3661
ava/com/android/server/pm/UserManagerService.java
b3a0444207c0c4fe27a03dc5b39317c8240ec115 08-Jul-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Use default phone app api in call filter."
312d1d01def474e39e4dabbf4aef0b8adaa7caed 08-Jul-2014 John Spurlock <jspurlock@google.com> Zen: Use default phone app api in call filter.

Remove hardcoded list of packages (for calls).

Use the TelecommManager version until the PhoneManager version
is ready.

Change-Id: I4488f4ea3f0c03f009c84f519eb533e0ea1e07d5
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/ZenModeHelper.java
d61dc20de10452dcc6905dcf0654f30c64762a1d 07-Jul-2014 Craig Mautner <cmautner@google.com> Add Activity.isTopOfTask() method

Used by scene transition to determine if an activity has launched the
next activity into its own task or into another task.

Fixes bug 15771895.

Change-Id: I6d350350dcf27509296d55d7b75be90a01694ac9
ava/com/android/server/am/ActivityManagerService.java
17fcc01c33fae16c9fca77ea8c0a696986563a3f 07-Jul-2014 Craig Mautner <cmautner@google.com> am 53cc7d79: am 7611a5d3: am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm."

* commit '53cc7d7998a9a656fe89ec8eba40ad479bded274':
[ActivityManager] Ensure alive process is not killedByAm.
b5afefbd0770a9af9e1b8a8b9d01a26e2f0338a7 04-Jul-2014 Nicolas Prevot <nprevot@google.com> Fixing bug when checking that the target user can handle the intent.

BUG: 16079965
Change-Id: Iac61d1c20f5b66b3f3016b82bc4e48d7997ea1a0
ava/com/android/server/pm/PackageManagerService.java
e8e61e09353e2a1deb5b6d9f545ba6dfa20e9f64 07-Jul-2014 Wonsik Kim <wonsik@google.com> Merge "TIF: Let TvInputHal handle multiple streams"
839ae5f460caadf8580b7e0ab77e255d7a1ddae5 03-Jul-2014 Wonsik Kim <wonsik@google.com> TIF: Let TvInputHal handle multiple streams

Bug: 15579918
Change-Id: Iad972c36d675fb99b5950bcecf5925e660272cb4
ava/com/android/server/tv/TvInputHal.java
ava/com/android/server/tv/TvInputHardwareManager.java
ni/com_android_server_tv_TvInputHal.cpp
fca826de374bae6bff3d46d8020453a9ec1cbdbe 07-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Update HdmiControlService.deviceSelect()"
b38cd68b240d99e8c8ae6ff1802a574696b420cd 07-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Update HdmiControlService.deviceSelect()

The device selection action should have stopped if
TV's own power goes to standby in the middle. This CL
implements the right behavior.

Some TODO's about OSD banner were removed as they
can be handled in caller (TV app) when invoking the API
or upon receiving the callback based on the result. One
more callback result constant was added accordingly.

Bug: 15843137
Bug: 15844312
Bug: 15845651

Change-Id: Ib118fd6e80e9abdfb531e3f321d8db1c9cec45bd
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
96aacd2a2c04f5feeb58e025cacc3c83fc902339 04-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Remove the usage of TX_STATUS in HdmiControlService"
cae6627702a3bae3121f0ebbb9c8069e77f81cc7 04-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Obtain TV power status correctly in HdmiControlService

Bug: 15845654

Change-Id: I28b97e7ecb462b4fbaf6ac573e4d0fc9fcf724da
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/RoutingControlAction.java
5344cd98e69f92e70d52969b1851c9d8f9e81853 03-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Launch routing control in HdmiControlService at boot up

Change-Id: I918c2a0da26a7cda20ee703dfeeacae276ec8373
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ba147582b1ae504e9c00a0c94d715c061506b2ba 02-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Remove the usage of TX_STATUS in HdmiControlService

Reflects the change to come in CEC HAL

Change-Id: I3a64e19bbdd8067855911ef11653fe64049b8880
ni/com_android_server_hdmi_HdmiCecController.cpp
18563b1e97ae212daa50c6be2fcab7a53910371c 07-Jul-2014 Jungshik Jang <jayjang@google.com> Fix send key action bug.

Change-Id: Ia6d552cda91db02847e5c0334274258df936bf64
ava/com/android/server/hdmi/SendKeyAction.java
a1a086a2fea42c3d1c1c6a99886d14b2d1456a21 07-Jul-2014 Jungshik Jang <jayjang@google.com> Fix bug on SendKeyAction

Change-Id: I7815986bda39dcc828b1da5cfdb64e0669fe4a49
ava/com/android/server/hdmi/SendKeyAction.java
a0a999d8d7148ed07b6e2322f593d538b53f2419 07-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Fix a bug in KeyAction in HdmiControlService"
708b974f0aaf6f7c50b11969cdea5b439df7e6f5 07-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Fix a bug in KeyAction in HdmiControlService

Send KeyDown command for a new non-repeatable key press event

Change-Id: Ide25709f0954ecc7e8c15ae3e0f715b05e7cbf6f
ava/com/android/server/hdmi/SendKeyAction.java
4ab7606f325dd5150a635b536b78028b77b2c2da 04-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Removed class HdmiCec"
c0c20d0522d7756d80f011e7a54bf3b51c78df41 04-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Removed class HdmiCec

Most of the constants in HdmiCec are internal use only. Moved them
to service, and dispersed the rest to other relevant classes.

Also moved HdmiCecMessage class to service as it doesn't need to be
open ouside the service.

Change-Id: I7b2ce3bf465330aa4d7fcd05f9aefa1e6c8b056a
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/Constants.java
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/DevicePowerStatusAction.java
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessage.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiCecMessageCache.java
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiUtils.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/OneTouchPlayAction.java
ava/com/android/server/hdmi/RequestArcAction.java
ava/com/android/server/hdmi/RequestArcInitiationAction.java
ava/com/android/server/hdmi/RequestArcTerminationAction.java
ava/com/android/server/hdmi/RoutingControlAction.java
ava/com/android/server/hdmi/SendKeyAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/SystemAudioActionFromAvr.java
ava/com/android/server/hdmi/SystemAudioActionFromTv.java
ava/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
ava/com/android/server/hdmi/SystemAudioStatusAction.java
ava/com/android/server/hdmi/VendorSpecificAction.java
ava/com/android/server/hdmi/VolumeControlAction.java
0f94217e9043e9dee329fa7167ee5be75eef0c23 04-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Add API setProhibitMode in HdmiControlService"
4d43d93743222311c6377d4904c19ccb93699d3b 03-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Add API setProhibitMode in HdmiControlService

setProhibitMode sets a flag inside the service that indicates if
input switch request will be processed or not. Sets to true when
TV is doing something for which TV display should be fixed, like
channel scan, software update - collectively called 'prohibit mode'.

Change-Id: I8ac623023210b58b684b9af3ac475a5fe0d09435
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/SystemAudioActionFromAvr.java
65f7c3ff20699abe767642402bda0380b815ceea 04-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Remove duplicated cec keycode definitions."
210d73df0b77b4c8be67ecc92afb238dc8c7ccfa 04-Jul-2014 Jungshik Jang <jayjang@google.com> Remove duplicated cec keycode definitions.

Remove keycode (ui command) defined and use HdmiCecKeycode one.

Change-Id: I9a7c4be3e5cfd561c7353b9cda715d431c00ff0c
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/SystemAudioStatusAction.java
ava/com/android/server/hdmi/VolumeControlAction.java
04fd28046acc2ac74339ed94cec76a0bfda846f7 03-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Update routing control action for HdmiControlService

Added an argument queryDevicePowerStatus on which routing control action flow
should be based.

Bug: 15845652

Change-Id: Ib8a2d31792aad67289308167d07f660c3438be78
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/RoutingControlAction.java
517cc7f99effa4ab174db560548b8495adfdd4e0 04-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Remove two TODOs from HotpulgDetectionAction."
26dc71e7feefb2417fd5f007af68614c1c197cf8 04-Jul-2014 Jungshik Jang <jayjang@google.com> Remove two TODOs from HotpulgDetectionAction.

Bug: 15844023
Bug: 15841646

Change-Id: I4022c48a9fdb1963f755895ec5ff0370157050c7
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
40d43b27b4f5fba75b040c24f95a170959811fd8 04-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Prevent press&hold for non-repeatable keycode."
250cda56d2fdd75a269843be1f5f2776b2eaed1d 02-Jul-2014 Jungshik Jang <jayjang@google.com> Prevent press&hold for non-repeatable keycode.

For non-repeat keys like power or mute key Hdmi-Cec
doesn't support press&hold feature. This change sends
user control pressed immediataly if the given keycode
is non-repeatable key.

Change-Id: Id571e67d94125a8c6a3553135b8e714b721405f3
ava/com/android/server/hdmi/HdmiCecKeycode.java
ava/com/android/server/hdmi/SendKeyAction.java
7d4faa6c86ff13505ec283a3f1f683775b0685bb 04-Jul-2014 Jungshik Jang <jayjang@google.com> Merge "Set source address for <Polling Message>"
1de514256fd3015cf45256f3198ab5472024af9b 03-Jul-2014 Jungshik Jang <jayjang@google.com> Set source address for <Polling Message>

CEC spec mentions that logical address allocation uses
the same address for source and destination while <Polling Message>
uses device's source address.

Bug: 16045547
Change-Id: Id18f328755501c62a98a1040b287c180cb889c9b
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
41d974631c5f525da49c88d34cecedd5a4cfeda8 30-Jun-2014 Jungshik Jang <jayjang@google.com> Add volume callback for Hdmi-Cec system audio mode.

Hdmi-Cec's system audio mode delegates audio control to
audio receiver from tv. It requires to delegate
volume change including mute to audio receiver
instead of consuming by tv.
In order to do this this change introduces three apis.
One is added to IAudioService, the others are added
to IHdmiControlService as hidden apis.

1. IAudioService#setHdmiSystemAudioSupported;
This is to notify system audio mode change to audio
service so that it determines to notify volume or mute
change to HdmiControlService.

2. IHdmiControlService#setSystemAudioVolume;
This is to notify volume change to HdmiControlService.
It's called only where system audio mode is on.

3. IHdmiControlService#setSystemAudioMute;
This is to notify volume change to HdmiControlService .
It's called only where system audio mode is on.

Change-Id: I3d8534b37ddf1a812e32012059a8778772044bf0
ava/com/android/server/hdmi/HdmiControlService.java
3a959fca91bce393cc1ee79aa2985bb06542016e 03-Jul-2014 Jungshik Jang <jayjang@google.com> Log unhandled message which has specific destination.

Broadcast message is unnecessary to log as broadcast message.

Bug: 16039302
Change-Id: Ifffc09b49bceaaf220ce929206eaecb78146016f
ava/com/android/server/hdmi/HdmiControlService.java
ea1e84b8ca6cdfa971b9e868c3ecd0569863e218 04-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Implement some apis for TV Input Framework and HdmiControlService"
9c37e1f53ea4734bfe5ae156dc5399ce5f2c7ccc 02-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Implement some apis for TV Input Framework and HdmiControlService

- setInputChangeListener()
- getInputDevices()

Change-Id: I6f7d6d9c7094018e2b6b5ba37f63c8ee5df00e37
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
b2596e6182c7d540a7499e312470bac7e811d978 04-Jul-2014 Yuncheol Heo <ycheo@google.com> Merge "Handle the power state change."
38db629d897e9d7c8e31ce0a7e985981e3e12996 01-Jul-2014 Yuncheol Heo <ycheo@google.com> Handle the power state change.

- Add BrocastIntent listener to catch SCREEN_ON/OFF intents.
- Add callbacks onTransitionToStandBy(), onStandBy() in HdmiCecLocalDevice.java.
- When it gets the SCREEN_OFF intent, the state will be TRANSITION_TO_STANDBY,
then when there is no outstanding actions, the state will be STANDBY.
- When the state is STANDBY, the TV device will broadcast <StandBy>.
- When it gets the SCREEN_ON intent, the state will be TRANSITION_TO_ON,
then when the initialization is done, the state will be ON.
- When the state is ON and it receives <StandBy> CEC message, it will force
the system to go to sleep.
- When the state is STANDBY and it receives the cec messages to wake-up the
system, it will force the system to wake up from sleep.
- Manage the active source state for the playback device.

Change-Id: Ib473219a0b0deb5224df89386db5a83720000411
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/OneTouchPlayAction.java
df972232c7caaf662052fadcde58ca41163d49d7 06-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Teach DCS about cluster packages."
be520fba1e45c77ca20eb66005a0cf19e10939a1 05-Jul-2014 Jeff Sharkey <jsharkey@android.com> Teach DCS about cluster packages.

For the time being, DCS is going to still be doing heavy lifting for
some install tasks, so it need to know how to handle both monolithic
and cluster packages. This change is mostly plumbing work to
eventually handle any various splits APKs that we may encounter.

Bug: 14975160
Change-Id: I39848d5666f9083cb4eca493e5cdaa868f3f99fb
ava/com/android/server/pm/PackageManagerService.java
0c54798aac8a86fed24b14a66f09797d58ad0399 06-Jul-2014 Jeff Sharkey <jsharkey@android.com> Start removing ContainerEncryptionParams.

The new PackageInstallerSession APIs will allow installers to deliver
bits directly into system protected storage, so we no longer need
encrypted containers.

Change-Id: I8b598cb149b7dfd1d41e6626c1359610a573edf1
ava/com/android/server/pm/PackageManagerService.java
73767b9d607d99b3a027619b5c6b7f1a09b7673d 05-Jul-2014 Jeff Sharkey <jsharkey@android.com> Extract native code from split APKs.

In the new split APK world, multiple APKs work together to define a
single package. This means that native code may be split among those
APKs. To handle this, extend NativeLibraryHelper to examine all
APKs in a package ordered by splitName.

A package has valid native code as long as one matching ABI is found
inside. The "best" ABI found across all APKs is picked for the
entire package. No attempt is made to ensure that every native
library defined is available for the picked ABI; that's the
responsibility of the installer.

Re-introduce PackageLite to represent a lightweight parsing of an
entire package, which may be a single monolithic APK or a cluster
of one or more APKs.

Remove native code extraction from InstallerSession, since it'll be
handled inside PMS for this release.

Bug: 14975160
Change-Id: I4f4db0f82e88a46101c7777499ebc0a11fd911f9
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
0fc63f4795e514e19c33ffc85de7affe2bec723b 06-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Start removing ContainerEncryptionParams."
ece4b655dcdcebac9434c91c2786f25aee6413c5 06-Jul-2014 Jeff Sharkey <jsharkey@android.com> Merge "Extract native code from split APKs."
c13053bf1c05b980421611487ce67677c08db299 29-May-2014 Kenny Guy <kennyguy@google.com> Add package state to block uninstall.

Add package state to allow profile or device
owners to block uninstall of packages.
Add API to DevicePolicyManager to set/get the
state.

Bug: 14127299
Change-Id: I03528819850b42df7bafa7747bb9e4558d20c4e6
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/PackageSettingBase.java
ava/com/android/server/pm/Settings.java
57dcf5b177b56195421535938544f32d8b591b42 19-Jun-2014 Jeff Sharkey <jsharkey@android.com> Slow progress towards APK clusters.

Differentiate between "split APKs" and "cluster packages". A cluster
package is a directory containing zero or more APKs (base+splits),
and a monolithic package is a single APK (base).

PackageSetting will use the directory name as its codePath, so track
the baseCodePath separately. Clarify documentation in several
places.

Require that all installers provide file:// URIs through existing
hidden APIs; PackageInstaller hasn't been able to read content://
URIs for a long time.

Bug: 14975160
Change-Id: I1c6fed1b55205c2474b09871161a98a26669d22e
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageKeySetData.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/PackageSettingBase.java
d5092bcb11c28f656eb470bd9b74585287fd75b4 03-Jul-2014 Christoph Studer <chstuder@google.com> NoMan: Allow notifications to transition !ZEN -> ZEN

Bug: 15979100
Change-Id: Ifd620caf2e00f8cd3d9f1458b93585a454af4b74
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/ZenModeHelper.java
1cd5add16c6e1904434f8120647da01df743790b 03-Jul-2014 Christoph Studer <chstuder@google.com> Fix 'stuck notification' bug

Apply implied flags before notifying listeners.

Bug: 15589158
Change-Id: Ie1c7374fa562ff62725361fb0dc8b0d1a6725618
ava/com/android/server/notification/NotificationManagerService.java
4aa03ef6211b1bec51f404f43c8bd20ea7b21321 03-Jul-2014 Narayan Kamath <narayan@google.com> Merge "Revert "Enforce USB and storage restrictions""
a35add68827c4d817066efa9e54657c830b52c98 03-Jul-2014 Narayan Kamath <narayan@google.com> Revert "Enforce USB and storage restrictions"

This reverts commit 39e53714ede48fcb464733834d7d9ccb868efe8a.

Change-Id: I81199fea8ca4b48516792bb02c1c3e90e5916c1f
ava/com/android/server/MountService.java
41497e68276e8eb365254cb12cfe40b2222cf354 03-Jul-2014 Emily Bernier <ember@google.com> Merge "Enforce USB and storage restrictions"
c0ffce5ddd6446f1d46a49cdfaeda4a2ce408e1d 01-Jul-2014 Craig Mautner <cmautner@google.com> Use cached thumbnails in Recent tasks.

The thumbnail returned from ActivityManager.getTaskThumbnail() now
contains either a Bitmap or a ParcelFileDescriptor that points to
a file containing a compressed Bitmap. The Recent tasks list is
now responsible for all thumbnail Bitmap caching as the activity
manager keeps only the most recent 5. This also permits low memory
devices to have many more tasks in the Recent tasks list.

As part of this CL the concept of subtasks is removed eliminating
code supporting the TaskAccessInfo and IThumbnailRetriever classes.

Fixes bug 15828934.

Change-Id: I0fd0320a1a04e3c78d79357899b83a2fff97abf2
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskAccessInfo.java
ava/com/android/server/am/TaskPersister.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/am/ThumbnailHolder.java
ca76cccb61d4d914abbb5079cb65455505494e2f 02-Jul-2014 dcashman <dcashman@google.com> Merge "Initial work for key rotation."
55b1078e2a1b56daa85edfd5000a5844d3c7914b 09-Apr-2014 dcashman <dcashman@google.com> Initial work for key rotation.

Introduces the upgrade-keyset tag to AndroidManifest.xml. This specifies a
KeySet by which an apk must be signed in order to update the app. Multiple
upgrade KeySets may be specified, in which case one of them must be used to
sign the updating apk. If no upgrade-keyset is specified, the current logic
involving signatures is used.

Current Key Rotation Design Decisions:
-Apps using a shared user id may not rotate keys.
-All acceptable upgrade keysets must be specified, including the key signing
the app. This enables key rotation in one update, but also 'locks' an app if
an incorrect upgrade keyset is specified.
-Minimal changes to existing KeySet code.

Bug: 6967056
Change-Id: Ib9bb693d4e9ea1aec375291ecdc182554890d29c
ava/com/android/server/pm/KeySetManager.java
ava/com/android/server/pm/KeySetManagerService.java
ava/com/android/server/pm/PackageKeySetData.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
dbbc070670c1160b15b92a5928e8b9b5bf008b3f 02-Jul-2014 Narayan Kamath <narayan@google.com> am e2840977: am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."

* commit 'e2840977d37e4d19425d448b54895536e43a2989':
Fix native crashes when APKs can't be opened.
db32fb646d90abb5e2281bd145d9d9615c65cbed 01-Jul-2014 Nick Kralevich <nnk@google.com> am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps."

* commit 'd172419e9a36f61af8c98d316ec2625e1f1304f6':
Allow different SELinux policies for third party apps.
3690ea1aa1fb4333a08f9cb9a8978b217b19ed3c 02-Jul-2014 Julia Reynolds <juliacr@google.com> Merge "Apply the tethering user restriction to connectivity service."
f5116d01b20f21ba32cd9eaa3412daf97f41c623 01-Jul-2014 Julia Reynolds <juliacr@google.com> Apply DISALLOW_CONFIG_VPN restriction to VPN.

Bug: 16008760
Change-Id: I299d5f32d9b09c3abcc32f3e889a0187880621df
ava/com/android/server/connectivity/Vpn.java
fc6b2a0be3524e09c6e12eeaf0222a2ecf2a3007 24-Jun-2014 Julia Reynolds <juliacr@google.com> Apply the tethering user restriction to connectivity service.

Bug: 15852213
Change-Id: Ib2df696189981ed1b31955257047fac3ee403965
ava/com/android/server/ConnectivityService.java
1e1f2e89267f17723a2afc90a7e894e01fc64701 02-Jul-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Adds per-user APIs required by the Settings app"
cb22807ffcf79db1b62162842d0a90251a463ea7 01-Jul-2014 Alexandra Gherghina <alexgherghina@google.com> Adds per-user APIs required by the Settings app

Bug: 15466880
Change-Id: Ic99fbf074564901b04d32b08f3a7a38555f330b3
ava/com/android/server/content/ContentService.java
f29131f7013dc0d6994556b95e74db608c89beb8 02-Jul-2014 Narayan Kamath <narayan@google.com> Merge "Fix native crashes when APKs can't be opened."
cef0b39b9211882f59b6bfe1148e2cd247056693 12-Jun-2014 Narayan Kamath <narayan@google.com> Fix native crashes when APKs can't be opened.

There was lax / incomplete error checking around the
construction of Apk handles. This change changes the ApkHandle
API and makes it throw IOException if the zipfile couldn't
be opened.

Additionally :
- Fix a resource leak in DefaultContainerService
- Report errors correctly during package moves.

bug: 15563874
(cherry picked from commit ec4516470d7ce6e47769591d678c838bd3f6f388)

Change-Id: Ia35b464355467d0d36faf34fae85acbbab3f2896
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
160a6e5b99de15ce755e2e5521dce32d81ab180a 01-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Add setOption for HdmiControlService

Bug: 15845304
Change-Id: I96b285ae3938aeecdd44b2c08a178def33bd2bf2
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ca5be9a8fbc91daece39c851ca3f09d60b24b870 01-Jul-2014 Jungshik Jang <jayjang@google.com> Remove SystemAudioAutoInitiationAction when SystemAudioActionFromAvr started.

Bug: 15845309
Change-Id: I1eefeca3aab117f2def08fe9fbbea81987ef11a8
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/SystemAudioActionFromAvr.java
497175beffe26336c092ee11a67b90f79dcdaca7 01-Jul-2014 Dianne Hackborn <hackbod@google.com> Rework network stats to use proc state for fg/bg.

Switch to using the process state to determine whether a
process should be foreground or background, instead of the
boolean foreground given by the activity manager.

This is for battery save mode, where we can now allow more apps
to havenetwork access: everything whose process state is at
least IMPORTANT_FOREGROUND, which allows music playback
and other use-visible things to continue to have network
access.

Note this also impact the traditional background data disabled
state, where now we allow anything top or better to have
network access. This automatically includes all persistent
processes, the current top activity, and any other processes
hosting the top activity or being used by the top activity.
So it broadens the set of apps that get network access, but I
think this increases it to a reasonable set of things that may
actually be needed for the foreground app to work correctly.

Change-Id: Icb609a2cea280dc3fa3e83417f478ed77f3685aa
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/net/NetworkPolicyManagerService.java
7f7b0c759e2970178ef68805b21f06a26e24eb76 23-Jun-2014 Nicolas Prevot <nprevot@google.com> Returning badged icons for components of corporate apps.

So, corporate apps in disambiguation dialogs are badged.
And updating the way we show the icon of the personal space to this new design.

BUG: 14377051

Change-Id: Idc707773a64a8feb2d9d4df88c425d5100542636
ava/com/android/server/pm/PackageManagerService.java
df0697e392c1789a49966d5091c2ee9e1003a02f 02-Jul-2014 Julia Reynolds <juliacr@google.com> Merge "Apply ENSURE_VERIFY_APPS restriction to PackageManagerService."
2771181c9b82b6b41da7ebd47fbe1baf8791c8ac 26-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Simplify the network transition wakelock.

Make it all internal to ConnectivityService - we know when a network
is lost, so grab a wakelock then.
Moves the call out of WifiStateMachine which was grabbing at bad times
like every dhcp renewal or corp-network roam. These would always
go the full 1 minute and chew up battery.

bug:15595155
Change-Id: I80157a818cc149072cc7706d78c1e79c6e679ab3
ava/com/android/server/ConnectivityService.java
6728239cfe8a71d3294b9368a4af73e427a2341c 30-Jun-2014 Julia Reynolds <juliacr@google.com> Apply ENSURE_VERIFY_APPS restriction to PackageManagerService.

Bug: 15986973
Change-Id: I9e8dae15cb866a3bb16e91fc49086fe1633f0bf8
ava/com/android/server/pm/PackageManagerService.java
fa10423fa00f3495e451016acba9b6848eb995c9 21-Jun-2014 Adrian Roos <roosa@google.com> Add stable insets for stable system windows

Adds a new kind of inset that only accounts for stable system
windows like the system or navigation bar.

Bug: 15457292
Change-Id: I681b711f6f40a94c25b7acd3a44eb3539486afab
ava/com/android/server/wm/Session.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
5654e2ba16d9c83ce70d24c827782d7f9ac2da98 02-Jul-2014 George Mount <mount@google.com> Merge "Stop temporary window from showing with activity transitions."
70778d7d53e1ade34f9ddcdf0860540bb18d7648 02-Jul-2014 George Mount <mount@google.com> Stop temporary window from showing with activity transitions.

Bug 15424905

When creating a new process, a temporary window would show,
even when within the same task. This CL prevents the temporary
window from showing when using
ActivityOptions.makeSceneTransitionAnimation(...)

Change-Id: I93c40ba0b41ed90ebe6e9802d1236f8c81d60abe
ava/com/android/server/am/ActivityStack.java
1c7c319bb89b9988bfd12afc3e8d89449fd163fc 26-Jun-2014 Jason Monk <jmonk@google.com> User restriction for disallowing window creation

Block any types of windows that could by used by apps to create
views on top of a locked app. This can be used by device admins
in conjunction with lock task mode.

Added a way for system (and priv apps) to bypass user restrictions
for specified op codes.

Bug: 15279535
Change-Id: I2381530ef6226a5bb32a99bb4030baafb39bf564
ava/com/android/server/AppOpsService.java
ava/com/android/server/pm/UserManagerService.java
103173e16da609bcf57a88961ca57a8de17e0ee7 28-Jun-2014 Nick Kralevich <nnk@google.com> ConfigUpdateInstallReceiver: pass content via content provider

When receiving a request to update ConfigUpdater content, don't
try to open by filename. Fetch the content via a file descriptor
delivered from a content provider. This avoids the files needing to
be marked world-readable, and resolves an SELinux violation.

Bug: 14989241
Change-Id: I10ad0d710c9a833a45995c545ba585a533c35b0d
ava/com/android/server/updates/ConfigUpdateInstallReceiver.java
c2a32dd7d3c981311e9308e8b3cb0e0d9e14f4ef 02-Jul-2014 Martijn Coenen <maco@google.com> Merge "Fix NPE in TaskRecord."
d4a69704befb830ae58d8d6884b5a472eb6a2076 30-Jun-2014 Martijn Coenen <maco@google.com> Fix NPE in TaskRecord.

setIntent() calls toString() when in verbose
mode, which NPEs on an uninitialized mActivities.

Change-Id: Idccfe857bedc6cac18c590b0f2858166c0a665df
ava/com/android/server/am/TaskRecord.java
133b9df951c633a1f72b7e12f8aa9ee9d7da9db6 01-Jul-2014 Dianne Hackborn <hackbod@google.com> Fix issue #16013164: Externally Reported Moderate:

AppOpsService.setMode() allows setting mode for own uid without permission

Change-Id: Ic60a10f0e95f19658c61567826dff28b657efe73
ava/com/android/server/AppOpsService.java
b096bdceaf2a4becffd2d930a870ccb57bfbe99c 01-Jul-2014 Jeff Davidson <jpd@google.com> Add a SCORER_CHANGED broadcast.

Sent whenever the active network scorer is changed.

Bug: 16007033
Change-Id: Ib71e89e2cc98fa424db7e489445ec03edefb6880
ava/com/android/server/NetworkScoreService.java
3edb62a5ade9de69f55df239a55dac990f4bf5c6 01-Jul-2014 Nick Kralevich <nnk@google.com> am db32fb64: am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps."

* commit 'db32fb646d90abb5e2281bd145d9d9615c65cbed':
Allow different SELinux policies for third party apps.
a165e14d2fafc6496c1d97e5b1b233dea211720f 01-Jul-2014 Dianne Hackborn <hackbod@google.com> Merge "Issue #15986092: Add power tracking of flashlight."
abc7c499133fe640d6ece2b28d43b52e66cdaa9a 01-Jul-2014 Dianne Hackborn <hackbod@google.com> Issue #15986092: Add power tracking of flashlight.

Not yet hooked up.

Change-Id: Id95e44ecc365e9f38169c0a629b0a48ddb29aa06
ava/com/android/server/am/BatteryStatsService.java
be7c50e0a14e91330ce13161bc14a33d34ff6aca 30-Jun-2014 Dianne Hackborn <hackbod@google.com> Add network access blocking when in battery save mode.

The network policy manager now monitors battery save mode and,
when in battery save, uses its facility to block access to metered
networks to block access to all networks. That is, it tells the
network management service that all networks have an (infinite)
quota, and puts various app uids to be restricted under quota
interfaces as appropriate.

This new network blocking needs a new facility to be able to white
list apps, such as GmsCore. To do this, I refactored the package
manager's permission configuration stuff into a separate SystemConfig
class that can be used by others, and it now has a new tag to
specify package names that should be white-listed for power save
mode. These are retrieved by the network policy manager and used
to build a whitelist of uids.

The new general config files can now go in system/etc/config,
though currently everything still remains in the permissions dir.

Still left to be done is changing the semantics of what uids are
allowed in this mode, to include all perceptable uids. (So that we
can still do things like background music playback.) This will be
done in a follow-on CL.

Change-Id: I9bb7029f61dae62e6236da5ca60765439f8d76d2
ava/com/android/server/SystemConfig.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/net/NetworkPolicyManagerService.java
ava/com/android/server/pm/PackageManagerService.java
59f77c32dc6e5378053d57a887d404831463d78c 02-May-2014 Emily Bernier <ember@google.com> Enforce USB and storage restrictions

When DISALLOW_MOUNT_PHYSICAL_MEDIA is true, prevent user from mounting any
external media. When DISALLOW_USB_FILE_TRANSFER is true, prevent user from
enabling USB mass storage.

Change-Id: Ia4accec4fb0b7aad6350cf0059244f6329204796
ava/com/android/server/MountService.java
a13da0d5913757e2456020c69481f98d0e44c090 30-Jun-2014 Jungshik Jang <jayjang@google.com> Add api, setArcMode, used to turn on/off ARC.

Usual TV can switch on and off of ARC feature in its settings page.
Along with it, removed locking block from the code,
because arc flags are accessed by actions and internal services.

Change-Id: I737ac0c2671b537551eaac202d2065cc99c6d0a0
ava/com/android/server/hdmi/HdmiAnnotations.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/NewDeviceAction.java
f2d4fa8c7851cac0be9e65cefc49834da15e9b69 01-Jul-2014 Amith Yamasani <yamasani@google.com> Merge "Store and retrieve default Guest settings"
e4afaa3a3d7c2885b82fe43f51bcf04e036f7462 30-Jun-2014 Amith Yamasani <yamasani@google.com> Store and retrieve default Guest settings

Save the default guest restrictions for use when a guest is created.

Bug: 15761405
Change-Id: I28db7d823944b0b47527a4909c10cc856c842a62
ava/com/android/server/pm/UserManagerService.java
8fef8773100e68350858f4c894ba7c02291f10b7 01-Jul-2014 Jeff Brown <jeffbrown@google.com> Merge "Make MediaSessionToken an inner class of MediaSession."
3e0e3bc617c4fd0e03b88ae04a618381b20a383c 26-Jun-2014 Ram <ram.pl@samsung.com> MS: Adding Support for Emergency APN in Telephony Framework
(base/telephony)

Replacement for https://partner-android-review.googlesource.com/#/c/171175/

Change-Id: I16fc37f5c00ed79f2370bc46554fc7a24c52c4cb
Conflicts:
core/java/android/net/ConnectivityManager.java
ava/com/android/server/ConnectivityService.java
dba34ba35cd2042d9a8fecfda56e2abe7a680bad 25-Jun-2014 Jeff Brown <jeffbrown@google.com> Make MediaSessionToken an inner class of MediaSession.

Also add some missing AIDLs to the framework makefile to ensure
they are included in the SDK.

Change-Id: If85a3091c7591e0b3bbe6cc4bb74aba2284b4f42
ava/com/android/server/media/MediaSessionService.java
92b77cf9cbf512e7141cad6fef5a38d0682dde43 27-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Refactor handling sequences in HdmiControlService

- Rewrote some methods to match more closely to the handling
sequences in guideline
- Added setControlEnabled() API in the aidl
- Handled <Routing Control> command
- Handled some scenarios invoking RoutingControlAction

Change-Id: I5db0c6fc775cef709c2e0f338b85937deebf2a54
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiUtils.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/RoutingControlAction.java
9ca56821ea6298782bd2a538bc3934f0cc06a07d 01-Jul-2014 Jaewan Kim <jaewan@google.com> Merge "Implement dump for TvInputManagerService"
e14c3f4fc42e2dc83cf4aba711c5ff52d8bbe3ea 27-Jun-2014 Jaewan Kim <jaewan@google.com> Implement dump for TvInputManagerService

Bug: 15483593
Change-Id: I821522513fb761418a372c1192f92ccf3acab486
ava/com/android/server/tv/TvInputManagerService.java
2f55f32f7bd0b520856105d9db8b6285b6996c99 01-Jul-2014 Winson Chung <winsonc@google.com> Merge "Using base intent to check the calling app instead of uid. (Bug 15940115)"
312bc5430ac7da898f4c8a10da34f8939fb317d3 30-Jun-2014 Winson Chung <winsonc@google.com> Using base intent to check the calling app instead of uid. (Bug 15940115)

Change-Id: I571f1d3f90707046cca0eaaae3e8e958444cc971
ava/com/android/server/am/ActivityManagerService.java
80f74b544975900fa69fa078d424fa5cde9ad5c7 20-Jun-2014 Nicolas Prevot <nprevot@google.com> Splitting the different authorities of a content provider

So that sharing from contacts works across user.
When getting a contentProvider, checking that read/write permissions are not null,

Change-Id: Ib4f0419aebd9ec4e742ef08c9ed9348fde62cc11
ava/com/android/server/am/ActivityManagerService.java
37271629b5bcf54858d6b4c4f5dbde6e85614d79 30-Jun-2014 Julia Reynolds <juliacr@google.com> Merge "If DISALLOW_REMOVE_USER is enabled, UserManager.removeUser should not remove users."
5e3916a6f14545e033ca1dc56d33ba2983c7ee03 30-Jun-2014 Jungshik Jang <jayjang@google.com> Start ARC initiation action when if avr is connected to ARC enabled port.

Change-Id: Ia9efbd1e86a1ed560500034925ccc31c61372fee
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
852ce1a7820af599ac24f710f3f78d962a29fa27 30-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Call wrapUpAndFinish even if no devices are detected."
ad2eefe97935db5282da18459b8da22b48207d83 30-Jun-2014 Jungshik Jang <jayjang@google.com> Call wrapUpAndFinish even if no devices are detected.

HotplugDetectionAction can be started only when wrapUpAndFinish
is called in DeviceDiscoveryAction. But current implementation
does nothing if no devices are detected.

Change-Id: I985382a9f9d668196a47dafe74743ffc6b1c95b3
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
8fa36b110be29d92a9aba070fa4666eefb14b584 25-Jun-2014 Jungshik Jang <jayjang@google.com> Implement volume control action in cec service.

Hdmi CEC's volume control is based on key event handling
but in android we can only get delta of volume change.
VolumeControlAction simulates key event action from
delta of volume change. However, it's highly dependent
on <Report Audio Status> message coming from AVR.
This implementation waits 900ms for <Report Audio Status>
message and if no message arrives it finishes action.
Instead, HdmiCecLocalDeviceTv consumes it after action
termination so that Tv can reflect system audio's
volume all the time.

Change-Id: I0442d31721365acdc009c8fa1c1e0a4361e4a1cc
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/SendKeyAction.java
ava/com/android/server/hdmi/SystemAudioStatusAction.java
ava/com/android/server/hdmi/VolumeControlAction.java
97f82fda0b615cfdb72f2779d86737f2874006fb 28-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Add logging to TaskPersister restore."
eb8d1be6acad180eabde84f19196b9ecaba81353 25-Jun-2014 John Spurlock <jspurlock@google.com> Add a BIND_DREAM_SERVICE signature-level permission.

Starting in api 21, will be required to bind to a
declared dream or doze service.

Also added to aapt dump badging output.

Bug:15862654
Change-Id: Ifa0a594eeecf21e6146176c7810a847e1d08fe3b
ava/com/android/server/dreams/DreamManagerService.java
77b04267c68b86c512937793f7ce563da55a99f3 28-Jun-2014 Craig Mautner <cmautner@google.com> Add logging to TaskPersister restore.

Solve tasks not being restored.

Fixes bug 15935752.

Change-Id: Ia3dd50072ac8255bcc37812a0639545b60f5d06f
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/TaskPersister.java
25e2d24f24040e58a61169db797f760b16c11f5d 27-Jun-2014 John Spurlock <jspurlock@google.com> Add optional package filtering to notification dumpsys.

$ adb shell dumpsys notification p <fragment>

Change-Id: Iddcc45066187e0e9d5812275de132dd6bba2a135
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/ManagedServices.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationUsageStats.java
bc5ddd69dd1a0771f02409e96476ea8ebe89debb 27-Jun-2014 Christopher Tate <ctate@google.com> Change permission guard on bindBackupAgent()

Bug 15829193

Change-Id: Ief86fdfb0ef73e2a5a5d34af950726c4d5c0a167
ava/com/android/server/am/ActivityManagerService.java
f77b99f08afed6f6b8d8f5bc72978f2ff7b8db55 27-Jun-2014 RoboErik <epastern@google.com> clear calling identity when changing volume

bug: 15925039

Change-Id: I8596266109fd65d7c2de5718ccdda937694befba
ava/com/android/server/media/MediaSessionRecord.java
3ada97b00261585dfbd377eb37c0f48c772e7617 27-Jun-2014 Jason Monk <jmonk@google.com> Merge "Fix crash in starting lock task"
a4e946bb6f4481d44463c620332d0666e3b8ad20 23-Jun-2014 Jason Monk <jmonk@google.com> Fix crash in starting lock task

Sometimes when coming from a dialog the current activity has changed,
which causes AM to crash and take down the framework. Instead don't
check the current activity as the user has confirmed the operation
so it is not coming from the background.

Change-Id: I0daeabcfcf814c52bcc7907a624fe6e9453c427f
ava/com/android/server/am/ActivityManagerService.java
75175025f8d727d9841308fa0afcb9a7a1a118cd 26-Jun-2014 Julia Reynolds <juliacr@google.com> If DISALLOW_ADD_USER is enabled, do not allow users to be created.

Bug: 15910634
Change-Id: I7e14bf7d71001f218402a5d90e2aadc54fcfd875
ava/com/android/server/pm/UserManagerService.java
152d5cd30bdfd88b0903b205d38c6966cbded5a8 24-Jun-2014 Narayan Kamath <narayan@google.com> am 22a32d88: am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune."

* commit '22a32d883794a7a96ff5ffb4830ea59065b3ebda':
Explicitly list out the list of cache subdirs to prune.
a09489c39e2e9d28b519ed850b4c0bf5ca4b2e63 27-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Handle incoming active source-related commands for HdmiControlService"
8333571bd5e0a08773a1679964f8d96227af3356 24-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Handle incoming active source-related commands for HdmiControlService

Handles incoming commands <Active Source>, <Inactive Source>, <Request
Active Source> that concern the active source update/report.

Defined mPrevPortId which is used to allow switching back to the input
set previously by <Active Source> or deviceSelect() when receiving
<Inactive Source>.

Also fixed a bug sending <Active Source> with wrong parameters.

Change-Id: I47fd804755c5c6beca38ddb21bb388a455d74f63
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
2cb86c723195e24278f983241cd6b1e307acf159 25-Jun-2014 Winson Chung <winsonc@google.com> Saving last TaskDescription for TaskRecord.

Change-Id: I531e0fc661fdedeb78bee7d5472668de8e9c2104
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/TaskPersister.java
ava/com/android/server/am/TaskRecord.java
e9466805e55595ce72c070c73e2fcae46e857850 26-Jun-2014 RoboErik <epastern@google.com> b/15892295 If playback is active don't play a beep

The old code removed the flag for playing a beep when changing volume
with active playback. This will do the same thing.

Change-Id: I708db66a1575d314b941166d4a6ca05d0a796dae
ava/com/android/server/media/MediaSessionRecord.java
7ecb42fb65ac46bf1f3c9348557fcdc54bfe9416 16-May-2014 Paul Jensen <pauljensen@google.com> Enforce ConnectivityManager.releaseNetworkRequest callers own the NetworkRequest

Enforce that callers of ConnectivityManager.releaseNetworkRequest() are the
creators of the NetworkRequest being released by matching UIDs.

Change-Id: I439468c054bacc035e2db2c4967b24d183e78e9c
ava/com/android/server/ConnectivityService.java
a3b9ca5adead683eb30492f038e4e72452b6fa5a 26-Jun-2014 Jeff Davidson <jpd@google.com> Merge "Use/expose the receiver's label as the scorer name."
c741553644f8b19c63938ab9e36af1721c2cfa34 24-Jun-2014 Jeff Davidson <jpd@google.com> Use/expose the receiver's label as the scorer name.

Allows scorer apps to set a custom name for the scoring functionality,
even if the app has other non-scoring responsibilities, in which case
the application's label would be too generic.

Bug: 15775300
Change-Id: I61a7d1966742d463508e6801b7845ced8392db84
ava/com/android/server/NetworkScoreService.java
c0b9efa49ef7fd4649c2e7bdbf9889d82a7327d2 26-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Teach LinkProperties whether it's provisioned or not."
226a51958d645a8e2be3e40a6b6daaca558b4913 24-Jun-2014 Jaewan Kim <jaewan@google.com> Update service connections when TV input list is updated

Bug: 15738607
Change-Id: Ie2d24d0c36308e6757b7d6939d79874c3bdd7211
ava/com/android/server/tv/TvInputManagerService.java
76ea6c68d3222441970ef98079ba30710ac8c595 23-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Teach LinkProperties whether it's provisioned or not.

In IPv4, a link is provisioned when DHCP succeeds. In IPv6, a
there is no such signal, because addresses and DNS servers can
be notified by the kernel at different times.

Add an isProvisioned method that returns true if we believe that
enough information has configured to use a network. For IPv6,
this requires an IP address, default route, and DNS server. For
IPv4, this requires only an IPv4 address, because we support
static configuration that doesn't have a default route or DNS
server.

To do this we use the existing hasIPv4Address method, rename the
all-but unused hasIPv6Address method to hasGlobalIPv6Address
(which is what we want anyway) and add new hasIPv[46]DefaultRoute
and hasIPv[46]DnsServer methods.

Bug: 9180552
Change-Id: Ib2f5ff8af920f7b6f1edf0e2afaaa0edce9bc72d
ava/com/android/server/ConnectivityService.java
828d11df52680ad75e045f5e4251311605d37af2 25-Jun-2014 Alexandra Gherghina <alexgherghina@google.com> Fix uninitialized variable warning

Change-Id: Ib1d4a4e1431388a839f9ef8027b439f57922b025
ava/com/android/server/pm/PackageManagerService.java
d4ee3952a3960ab5cafb078f17c7fc97e2aa14b0 25-Jun-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Skip forwarding launcher intents"
bf58d9b727f1007c7c620f622ac1d8003b1b211b 24-Jun-2014 Jeff Brown <jeffbrown@google.com> Minor cosmetic tweaks.

Change-Id: I626bad7177659b5670c2864d7bc78033a0ee16e7
ava/com/android/server/DisplayThread.java
fa4533f3a07ebed479d2a0e7af7d6e03d4417d41 24-Jun-2014 Alexandra Gherghina <alexgherghina@google.com> Skip forwarding launcher intents

If we forward intents when looking up launcher icons, we end up
having an icon for a disambig activity instead of the apps for that user.

Bug: 15769854
Change-Id: Ia57525466dba57b6669b2b5cedf98f202d08f586
ava/com/android/server/pm/LauncherAppsService.java
ava/com/android/server/pm/PackageManagerService.java
5ef8580b52f6f78796f8ea83cf162bb69c7290a0 26-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Notify ARC status update to AudioService."
a858d221ff86c497e745222ea15bab141e337636 23-Jun-2014 Jungshik Jang <jayjang@google.com> Notify ARC status update to AudioService.

Whenever ARC status is updated it should be notified to
AudioService so that it reroutes audio output to others.

Bug: 15841544, Bug: 15844022, Bug: 15844112

Change-Id: I06674ee4dd22c0f9be08e33fbacdd785578ba55f
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
e9cf1583c74fd03977c1ecb14520663710f14439 23-Jun-2014 Jungshik Jang <jayjang@google.com> Rename canChangeSystemAudioMode on HdmiCecLocalDeviceTv with hasSystemAudioDevice.

Change-Id: Id9ddcf377b30ef86ceb7c3933f2a89f1d95ab842
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
a5b7414970c85217e88015e78ecbc5ba093dead3 23-Jun-2014 Jungshik Jang <jayjang@google.com> Introduce @ServiceThreadOnly and @IothreadOnly to HdmiControlService

Many of hdmi service modules assumes that it runs on
service thread without any lock. But it's a bit
hard to distinguish whether a method runs on
service thread or not even though there is run-time
assertion (runOnServiceThread()) is top of method.
@ServiceThreadOnly interface documents that a method should
run on service thread while @IoThreadOnly documents
that a method should run on io thread.

Change-Id: Ia4a6a48675d2302fb2cb7a8a807fcf112da5d4e7
ava/com/android/server/hdmi/HdmiAnnotations.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
d4c115435395165b562f6ca2279d2418f9c0b26d 24-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Add thread safe cec device info list."
fa8e90db6a84ce1b19af86d46b547664d8a7ac37 23-Jun-2014 Jungshik Jang <jayjang@google.com> Add thread safe cec device info list.

This change keeps separate data container for thread safe access to
infos of all cec devices.

Change-Id: Ia1ad5deef2258e53ade73da784beb0372fd94282
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
dded065c8659f3622ec309359abee822ba919a77 26-Jun-2014 Adrian Roos <roosa@google.com> Merge "Trust Agents: Add facility to request credential entry"
2c12cfa1d53b586ae8a8d6aca64a4de771dc85b0 25-Jun-2014 Adrian Roos <roosa@google.com> Trust Agents: Add facility to request credential entry

Bug: 15871777
Change-Id: I43c80151f6403ff62961aeb3dc7aafe049e18a62
ava/com/android/server/trust/TrustManagerService.java
c286444f14798b783662f62c4ad3d7e8c71e9fda 26-Jun-2014 Winson Chung <winsonc@google.com> Merge "Use Task last active time to ensure we don't reload items for the cache."
d96e4948daf687f3f631ba8d93c89026fd3ce272 26-Jun-2014 Andres Morales <anmorales@google.com> Merge "interface for nfc handover supplicant commands"
d09bd0c6eb8318e0122b14d7eb5324e481706e41 25-Jun-2014 RoboErik <epastern@google.com> Move VolumeController into AudioService

VolumeController was a hidden class only used by AudioService and
MediaFocusControl. Since we added a public VolumeProvider class
moving VolumeController to avoid confusion.

Change-Id: I6838daf9b83846e1393b1a8502d3b10345a4799a
ava/com/android/server/media/MediaSessionService.java
19c9518f6a817d53d5234de0020313cab6950b2f 24-Jun-2014 RoboErik <epastern@google.com> b/15729204 Pipe sessions through to VolumePanel

When remote volume is changed via volume buttons we need to notify
the system UI so it can show the slider. This also passes it the
controller to use so adjustments to the slider are sent back to
the correct session.

Change-Id: If5847bcd5db16c56e0e9904b88c94e5b28954c41
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
f1fbd77cf057e43926f9a0347692611386d09f40 25-Jun-2014 Winson Chung <winsonc@google.com> Use Task last active time to ensure we don't reload items for the cache.

Change-Id: I29206de0453f5d7d1370b27a27ef6d3594eff8e7
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/TaskRecord.java
bf370992508c55d1f2493923bdc1834a0710e4ba 17-Jun-2014 John Spurlock <jspurlock@google.com> Create a basic doze dream in SystemUI.

The doze dream is not configured by default.

When configured, the doze dream does not show anything by default.
It teases a dark version of the keyguard (showing only the time
and notifications) when a notification arrives or significant motion
is detected.

Bug:15863249
Change-Id: Icfceb054d35d6fd4d9178eda7480e2464873ca4b
ava/com/android/server/dreams/DreamManagerService.java
81c884ee525408d07ddf737f0c303d3475a7c44f 20-May-2014 Paul Jensen <pauljensen@google.com> Convert BluetoothTetheringDataTracker into a NetworkFactory.

bug:15407087

Change-Id: I0437ca52dedf73e8ec69ac82e46353f6fafc4a42
ava/com/android/server/ConnectivityService.java
70882cd654c1eeb7c37dd77bd4567c4ad07e2ca6 26-Jun-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Expose per-user APIs for content services."
0363c3eb089afd4474bfd6ae6ee8a500d6e97614 23-Jun-2014 Alexandra Gherghina <alexgherghina@google.com> Expose per-user APIs for content services.

Bug: 15466880
Change-Id: Ib5a030e78559307627fe0d2e80ce6f1a7825109d
ava/com/android/server/content/ContentService.java
3b6e53fc00d47cfa2a49c91b4817f56a2f68cf09 24-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Don't set return to recents on every resume"
76e2a765b495f15a718dc4dfd9d81e9539a7074b 24-Jun-2014 Craig Mautner <cmautner@google.com> Don't set return to recents on every resume

Checking for previous task to be the Recents activity every time
through resumeTopActivityLocked() leads to missetting the
mTaskToReturnTo to Recents for Recents. Instead check for
Recents launching a task in moveTaskToFront and startActivity.

Fixes bug 15832448.

Change-Id: Ib64fe26f3fd3fdcd878edafb041928ec02757e63
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
04d480e1c338a921a8659e165d74f8437785acc1 25-Jun-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix some problems with proc stats collection."
306af678a5f1938629e1182b46cc43f2da6e7774 25-Jun-2014 Dianne Hackborn <hackbod@google.com> Fix some problems with proc stats collection.

Also start debugging why we aren't being able to open
/proc files.

Change-Id: I4655904691ac22108c29858cbd01153a251ccbf5
ava/com/android/server/am/ActivityManagerService.java
4ac5f85482de4f1845b21567ec510d79878552cd 23-Jun-2014 Julia Reynolds <juliacr@google.com> If DISALLOW_REMOVE_USER is enabled, UserManager.removeUser should not remove users.

Bug: 15834711
Change-Id: I8048c971401fe3216a6e92aae1c961a3aee02dde
ava/com/android/server/pm/UserManagerService.java
2c7bf2cb46024eb87aec4b5ac0fa15477cc14f7a 24-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Clean up and add some Network logging.

Dumps the netid for the Network and adds that to the NetworkAgentInfo.

Change-Id: Id9fbcc55ca55bf1a020f747f0c44902efb1b5f87
ava/com/android/server/connectivity/NetworkAgentInfo.java
51fa6bcb22a52b283f6d0756d286101f0d354f54 20-Jun-2014 RoboErik <epastern@google.com> b/15757378 Expose APIs for listening to active sessions

This allows apps that are registered notification listeners to
listen to the set of active sessions.

Change-Id: I1e108951a5049d138208e88b155c0ec9b95fbdb0
ava/com/android/server/media/MediaSessionService.java
67565a09f59db91ee0ebcdcf29b9bae0fb17ec32 24-Jun-2014 Narayan Kamath <narayan@google.com> am 152d5cd3: am 22a32d88: am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune."

* commit '152d5cd30bdfd88b0903b205d38c6966cbded5a8':
Explicitly list out the list of cache subdirs to prune.
3cd9b0d5ef0b171a79b49f76794e8325198876cf 24-Jun-2014 Nicolas Prevot <nprevot@google.com> Merge "Small fix related to cross-profile intents."
9e58b3c61c119c884b62c16b3e1a99b991a1d1bf 24-Jun-2014 Christoph Studer <chstuder@google.com> Merge "Remove notification APIs from StatusBar service"
e71fefcc8b382947f6f6a8bf816b3889fb368fed 24-Jun-2014 Christoph Studer <chstuder@google.com> Remove notification APIs from StatusBar service

Bug: 15324972
Bug: 15436573
Change-Id: I838370a23fb07cb876e08c41ef11653f2658719e
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerInternal.java
ava/com/android/server/statusbar/StatusBarManagerService.java
43015f241ebc6a03e36af4d300a3dbceeb078771 24-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Return to recents when coming from recents"
84984faf530e525b066e28710d0f9beb32142ec5 19-Jun-2014 Craig Mautner <cmautner@google.com> Return to recents when coming from recents

If a task is launched from recents then backing all the way
out of the task will return you to recents. Entering the task
in any other way (home, another activity, nav bar) will reset
this behavior.

Fixes bug 15703876.

Change-Id: I98dc36e4dbcb238d59e2175832076de7225bfdd9
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/wm/WindowManagerService.java
13f6ea78b0aa98ffea6ea644770e4320ec9a2242 23-Jun-2014 Craig Mautner <cmautner@google.com> Avoid unnecessary timeouts.

And fix a couple of other inefficiencies.

Fixes bug 15444410.

Change-Id: Idad95d4e4d70bc7d2965e1bd6ff3d3135b73dd9c
ava/com/android/server/wm/WindowManagerService.java
9e36a8cd3e106e5a2bb0d5cce805842b61e05426 23-Jun-2014 Brian Carlstrom <bdc@google.com> am 1b98ccf2: am 0924ef65: Merge "Treat missing package usage data as a separate case"

* commit '1b98ccf275d93197c1aa746d5c492a57cd62be7f':
Treat missing package usage data as a separate case
9587ee02038f20602d1ab79610e8c19b9633ab81 23-Jun-2014 Craig Mautner <cmautner@google.com> am a2121e49: am 5957d6a8: Merge "Fix frontOfTask assignment."

* commit 'a2121e497c2e82676b4bf5dc35b0015c38ddc5ab':
Fix frontOfTask assignment.
a29e43a364dc8dbe7e97184b535fe3f5d587d7ed 23-Jun-2014 Nicolas Prevot <nprevot@google.com> Small fix related to cross-profile intents.

Change-Id: Ie489d1f83fd23190ffdc1e1abb4f0cfffebeac8d
ava/com/android/server/pm/PackageManagerService.java
7f0a1c54a837da7ebbb6f7eb56f44894e0df22c2 23-Jun-2014 Jungshik Jang <jayjang@google.com> Fix missing param to system audio mode action.

Change-Id: I3a4aa3dcdcf8378b51e86367f9bca1fc87a28603
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
aaadf92210ee7481331e874ec3e188e8cf467b94 21-Jun-2014 Craig Mautner <cmautner@google.com> am 90c9fffc: Merge "Do not delete stack if empty task is being reused." into klp-modular-dev

* commit '90c9fffc956589f06d4a0c45a893c5db6a85fabc':
Do not delete stack if empty task is being reused.
aeb0ed74670e0502a04b689fe1b4fe0f537f4a91 23-Jun-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Adds cross-profile intent filters for the Settings app"
362449af58ff56dfc768605326730d1af661ac3a 20-Jun-2014 Craig Mautner <cmautner@google.com> Do not delete stack if empty task is being reused.

If a task is being cleared due to Intent flags and that clearing
was causing the last activity in the last task on a stack to be
deleted, then we were deleting the stack. Immediately after
this we were refilling the task with the same activity but the
stack had already been deleted.

This fix preserves the task and stack when it is only being
cleared for the new activity.

Fixes bug 15611901.

Change-Id: I7bcfa826d0852d9c640daa73fe1324b89471fecd
ava/com/android/server/am/TaskRecord.java
23a0bf3c7fd72e6893239170732569b9befce246 23-Jun-2014 Jay Civelli <jcivelli@google.com> Merge "Reenabling permission check for TrustAgent."
78e51f360d9d89f1fe8acf4baa76ef7854d88130 23-Jun-2014 Brian Carlstrom <bdc@google.com> am 9e36a8cd: am 1b98ccf2: am 0924ef65: Merge "Treat missing package usage data as a separate case"

* commit '9e36a8cd3e106e5a2bb0d5cce805842b61e05426':
Treat missing package usage data as a separate case
75dc9900c6441bb5e1b31281de067d1f4fe2e28a 23-Jun-2014 Craig Mautner <cmautner@google.com> am 9587ee02: am a2121e49: am 5957d6a8: Merge "Fix frontOfTask assignment."

* commit '9587ee02038f20602d1ab79610e8c19b9633ab81':
Fix frontOfTask assignment.
88cc346d0602e0b173b5076cd0051120682da601 14-May-2014 Nicolas Prevot <nprevot@google.com> Show the icon of the personal space.

In an intent disambiguation dialog from a managed profile,
when the intent can be forwarded to the personal space:
show the icon of the parent next to "Personal apps".
And put it at the bottom of the dialog.

Change-Id: I523222aac5dde9653e784eb26cf23cdaf018b86c
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/UserManagerService.java
b41f9df104efea74142fa688a056a3489041dd48 23-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Add for System Audio Mode"
9e922ca97097cb1aa67ff53219d874ea2503a80d 20-Jun-2014 Wonsik Kim <wonsik@google.com> Fix native calls to null pointer

Since DEVICE_AVAILABLE event fires right after initialization, it
could happen before TvInputHal.mPtr is set, which causes calls to
null pointer. Fix the bug by allowing TvInputHal to wait for mPtr to
be set before calling native methods.

Change-Id: Id07f15130beb69f77c16bf3c735285c31ae4a3a4
ava/com/android/server/tv/TvInputHal.java
ni/com_android_server_tv_TvInputHal.cpp
ea67c183fe5511ad99aeaae1a32b5245bd020e36 19-Jun-2014 Jungshik Jang <jayjang@google.com> Add for System Audio Mode

Note that this is skeleton change and do not merge
till get full review from outside of CEC team.

This change introduce four apis for System Audio Mode

1. boolean canChangeSystemAudioMode()
- Whether to change system audio mode or not.

2. setSystemAudioMode(boolean enabled, IHdmiControlCallback callback);
- Change system audio mode.

3. add/removeSystemAudioModeChangeLister.
- Register/deregister listner for AudioModeChange.

4. getSystemAudioMode()
- Whether to system audio is enabled or not.

Change-Id: I1e82365155a9f7f6c3ac5d9db4871cf6bad46865
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/SystemAudioActionFromAvr.java
ava/com/android/server/hdmi/SystemAudioActionFromTv.java
ava/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
ava/com/android/server/hdmi/SystemAudioStatusAction.java
67e0789cd3870af2fbbdefbff28f6fde9095a015 19-Jun-2014 Wink Saville <wink@google.com> Mobile_radio in battery history is not accurate

Invoke TelephonyManager#listen to connect mPhoneStateListener to receive
the notifications.

Bug: 15568103
Change-Id: I5a3fa6347704e96ceb34289f74ba6e3157bbb333
ava/com/android/server/NetworkManagementService.java
5afcd4df22675295013c757177d6bcfbb34a014d 22-Jun-2014 Craig Mautner <cmautner@google.com> resolved conflicts for merge of aaadf922 to master

Change-Id: I8b89a326453fc8827a84eb9516271d2bf3b71e2c
3251b9075246841a7b1ddecf10859b1abd858f33 20-Jun-2014 Dianne Hackborn <hackbod@google.com> Add some wifi tracking to battery stats.

Now track supplicant state and wifi signal strength.
Output looks like this:

+12m45s235ms (1) 095 +wifi_full_lock +wifi_running wifi_signal_strength=3 wifi_suppl=scanning
+12m46s095ms (1) 095 -wifi_full_lock wifi_suppl=associated
+12m46s469ms (2) 095 wifi_suppl=completed +proc=u0a74:"com.google.android.videos"
+12m52s103ms (1) 095 +wifi_full_lock wifi_suppl=disconn

Also modify history dump so that when we hit a RESET or START
command, we clear our previous history data, so the next event
will include new data. This means if you are scanning through
the output, you must at this point clear any binary stats you
have like "running" or "wake_lock" or else you will continue to
think they are on until whatever point later they get turned on
and then back off.

And a small bug fix in proc stats that would cause the system
process to crash.

Change-Id: Ibec416a1ef786d428bd0d1d86e6e3296c41f7648
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/am/ProcessRecord.java
858aef2942e3e2b5759a8bc27fc4f1954573da7b 21-Jun-2014 Jason Monk <jmonk@google.com> Merge "Add lock-to-app mode"
62515beee67307d8859beec521b7baedfa54b2b5 21-May-2014 Jason Monk <jmonk@google.com> Add lock-to-app mode

Added a dialog that shows when app has not been authorized by
DevicePolicyManager.isLockTaskAuthorized. This allows any app
to trigger lock-to-app mode. This same dialog is used when
startLockTaskOnCurrent is triggered by the recents long-press.

Can exit the mode by long-pressing recents again.

Keyguard is disabled when lock-to-app is active.

This CL also prevents apps from finishing when they are the root
task in a lock task TaskRecord.

Change-Id: Ib54d858e570cccf6bfd986958868e15f49bcef75
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/LockTaskNotify.java
ava/com/android/server/am/LockToAppRequestDialog.java
80bec97846d56719327e9760a0224fb6f958834f 20-Jun-2014 Ji-Hwan Lee <jihwan@google.com> am 8931c9c9: Register PackageMonitor when system services are ready

* commit '8931c9c9ec392a1f2a7e59a516714f86cf9569aa':
Register PackageMonitor when system services are ready
0ceb7e4755015eafda29c251eac285620788a51b 20-Jun-2014 Ji-Hwan Lee <jihwan@google.com> Register PackageMonitor when system services are ready

Bug: 15767453
Change-Id: I191b20dfa31eee0e37ba7df67cbf906ccbfc0f4e
ava/com/android/server/tv/TvInputManagerService.java
ee4bd76a335d825e1a0532cc8db52f00fa68f346 20-Jun-2014 Christopher Tate <ctate@google.com> Merge "Fix BackgroundDexOptService scheduled job"
1b8b3aa265190e84467f740e99a0ade3a0e3cd67 20-Jun-2014 Christopher Tate <ctate@google.com> Fix BackgroundDexOptService scheduled job

1) use the right package name in the ComponentName
2) use a unique-within-package job ID

Also put the full component name in dumpsys, not just the package name

Change-Id: Icf6edabf45573ba72a1adf86b6f83baba57fc593
ava/com/android/server/job/controllers/JobStatus.java
ava/com/android/server/pm/BackgroundDexOptService.java
5c9916763451c3ab6b7cc4a14d7e6bde08f35bd6 20-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Fix index out of bounds exception"
4132620f92b4ffd412d0cbac6ee32948a2e22649 20-Jun-2014 Craig Mautner <cmautner@google.com> Fix index out of bounds exception

When removing the last activity in a stack.

Fixes bug 15776859.

Change-Id: Id507aa7864482ff1ff769833445d937b19de2bcd
ava/com/android/server/am/TaskRecord.java
ef3c9e9b057a5aac2d0d012e8e6385660478e203 20-Jun-2014 RoboErik <epastern@google.com> Add volume handling APIs to sessions

This renames and moves the VolumeProvider and adds apis to
MediaController to get the current state of volume on a session and
to request changes to the volume.

Change-Id: I290e9efefb6676c805819a29e1d054c3192c6773
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
402c8f5a07470bd582a5e7d5c5ff581c5e03a545 20-Jun-2014 Mike Reed <reed@google.com> Merge "stop using (deprecated) SkBitmap::Config"
b933055cf3f7f8ea89bfd3bc9c37a3891ff7310a 16-Jun-2014 Mike Reed <reed@google.com> stop using (deprecated) SkBitmap::Config

Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
ni/com_android_server_AssetAtlasService.cpp
1e2f374e712ef23d696616f70b284557c8bcbdcf 20-Jun-2014 Nicolas Prevot <nprevot@google.com> Merge "Making more ContentProviders work across users."
6f0e4ddd66fcdcc13944d8970d0b560e2626508b 18-Jun-2014 RoboErik <epastern@google.com> Remove more dead audio service code

Hit a snag in remote volume changes. Trying off this round of
removal so I can work on fixing remote volume handling in a
separate CL.

Change-Id: I49b1ba4b75d770ba7c77da081755f3210a9e9483
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
2a070546327da52d473fd30e71d14404d0c649d1 20-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Do not have HdmiControlService report deviceEvent for TV itself"
13c030e828a90fcfc57b52024b72326757cec583 20-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Do not have HdmiControlService report deviceEvent for TV itself

DeviceEvent should be used only for the other logical device,
not the TV device itself.

Also fixed a but not updating the logical address after the allocation.

Change-Id: I80cec9d5bb4b95d003c9d1c7ea13f02d7e76b322
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
7eca94c145ca62138f0a45666be3c540445975c3 20-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Use SystemAudioStatusAction in SystemAudioAction."
bb27b1c3a64cc6bd68cd97b8a6d710193d490fc3 20-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Allow a root activity to relinquish task identity"
9d4e9bcebbd97ad51daa0ef15cfba5aabb399bbb 19-Jun-2014 Craig Mautner <cmautner@google.com> Allow a root activity to relinquish task identity

If a an acitivty with attribute android:relinquishTaskIdentity true
is the root activity of a task then the intent of that task will
be that of the first activity in the stack with
android:relinquishTaskIdentity set false.

The ability to set intent also includes the ability to set the
TaskDescription of the task.

Fixes bug 15675610.
Fixes bug 10428661.

Change-Id: Ib28a9eae3b9832eeeef9106adbebe344184ee5ae
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/TaskRecord.java
b0586c92281b6f1419a7df09fa13b9436352e4e1 20-Jun-2014 Sungsoo Lim <sungsoo@google.com> Merge "Make getAvailability() always return true"
d1fdf0238a0008d2e4592667057e40721c41399a 20-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Report device status event in HdmiControlService"
4893c7efde52411ad051ef5c20251439f4098eac 19-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Report device status event in HdmiControlService

This change allows the event listener (TIF) to get notified
of the CEC logical device status change (addition/removal),
and update the available tv inputs accordingly.

Change-Id: I7f2798ad47212120ecac8093ad281f683a3d125e
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
0270cfb71df55c1d213340bf9b678a48cc7b8e6e 20-Jun-2014 Jeff Sharkey <jsharkey@android.com> Merge "Explicitly collect manifest digests."
032f2b246bd01653c592f2b148d6a0debfe164b2 20-Jun-2014 Jeff Sharkey <jsharkey@android.com> Explicitly collect manifest digests.

Previously it was a side effect of collectCertificates().

Bug: 15740334
Change-Id: I2e044fdcc1c86ce730b9570bfbecf873366325e1
ava/com/android/server/pm/PackageManagerService.java
6e2ae2590ded39f04f76d5ddca0f06fe01586e26 12-Jun-2014 Alexandra Gherghina <alexgherghina@google.com> Adds cross-profile intent filters for the Settings app

Bug: 15466742
Change-Id: Id9af588f2f3d51a562ef2a06fe7404c96123cc2e
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
800631affd5eaae69855f2a0c1ba24d1e4f3acbc 19-Jun-2014 Jay Civelli <jcivelli@google.com> Reenabling permission check for TrustAgent.

Now that master is using Manchego, the permission check for TrustAgent can
be reenabled.

Change-Id: I3c05a97de965684bef460ab3e3289657f9542af3
ava/com/android/server/trust/TrustManagerService.java
ab981c5653ed7f54247e589437a96b3190b48eb7 19-Jun-2014 Sungsoo Lim <sungsoo@google.com> Make getAvailability() always return true

Bug: 15745402
Change-Id: If40ecef74e5bd7124e0020fcdbcd4637b2d82d97
ava/com/android/server/tv/TvInputManagerService.java
16321b80077815eebeceee249ff7a29e336e04a4 19-Jun-2014 Jungshik Jang <jayjang@google.com> Use SystemAudioStatusAction in SystemAudioAction.

SystemAudioAction includes SystemAudioStatusAction which
is required for SystemAudioAutoInitiationAction.

Change-Id: I9f2ae1ddea305e1c1e18410060842288c271cd4b
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/SystemAudioActionFromAvr.java
ava/com/android/server/hdmi/SystemAudioStatusAction.java
275e085d5a42ced54bb79e40ff76c77539e7d82d 18-Jun-2014 Jeff Sharkey <jsharkey@android.com> Stronger PackageParser contract, more split work.

Require that method callers always provide relevant paths, instead of
relying on constructor. Move DisplayMetrics to be an overall parser
parameter, and move PARSE_TRUSTED_OVERLAY to flags.

Parse split APKs and apply deterministic ordering based on split
names. Assert consistent package name and version code across all
split APKs in a package, and enforce unique split names and required
base APK.

Collect certificates for split APKs, enforcing they're all signed
consistently. Better flow control and resource cleanup when
collecting certs. Refactor validation code so it's easier to reason
about. Cleaner maintenance of read buffer when draining stream
contents.

Change-Id: I8bc8c62095fbb933227b9e76ad8771f4b1246fe8
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
5b21454e6f81724ea48c2f85265ff107a8174005 17-Jun-2014 Nicolas Prevot <nprevot@google.com> Making more ContentProviders work across users.

If a ContentProvider makes a uri available to every app:
For an app on a different user, we grant a uri permission,
even if the ContentProvider would not normally allow granting uri permissions.

BUG:15721503
Change-Id: I0b865ae80f588137256387eba14a2e29b1129b00
ava/com/android/server/am/ActivityManagerService.java
a062a9339add79a84862a34e363e3e454a6ec435 18-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Implement portSelect/sendKeyEvent for HdmiControlService

TIF (TV Input Framework) uses these API to switch inputs, send
keys for selected device on CEC bus. Also renamed getActiveInput
to getActivePortId to use a unified term for port/input.

Change-Id: I8196825c0d960988cc1c0bb58a628ccd8ab1957e
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/RoutingControlAction.java
a2d30107c401f66dacec3853bc9efdbaca7558e8 18-Jun-2014 Griff Hazen <griff@google.com> am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev

* commit 'f546eeb1ede3c33ca3ec7fff6b8deb9d4e5cbc3e':
DO NOT MERGE Reduce chance of notification listener dropped messages.
a358b53e1d0bb7a7fc08b0a4d2a2e256f3045859 12-Jun-2014 Wonsik Kim <wonsik@google.com> TvInputHardware: Add HDMI port ID

Bug: 15570939
Change-Id: I957804124fa5e417de8c98c6d41332609097d995
ni/com_android_server_tv_TvInputHal.cpp
d7c29189aa639bfac1e6efcd222e65c2c8ecf3f1 27-May-2014 Wonsik Kim <wonsik@google.com> TvInputHardware: Integration with audio framework changes

TvInputHardwareManager detects AudioPort specified by tv_input and
connect source to sink via AudioManager.createAudioPatch().

Bug: 15177175
Change-Id: I2252eb0df2d8287889ed28cc7d76dc1a659fd08b
ava/com/android/server/tv/TvInputHal.java
ava/com/android/server/tv/TvInputHardwareManager.java
ni/com_android_server_tv_TvInputHal.cpp
bce527139a9fe80a8195a4fc787759ff27da8d27 18-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Add SystemAudioAutoInitiationAction and SystemAudioStatusAction"
187d01765b935d07936f74343b4f4af590c239a1 17-Jun-2014 Jungshik Jang <jayjang@google.com> Add SystemAudioAutoInitiationAction and SystemAudioStatusAction

Once all device discovery action is done if there is audio amplifier
on device list, it should trigger system audio initiation action.
On or off of system audio is decided by Tv's last audio setting
(speaker). If system audio was the last audio setting, it will
try to turn on system audio; otherwise will turn it off.

In other hands, SystemAudioStatusAction is added to update
system audio status (mute or volume) after
SystemAudioAutoInitiationAction. In fact, RequestArcAction has
almost same code as it has and will refactore RequesArcAction
in the following changes.

Change-Id: I3d591242e79549cb73e14546f0d057ba08f878ef
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
ava/com/android/server/hdmi/SystemAudioStatusAction.java
e7cd37e6138c5e769cc6cb398e632bca24d2d1ab 19-Jun-2014 Nicolas Prevot <nprevot@google.com> Merge "Introducing crossProfileIntentFilters that skip the current profile."
63798c596dc757135950313eb4bb44ca58696c68 27-May-2014 Nicolas Prevot <nprevot@google.com> Introducing crossProfileIntentFilters that skip the current profile.

For these crossProfileIntentFilters, the activities in the current profile cannot
respond to the intent.
Only activities in the target profile can respond to the intent.

BUG: 14936725

Change-Id: I5e2704c2b56ff50a8339dd49284956391d7fad7e
ava/com/android/server/pm/CrossProfileIntentFilter.java
ava/com/android/server/pm/PackageManagerService.java
d3c8642dae9a1f6db60e2f8e5c7b32cd1b3169df 16-Jun-2014 RoboErik <epastern@google.com> Remove some more old code and fix Media command

Removes some more hidden apis from AudioService/Manager. This also
fixes up Media.java to support commands for the new service to help
with debugging. Also fixes a couple bugs that were found while fixing
up Media.

Change-Id: I68e4aa80a4de430b98236aafc883664b9432c62b
ava/com/android/server/media/MediaSessionRecord.java
80888cb20657d841de6e66601e9bd74a942734ef 19-Jun-2014 Christopher Tate <ctate@google.com> Merge "Fix job service validation in secondary users"
5568f54e14e213ac100cacbbf57689faa6dd3d59 18-Jun-2014 Christopher Tate <ctate@google.com> Fix job service validation in secondary users

Bug 15714663

Change-Id: I101bcc979f30062bec36f462522227b857b58054
ava/com/android/server/job/JobSchedulerService.java
42892f8aa57cb5f577c67f17431e162c1ac505de 19-Jun-2014 Christopher Tate <ctate@google.com> Merge "Don't end lock task mode when not in lock task mode"
3bd90617ec07a1093139de39591a624b21468e46 19-Jun-2014 Christopher Tate <ctate@google.com> Don't end lock task mode when not in lock task mode

Change-Id: I3724d68ed7116d47024638d56c5bf43c4866f82e
ava/com/android/server/am/ActivityStackSupervisor.java
f329d050b8e72ba6daf67edc1b1b64b0035a6050 20-Jun-2014 Dianne Hackborn <hackbod@google.com> Merge "Add kernel and native memory data to procstats."
f7097a5b697fedb6976774e55a51471405a23c0e 13-May-2014 Dianne Hackborn <hackbod@google.com> Add kernel and native memory data to procstats.

We now collect memory use data in the kernel and native
application for aggregation in procstats. This should
allows us to do aggregated summaries of how memory use
is distributed across the system -- how much is free vs.
how much is in use.

Fix a bug in how we were tracking per-app version codes:
apps that used a shared user id to have multiple packages
run in the same process could get their version codes
cross-wired. Now we keep track of version codes in the
list of packages associated with a process.

Bumped the checkin version code to 5, so that we can
distinguish checkins that have this corrected data.

Also fix a bug in battery stats monitoring radio state.

Change-Id: I1c849f2df442df679a34ad7b0ca0c5870bfac8df
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/BroadcastQueue.java
ava/com/android/server/am/ProcessRecord.java
ava/com/android/server/am/ProcessStatsService.java
fbe6be4f653d73d5c51ee0a2fb40d2a34c2366fd 18-Jun-2014 Jason Monk <jmonk@google.com> Merge "Notify any profile/device owners of lock task"
35c62a4668a85aa4318c9ec564f2e06e8a2d2a30 17-Jun-2014 Jason Monk <jmonk@google.com> Notify any profile/device owners of lock task

Add a method for DeviceAdminReceivers of profile/device owners to
be notified that lock task mode has entered or exited for an app
they have whitelisted.

Change-Id: Id124287d41564bbfccdacccf1977b7acb3ddec3f
ava/com/android/server/am/ActivityStackSupervisor.java
779d2cffbce3946f6397f2b44a060c9775a2991b 18-Jun-2014 Julia Reynolds <juliacr@google.com> Merge "Rename apps User Restriction."
36fbc8d6453da438a8ab83352ff1bcfcba5f25b5 18-Jun-2014 Julia Reynolds <juliacr@google.com> Rename apps User Restriction.

Change-Id: I9f81a6b94ba06b593e7213967df51c7cb30a7b31
ava/com/android/server/pm/UserManagerService.java
b576cec2626d469868f0908b7926790ea5b91493 18-Jun-2014 Wink Saville <wink@google.com> Merge "Empty triangle displayed for radio signal but calls & data work"
eeacf9374748a5f7fc96a1beaf18c353d473d752 18-Jun-2014 Wink Saville <wink@google.com> Empty triangle displayed for radio signal but calls & data work

TelephonyRegistry: when default sub id is requested set isLegacyApp to
true so when ACTION_DEFAULT_SUBSCRIPTION_CHANGED is received the
TelephonyRegistry.Record.subId will be updated.

SubInfoRecord: Add SubInfoRecord toString for easier debugging

SubscriptionManager: Add putPHoneIdAndSubIdExtra(intent, phoneId, subId)
as this allows explicit setup of phoneId and subId and does not rely on
a phone's subId being set.

Bug: 15669560
Change-Id: I645ddb35b964b08dcb46f881c9d02b932d128950
ava/com/android/server/TelephonyRegistry.java
5c80ad2077f3e755413ea47a35f51e9d25dbb083 13-Jun-2014 Jae Seo <jaeseo@google.com> Clean up the EPG data when a TV input package is removed

Also removed an unused parameter from sendSessionTokenToClientLocked().

Bug: 14981342
Change-Id: I5bcf6050386a2bc3e216f44420390c4b78282af4
ava/com/android/server/tv/TvInputManagerService.java
2139276ce8b54aba5faa858ca69ed5f01445c269 14-Jun-2014 Jeff Brown <jeffbrown@google.com> Refactor BatteryService to new pattern.

Apply SystemService pattern to BatteryService.

Change-Id: I4971b2da8d2aed4d14440fb65863a8b916bab03c
ava/com/android/server/BatteryService.java
ava/com/android/server/job/controllers/BatteryController.java
ava/com/android/server/power/PowerManagerService.java
2c43c339de5aaf4fef58aa9b5ac3af48609263a8 13-Jun-2014 Jeff Brown <jeffbrown@google.com> Resolve boot time dependencies related to the power manager.

This change fixes a bug where native daemons may try to communicate
with the power manager before it was fully initialized due to a race
between publishing the binder service and completing init().

The solution was to simplify the dependencies related to the power
manager. It turns out that most services that were passed in
init are not actually needed until systemReady. What remained
was a dependency on the activity manager to check permissions for
incoming calls. So now we start activity manager first.
However, the activity manager also depends on power manager for
wakelocks. To break the cycle, we now defer initializing the activity
manager's wakelocks until after the power manager has been started.

Cleaned up a bunch of boot-time service dependencies so that we
can have better confidence that they are correctly maintained.

Bug: 13884219
Change-Id: If08e2d7ccd44e7026a72441bb6bd5afd7bb9fffe
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/wm/WindowManagerService.java
2ea0d3979e66da459a1ac51f385628716de63af2 18-Jun-2014 Griff Hazen <griff@google.com> DO NOT MERGE Reduce chance of notification listener dropped messages.

The existing code for notification manager/listeners uses a oneway
binder api to deliver messages. One problem with this is that
notification objects can sometimes get fairly large, and can bump
into the oneway binder transaction buffer if many happen at once.

To reduce this issue, flip the service into a oneway delivery of
a status bar notification holder, whose wrapped content is then
immediately fetched upon receipt of the one-way message. This moves
the meat of the fetch to be over a two-way interface without changing
the properties of which object is actually sent (a tickle solution
with lookup key would have changed this)

Further research: attempt to chunk notification objects themselves.
They can sometimes transfer hundreds of KB over a binder transaction.

Bug: 15426276
Change-Id: Ib1a1f4ff848c16f80bcf2ae4dfd2b87a9091f0b2
ava/com/android/server/notification/NotificationManagerService.java
f62d690b00c3808496e6a5c35f3942c78fbb15d5 18-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Fix persistent tasks and expand scope"
43e52ed32e2d55ef4aee18c4b4bc13b7fdef9cc4 17-Jun-2014 Craig Mautner <cmautner@google.com> Fix persistent tasks and expand scope

- Fixed missing tag closure on the xml for storing Intent categories.
- Shortened timeout for flushing tasks to persistent storage from
one minute to ten seconds.
- Made persistency the default except for those tasks on the home
stack and those tasks that exclude themselves from the recent task
list.
- Fixed deletion of tasks after restoring. Tasks now survive a second
reboot, not just the first reboot.
- Fixed sort order so most recent tasks will be restored at front.

Fixes bug 15672002.

Change-Id: I16d87d58c6fd2e879cfd0c0b18b2694432a79b71
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/TaskPersister.java
ava/com/android/server/am/TaskRecord.java
16b414f46f04ba868856f7b8e65b3bdf084218f6 18-Jun-2014 Jorim Jaggi <jjaggi@google.com> Merge "Fix bug when Keyguard gets hidden."
53c68a44acbd9343dda648c17652e921c28fda1d 18-Jun-2014 Jorim Jaggi <jjaggi@google.com> Fix bug when Keyguard gets hidden.

We make sure in Keyguard that we only hide ourselves in
startKeyguardExitAnimation ourselves when we requested a hide.

In addition, this change also fixes a bug in WindowAnimator that
it should only call startKeyguardExitAnimation when Keyguard actually
requested a hide.

Bug: 15676717
Change-Id: I2279cccb9916985b7e9a2f41137878be5782cb9c
ava/com/android/server/wm/WindowAnimator.java
8fb63d5a5a61ff6974f792a3ea815af193d1a7a0 18-Jun-2014 Jeff Sharkey <jsharkey@android.com> Merge "Plumb split APKs into public API."
8a4c9721a9e09d20c63381c13fa29bd9f7cbc3e3 16-Jun-2014 Jeff Sharkey <jsharkey@android.com> Plumb split APKs into public API.

Introduces new ApplicationInfo fields to surface zero or more split
APKs for an application. Splice these APKs into both the class
loader and resource system. Cleaner building of these paths.

Run dexopt() on all split APKs found after a parse, and populate
into ApplicationInfo.

Change-Id: I4a376bf4492d84ea95aafa866e106ea43a43e492
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ServiceRecord.java
ava/com/android/server/pm/PackageManagerService.java
94cdec6e982dd75f9197602102d6d182daf5e893 18-Jun-2014 Wonsik Kim <wonsik@google.com> Merge "TvInputHardwareManager: Fix Integer conversion error"
e7ae0ce53b6e1ddee3e456d2a69eebcd5a196b1f 18-Jun-2014 Wonsik Kim <wonsik@google.com> TvInputHardwareManager: Fix Integer conversion error

Change-Id: Ice85ef840dd7fa40faaf2fdfa359ee419d3a36e8
ava/com/android/server/tv/TvInputHardwareManager.java
f8ad7a909436250fed920a8c4c56f69cd97b1b60 18-Jun-2014 Christopher Tate <ctate@google.com> Use the right package name for MountServiceIdler

Manifest package != .java "package" decl for system process entities.

Change-Id: I162f8fed6b62b27d056049b55f77e776090a4c80
ava/com/android/server/MountServiceIdler.java
6170cca05eb13cfb44c8d13e7a447cd24f27a62c 17-Jun-2014 Svetoslav <svetoslavganov@google.com> Not touchable windows should not hide windows behind

When computing which windows to report for accessibility we were not
reporting windows behind non touchable ones. However, if a window is
not-touchable the touch events go to the window behind it. Hence, a
not-touchable window should not affect the reproted windows for
accessibility.

Change-Id: I213a32b33b0986a73d8bbdf0a3e40e6ca6e4261b
ava/com/android/server/wm/AccessibilityController.java
a7596147b43940cad3f76c53ed154ef088b9269b 07-Jun-2014 Jim Miller <jaggies@google.com> First pass at FingerprintService integration with HAL.
Move FingerprintService to framework services directory
Fix merge conflicts.

Tested: scanning, enrolling, removing.

Change-Id: I58b2b902cb671dc82cdaa54a195ba5f1a154622c
ava/com/android/server/fingerprint/FingerprintService.java
50b9fcfae1ec7e3388ec8a31611cb7bc2c3221e6 18-Jun-2014 Andy McFadden <fadden@android.com> Merge "Add two new display info fields"
ebf55ad6dec7e59dca668cf97ac81619793defe0 18-Jun-2014 Jason Monk <jmonk@google.com> Merge "Change lock-task DPM authorization to packages"
5b2034e2cc1cd8cb934160465364cb1eda99c208 17-Jun-2014 Christopher Tate <ctate@google.com> Merge "Switch everything to scheduled jobs"
cf1a2f73fc102be2ac7060ac97d4682bb2565ca5 17-Jun-2014 Christopher Tate <ctate@google.com> Switch everything to scheduled jobs

Everything that used the IdleMaintenance APIs/broadcasts gets to use the
spiffy new JobScheduler instead. Hooray!

On top of that, the now-obsolete "idle maintenance" APIs are now gone
entirely. Double hooray!

Bug 14993295

Change-Id: I5fb67c296ca8cd0ba8a2c8760a0f0d9d962d813b
ava/com/android/server/IdleMaintenanceService.java
ava/com/android/server/pm/BackgroundDexOptService.java
e8b1aeb51e1e5da64f1d4fd40f2ee1e815886fe5 13-Jun-2014 Andy McFadden <fadden@android.com> Add two new display info fields

This adds SurfaceFlinger's app VSYNC offset and buffer deadline
values to DisplayInfo. The values will be available to apps
through queries on a Display object (currently hidden).

Bug 14612039

Change-Id: I48760f58a9d74d99651b02a9d595f420410f2bb5
ava/com/android/server/display/DisplayDeviceInfo.java
ava/com/android/server/display/LocalDisplayAdapter.java
ava/com/android/server/display/LogicalDisplay.java
ava/com/android/server/display/OverlayDisplayAdapter.java
ava/com/android/server/display/OverlayDisplayWindow.java
ava/com/android/server/display/VirtualDisplayAdapter.java
ava/com/android/server/display/WifiDisplayAdapter.java
d7b8621bde44857ebb07130693a00f5f777887d4 16-Jun-2014 Jason Monk <jmonk@google.com> Change lock-task DPM authorization to packages

Switch the DPM lock-task authorization to be controlled by a package
rather than a component.

Change-Id: Ife9bed068f31ff2449b4451ab69d3586a3f09d89
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
3ecdd832c77483c909fbf90d17d0e6d97ca365ee 17-Jun-2014 Jungshik Jang <jayjang@google.com> Fix missing iteration policy on device discover action

Device polling requires both pick policy and pick iteration policy,
however, device discovery action has no iteration policy.
Along with fix, move send result and pick policy constants
to HdmiConstants package

Change-Id: Ibbcfdc482a189bbc3aa2c61143422541da78447d
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/RequestArcInitiationAction.java
ava/com/android/server/hdmi/RequestArcTerminationAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
96f4e595ba09bf9a5a5b58882d6e4cebdcf06503 17-Jun-2014 Jeff Sharkey <jsharkey@android.com> Only movedex() when working with apps-on-SD.

Partial revert of earlier change that tried doing movedex() during
a package upgrade. Verified that the normal package upgrade path
already wipes old code as part of InstallArgs.cleanUpResourcesLI().

Change-Id: Icc5ae0d2718a0c494bfe7becf72df50c641efe1b
ava/com/android/server/pm/PackageManagerService.java
8db85ab744eeaade6c3aaf6b5f4f13f60d5e3460 17-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Rename HdmiCecKeycodeTranslater to HdmiCecKeycode."
cd3445cc8b7a1a08f34bf955c6d2357a5d5481c3 16-Jun-2014 Jungshik Jang <jayjang@google.com> Rename HdmiCecKeycodeTranslater to HdmiCecKeycode.

Since HdmiCecKeycode defines all keys used for Hdmi CEC,
simple HdmiCecKeycode sounds better than HdmiCecKeycodeTranslater.

Change-Id: I1a0ea9f128b19dd47bfda3bf2dd8794a9e42c6f8
ava/com/android/server/hdmi/HdmiCecKeycode.java
ava/com/android/server/hdmi/HdmiCecKeycodeTranslator.java
ava/com/android/server/hdmi/SendKeyAction.java
b86f752a241a38aa8e89ef69e7bd6e823ce8e382 17-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Notify network observers of route changes."
3e1e33f13b524b26188dd4a97469ce21518c8d0d 17-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Rearrange ownership between Hdmi control modules."
79c58a4b97f27ede6a1b680d2fece9c2a0edf7b7 16-Jun-2014 Jungshik Jang <jayjang@google.com> Rearrange ownership between Hdmi control modules.

Here is a list of changes on this. (R: rationale)
1. HdmiCecLocalDeviceTv takes over responsibilty of device info
management.
R: All devices infos are added or removed by only Tv's
device discovery and hot plug detection mecanism

2. Each HdmiCecLocalDevice manages FeatureAction and Cec
message cache.
R: There is no direct connection between actions that
are created in different device action. If there is
an same actions created from different local device,
they should be managed independently.

3. Active path and logical address is managed by
HdmiCecLocalDevice.
R: All device should know active path of current source.

4. All system audio & ARC features are handled by
HdmiCecLocalDeviceTv
R: In terms of ARC, theoretically, any device can be transmiter of
ARC but TV is the de facto device
On other hands, for system audio Tv is the recipeint
of request.

Change-Id: Iac9ff43fb41798ed4f94c61d23345fe5fe777fbb
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/DevicePowerStatusAction.java
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiUtils.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/OneTouchPlayAction.java
ava/com/android/server/hdmi/RequestArcAction.java
ava/com/android/server/hdmi/RequestArcInitiationAction.java
ava/com/android/server/hdmi/RequestArcTerminationAction.java
ava/com/android/server/hdmi/RoutingControlAction.java
ava/com/android/server/hdmi/SendKeyAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/SystemAudioActionFromAvr.java
ava/com/android/server/hdmi/SystemAudioActionFromTv.java
ava/com/android/server/hdmi/VendorSpecificAction.java
c18cbfdf8d40e7a526a088225cb32341e1ea0920 13-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Notify network observers of route changes.

Bug: 9180552
Change-Id: If8432bc74335676320b815784b21f404d3479c35
ava/com/android/server/NetworkManagementService.java
9740e468bc895cbc08c71aecc35fc56c3faafa06 08-Feb-2014 Andres Morales <anmorales@google.com> interface for nfc handover supplicant commands

expose:
NFC_GET_HANDOVER_SEL
NFC_GET_HANDOVER_REQ
NFC_REPORT_HANDOVER

These are used in for setting up WFD with NFC and
are only accessible given the CONNECTIVITY_INTERNAL
permission.

Change-Id: Ia43afc137d474822cad896d335530654081a808c
ava/com/android/server/am/ActivityManagerService.java
5d140e4b1b1d43c742a7d67dd5f9d394c846945f 16-Jun-2014 Narayan Kamath <narayan@google.com> am 5406f59a: am 6a6411e3: am 076dc013: Merge "Move dex file pruning to installd."

* commit '5406f59abd0cde826e8254fe628bea6d80769c8c':
Move dex file pruning to installd.
5406f59abd0cde826e8254fe628bea6d80769c8c 16-Jun-2014 Narayan Kamath <narayan@google.com> am 6a6411e3: am 076dc013: Merge "Move dex file pruning to installd."

* commit '6a6411e3d8c533a40bfe1897e2c26e3d6f3b52e0':
Move dex file pruning to installd.
6d97f5b91c6c82f28a2a3a5d3b922f0e5844e733 16-Jun-2014 Jinsuk Kim <jinsukkim@google.com> A few more APIs for HdmiControlService

Added following APIs in HdmiControlService:

- portSelect
- sendKeyEvent
- getPortInfo
- addDeviceEventListener

Some are not fleshed out yet. Will work on it in a follow up CL.

Change-Id: Ia8c635176c0378f6e8db589bf714d82bf21ce85d
ava/com/android/server/hdmi/HdmiControlService.java
916cd9770ce865bad98f15a68be74f3aa607e727 14-Jun-2014 Craig Mautner <cmautner@google.com> am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly.""

* commit '6335fbcba106147d914acae0a9d8f4fcd53af768':
Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
40190375408034b2b7dd1aef358086da2914051b 14-Jun-2014 Craig Mautner <cmautner@google.com> am 6fe2184b: Do not treat the dummy animation as an animation

* commit '6fe2184bf10362ac53db7e8f6a0be521ea59b054':
Do not treat the dummy animation as an animation
6335fbcba106147d914acae0a9d8f4fcd53af768 14-Jun-2014 Craig Mautner <cmautner@google.com> Revert "Revert "Close ActivityView and ActivityContainer cleanly.""

This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
6fe2184bf10362ac53db7e8f6a0be521ea59b054 14-Jun-2014 Craig Mautner <cmautner@google.com> Do not treat the dummy animation as an animation

The dummy animation is a place holder. When the task stack is being
removed treating it as a true animation forced us through a path
where we deferred the detachment and made a call to tmpRemoveWindows.

Also replaced call to tmpRemoveWindows with a real remove windows
call. The tmpRemoveWindows call does not clean up the Session
and this leaves a surface on the screen.

Fixes bug 15591610.

Change-Id: I05f7bc276bfed2366bbcd8443c92a4bbbc8a4491
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/WindowManagerService.java
0f3d3dd26c7c726752c92fbf92fb1502ba4b77f0 13-Jun-2014 Justin Koh <justinkoh@google.com> am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly."

* commit 'dd5c94717077c9366dee364c88a86a78e5ee2688':
Revert "Close ActivityView and ActivityContainer cleanly."
dd5c94717077c9366dee364c88a86a78e5ee2688 13-Jun-2014 Justin Koh <justinkoh@google.com> Revert "Close ActivityView and ActivityContainer cleanly."

This reverts commit 4a9f129874785d34930f165268dbc618e4bc2618.

Conflicts:
services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
4849aa86b1f26c12d036f32fa5b1413cecd77760 13-Jun-2014 Craig Mautner <cmautner@google.com> am be634951: Fix permission problem and NPE

* commit 'be63495101dba3b0c3c496cdd810df9e30e926d4':
Fix permission problem and NPE
50ece5ec53661a51ce5a15f782fdcd747171bc02 12-Jun-2014 Nick Kralevich <nnk@google.com> am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles."

* commit '9a0485aa567c99157e45d08e9712a281f34ffc5f':
Add service_contexts to policy update bundles.
be63495101dba3b0c3c496cdd810df9e30e926d4 12-Jun-2014 Craig Mautner <cmautner@google.com> Fix permission problem and NPE

Remove uid before calling into Window Manager. Restore afterwards.

Check for null stack value before dereferencing.

Fixes bug 15591112.

Change-Id: Ida3de556940440162c91b8c1614d0f21e364abd8
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/wm/WindowState.java
c5115556707d24dfbe6cbef8f3e9476b6c5e3021 12-Jun-2014 Christoph Studer <chstuder@google.com> Prevent duplicate notifications

Don't trust mNotificationData being sorted consistently
at all times...which it actually should. But apparently isn't.

Instead of using binary search to find the previous instance of
the notification when it's updated, use a simple linear scan.

Bug: 15589158
Change-Id: I7a09d0c64e35bd1930b8992d19da1393f4e4bb4e
ava/com/android/server/notification/NotificationManagerService.java
f5030ecbca4f8dc217204d96d3f0a3511acf49ac 12-Jun-2014 Craig Mautner <cmautner@google.com> am 4a9f1298: Close ActivityView and ActivityContainer cleanly.

* commit '4a9f129874785d34930f165268dbc618e4bc2618':
Close ActivityView and ActivityContainer cleanly.
4a9f129874785d34930f165268dbc618e4bc2618 11-Jun-2014 Craig Mautner <cmautner@google.com> Close ActivityView and ActivityContainer cleanly.

- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
28084383c13660864f75452f99183c377c2798ec 11-Jun-2014 Craig Mautner <cmautner@google.com> am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev

* commit 'e33010a261d881426ce0af9a9e2177137ec3f6b9':
Add NO_ANIMATION flag to ActivityView Intents.
e33010a261d881426ce0af9a9e2177137ec3f6b9 11-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
579ace0358cabcae55329a15a7aac5b6a1cfa0d7 11-Jun-2014 Griff Hazen <griff@google.com> am 9f637d10: Reduce notification service historical archive size to 1 for watches. To remove the memory footprint

* commit '9f637d10959490c3a28e0f40330e97eb67e954d7':
Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
ca515e307e10d00dacdd9b51d2f0118f7eff18e1 17-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Added an argument isPressed to HdmiControlService#sendKeyEvent"
c4858a2ba972e86436d629c4d3f18eb49116de14 16-Jun-2014 Jeff Sharkey <jsharkey@android.com> Switch PackageParser to reference single path.

It previously kept mPath separate from mScanPath for some very odd
edge cases around moving apps-on-SD. This changes it to always use
a single path, refactors moving to keep separate paths.

Refactors method names in PackageParser to be clearer about their
APK-versus-package relationship.

Beginnings of a split package parser. Instead of requiring that
callers check error codes when null, switch to always throwing on
parse errors, to require that callers deal with the error. Longer
term the entire parser should switch to this style, but its too
pervasive for a simple refactoring.

Change-Id: If071d8e55e46e56cc201fadfb51cb471713ae973
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
b87de28f50e9f02a365f35348f8da6cc2629bc1c 13-Jun-2014 Jeff Sharkey <jsharkey@android.com> Build usesLibraryFiles with ArraySet.

Use ArraySet instead of using odd shared variable.

Change-Id: Ide5095069ae8f2dcb4553f37e877fc1fce33ebde
ava/com/android/server/pm/PackageManagerService.java
0d3985a977886a0d6d6bb7ba6d048c1e21b05a24 16-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Added an argument isPressed to HdmiControlService#sendKeyEvent

sendKeyEvent requires additional argument isPressed to handled
both up/down key event.

Change-Id: I0080adc72920dd7ae4e4dae041781f76a6658f9b
ava/com/android/server/hdmi/HdmiControlService.java
bc8169b0553e7bcdc061ebdbf586da432983b2fb 16-Jun-2014 Natalie Silvanovich <natashenka@google.com> Merge "Null checks in register/unregister BT Adapters"
26b6db36a3543072d358ae58486b09792318828c 16-Jun-2014 Christoph Studer <chstuder@google.com> am afaf0c54: Prevent duplicate notifications

* commit 'afaf0c54731e126affcd3319a1d9a4f0da63411e':
Prevent duplicate notifications
9f637d10959490c3a28e0f40330e97eb67e954d7 10-Jun-2014 Griff Hazen <griff@google.com> Reduce notification service historical archive size to 1 for watches.
To remove the memory footprint

Bug: 15536759
Change-Id: I081bd962fef689b5d8ed126208499d56ebf4ae38
ava/com/android/server/notification/NotificationManagerService.java
7237cd811cd760be2daa18fb495b2e05172d5fd4 16-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Refine new device action."
60cffce420db4c3395f86d3b9bb36003adf26f5d 12-Jun-2014 Jungshik Jang <jayjang@google.com> Refine new device action.

There are many ways to initiate new device action
1. When receives <Report Physcial Address>
2. When receives <Active Source> from unregistered device.

If new device is audio system, it should start
ARC and system audio initiation action.

Along with this consolidate device remove actions.

Change-Id: I189afd8bec7270d6a1734a28632593b71932d9e8
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/NewDeviceAction.java
ava/com/android/server/hdmi/RoutingControlAction.java
67ad9a4557b5456573c3ed0da7e2c78e4bfd4223 16-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Use android-cec key conversion in HdmiControlService.sendKeyAction

Change-Id: I8395d0217e2bbcd2cd6148414be8bcde1db168c0
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/SendKeyAction.java
401e3de791c0e2a4348361fbd560da9530156e22 14-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Add methods in HdmiControlService fort port_id/path conversion

Use HdmiPortInfo list to get the port ID from a given routing path,
and vice versa. This is useful when you need to get the HDMI port
to which a certain device is attached in its hierarchy by its routing
path.

Change-Id: If1e7e8fdd005671d4e1fbb04dc26b24885320a92
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/RoutingControlAction.java
0a3316bcfdac9f5f40d1349d97d10329c70f7e30 14-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Boilerplate class for vendor-specific commands for HdmiControlService

Vendor-specific commands in HDMI-CEC protocol needs to be handled
by OEM. This CL introduces a boilerplate class that should be filled
in to handle it for TV device.

Change-Id: I56b9aac973f1cff27ea8654850334d2d5f6838fe
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/VendorSpecificAction.java
d163e751895930a1c8d8d6c3d7e0a37177dbbf19 14-Jun-2014 Craig Mautner <cmautner@google.com> Revert "Revert "Close ActivityView and ActivityContainer cleanly.""

This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.

Change-Id: I7bac1aa1d96fa7922cc835949730a26204f15f2f
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
bc2a6dff1f0edfb2856377fbdb6378158621bd16 14-Jun-2014 Craig Mautner <cmautner@google.com> Do not treat the dummy animation as an animation

The dummy animation is a place holder. When the task stack is being
removed treating it as a true animation forced us through a path
where we deferred the detachment and made a call to tmpRemoveWindows.

Also replaced call to tmpRemoveWindows with a real remove windows
call. The tmpRemoveWindows call does not clean up the Session
and this leaves a surface on the screen.

Fixes bug 15591610.

Change-Id: I05f7bc276bfed2366bbcd8443c92a4bbbc8a4491
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/WindowManagerService.java
220cad6d9743f134c0d44623fc56cd57467866e7 13-Jun-2014 Qiwen Zhao <zhao@google.com> Merge commit '0f3d3dd2'

Conflicts:
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java
24683f1e15cde8c1f70e2c5d9fa18bc7b4451241 13-Jun-2014 Wink Saville <wink@google.com> Merge "Merge kwd to master"
fb40dd4d00bd3361b2535bc866e6c21eadc52558 13-Jun-2014 Wink Saville <wink@google.com> Merge kwd to master

Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/TelephonyRegistry.java
17c9d69d7018c62d9d08ceecc6218df6704832dd 13-Jun-2014 Kenny Guy <kennyguy@google.com> Don't remove a user already being removed.

Check if UserManager is already removing
a user before starting to remove it.

Bug: 15583858
Change-Id: If9763e9b47355d9ae35cc621367c74725029aa90
ava/com/android/server/pm/UserManagerService.java
78b9654311c9966a1d20efe2ddcb4649886b27e3 12-Jun-2014 Matthew Williams <mjwilliams@google.com> Merge "JobScheduler blocking main thread." into lmp-preview-dev
49a85b64f7c29a5dfbf27112ff22987b85c59338 12-Jun-2014 Matthew Williams <mjwilliams@google.com> JobScheduler blocking main thread.

Bug:15589789
Fixed deadlock from lock ordering.

Also, before doing I/O we now copy the list of jobs with the lock, but release
the lock before starting the write.

Change-Id: I1ed6141be8fc506abe2684d2894b255c714e29ba
ava/com/android/server/job/JobServiceContext.java
ava/com/android/server/job/JobStore.java
a83ce3451d76833ffba8d82c65890881d65db2b0 12-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev
6078b50b017fbcf8d6cbf9f83226ed5667d5729e 12-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Apply API Council comments to ConnectivityManager

rename isNetworkActive -> isDefaultNetworkActive
rename registerNetworkActiveListener -> registerDefaultNetworkActiveListener
make listenForNetwork/requestNetwork take a NetworkRequest
rename NetworkCallbackListener -> NetworkCallback
rename listenForNetwork -> registerNetworkCallback
rename releaseNetworkRequest -> unregisterNetworkCallback
remove NetworkRequest param from NetworkCallback functions
rename onNetworkCapabilitiesChagned to onCapabilitiesChanged
remove onReleased
change time units in onLosing from Sec -> ms

bug: 15142362
Change-Id: Ibc96e3f461706efe1eafa0d85605249cfd6e9fdd
ava/com/android/server/ConnectivityService.java
ava/com/android/server/job/controllers/ConnectivityController.java
594b456b6e2aa4142fa31394cdd39bd4cc7a1d3a 12-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev
55213c80229cc9cbec328f0ec9a842f5d66c35c2 12-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev
6307b35e1d3a8d577877be0b4c9cea1a909b6329 04-Jun-2014 Sreeram Ramachandran <sreeram@google.com> Add a new IpPrefix class and use it in RouteInfo.

This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
(cherry picked from commit 7d3b4b9a3d4de9673119632da0ebd583e50126f7)
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/net/IpConfigStore.java
6ba62e6416202f2eb9e63028894ff37abe47a73a 12-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev
7569f1811f6061b2a6605c69bca1bb7af72ae1a0 09-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Make NetworkCapabilities publicly immutable.

Applying API council comments.

bug: 15142362

(cherry picked from commit Ie0bde68b72656a676d90c0343b9756fe9268d8d6)
Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6
ava/com/android/server/ConnectivityService.java
c92856c4bbdee9d0ca18001a78615676c6ba45b0 12-Jun-2014 RoboErik <epastern@google.com> Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev
00a0fd650b7a31dffb88c229242bb04fa0b487a4 09-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Minor changes to the LinkAddress API docs.

1. Rename getNetworkPrefixLength to getPrefixLength. Update all
callers in frameworks/base and add a shim method and a TODO
for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
been </ul>).
4. Remove the documentation that talks about creating
LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
(cherry picked from commit 9ab53650cfcd91a2a151b44b3fd1381841f76269)
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/net/IpConfigStore.java
73e23e229dd1a2d25687b1c6a63c708665378e41 11-Jun-2014 RoboErik <epastern@google.com> b/15330955 Make RemoteController use the new session APIs

This moves RemoteController over to using Sessions instead of
the RCC/RCD framework. This also adds several hidden APIs to
help with translating between the two apis.

Change-Id: I0f50313db2b6190b16fa86ce670ac9250654ca05
ava/com/android/server/media/MediaSessionRecord.java
f9fcfaae78afb0bc3e6a0716ad1d5fe3561bb81e 12-Jun-2014 Christopher Tate <ctate@google.com> Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev
759275d9da1e78cf9bffbd28bb1d585fa3257aaa 10-Jun-2014 Matthew Williams <mjwilliams@google.com> Fix battery controller non-fire bug

Receiver wasn't registered to listen for the action coming
back from the Alarm Manager.
Also, if a task starts being tracked by the battery controller
and the device is on power, the batt. controller will notify
the scheduler as such.
Added dumpsys for battery controller to help debugging.
Change-Id: I7ce305b816aea69e8d05a3daf23124c163546788
ava/com/android/server/job/controllers/BatteryController.java
b7b70f0f99f2b8e51e03fa55c5005e62f7fd1447 11-Jun-2014 Christopher Tate <ctate@google.com> Fix build

Change-Id: I339f7f1ab82af699ee34c3baf824d0278477a4cf
ava/com/android/server/job/JobStore.java
8fe0d0c84c1a09ee2dc5050919890409dc1dc2f8 11-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix public API of LinkProperties." into lmp-preview-dev
25702b39675c51dd4963eb71b66b20126a55cc05 06-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Fix public API of LinkProperties.

bug:15142362
(cherry picked from commit 51d898fd0223a4b7c728980ab987dd985c02df5f)
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Tethering.java
ava/com/android/server/net/IpConfigStore.java
19b8fe225dfd669406ee3e172747bd405ce49b1f 13-Jun-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Modifies APIs for retrieving managed profile accounts."
63dd3bb3602bc00557680432b08b49a5a15bcdb7 13-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Fixed a wrong path to HdmiPortInfo class

This fixes a JNI error for HdmiCecController

Change-Id: I8ce987dfa3126ecffd455a964c01d27fb9aa01eb
ni/com_android_server_hdmi_HdmiCecController.cpp
c1cf161af036e0f337b58ef0739a8ff2e42f01e7 05-Jun-2014 Alexandra Gherghina <alexgherghina@google.com> Modifies APIs for retrieving managed profile accounts.

This is needed for Account Settings UI.

Bug: 13656853
Change-Id: I33129e4b7b33b428a7bf670259accacb60f62d9b
ava/com/android/server/accounts/AccountManagerService.java
f391ebccea9090fac64201d284641be3882f857a 13-Jun-2014 Chad Jones <chadj@google.com> resolved conflicts for merge of 4849aa86 to master

Change-Id: I7ec55bdb7a3a1618f33dfdb3b19b2bd201789677
45c9ef2021e678b85851dce51fd9c2f3698eb0b3 13-Jun-2014 destradaa <destradaa@google.com> Merge "Separate Hardware Flp ServiceWatcher flags from the ones used by Software Flp."
d5323174d85b6685672e321f045c44637e777618 12-Jun-2014 destradaa <destradaa@google.com> Separate Hardware Flp ServiceWatcher flags from the ones used by Software Flp.

Change-Id: I6c15665118d52627978381935716436981a058d1
ava/com/android/server/LocationManagerService.java
0340bbc89f8162f9c2a298c98b03bfcdd1bc6e87 05-Jun-2014 Jinsuk Kim <jinsukkim@google.com> RoutingControlAction for HdmiControlService

Routing control action is initiated in various cases, such as manual
TV input port switching, routing change of a different CEC switch,
and so on. The action determines the device to be a new active source.

Change-Id: I1efcd6ff1919dd94d6fa0e0ffa6e430c48d4e9c6
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiUtils.java
ava/com/android/server/hdmi/RoutingControlAction.java
ni/com_android_server_hdmi_HdmiCecController.cpp
a46ac5094e51827e40080ddead6268edcf5d3982 13-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Do not display unsecure windows behind dialogs"
a6ce7708d6124224399241503fadcafe0c4684d4 10-May-2014 Jinsuk Kim <jinsukkim@google.com> DeviceSelectAction for HdmiControlService

DeviceSelectAction is the main handler for the API deviceSelect() which is
used to choose a new active source among logical devices on the bus.

Change-Id: I77582a1f873423fc316d89f67a89a867461a76b2
ava/com/android/server/hdmi/ActiveSourceHandler.java
ava/com/android/server/hdmi/DeviceSelectAction.java
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/HdmiControlService.java
ni/com_android_server_hdmi_HdmiCecController.cpp
748a0ebf6b82b400ac3d803c51273cd7ba2d489c 13-Jun-2014 Matthew Williams <mjwilliams@google.com> am 00768c4d: Merge "JobScheduler blocking main thread." into lmp-preview-dev

* commit '00768c4dc67aed2f156184e9544b869cb80cdd50':
JobScheduler blocking main thread.
52a327263d1cdbab53f9d9087b67bcfea087407e 13-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> am 2d0ab42b: Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev

* commit '2d0ab42b1420db884d26fd2ef22710b5a887e9a6':
Apply API Council comments to ConnectivityManager
c9457faeb6bf22ce8fc72bc61af5109a2b567c51 06-Jun-2014 Craig Mautner <cmautner@google.com> Do not display unsecure windows behind dialogs

If a dialog activity has FLAG_SHOW_WHEN_LOCKED set it will dismiss
the keyguard. Previously this would expose any full screen unsecure
windows behind the dialog. With this fix the dialog is displayed
over the wallpaper.

Fixes bug 15006623.

Change-Id: I85a6713c7647db52211bd0f7280010e859723710
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
659e0e1d9448205832c82b8856dfcbb9c401b4b0 12-Jun-2014 Nick Kralevich <nnk@google.com> am 50ece5ec: am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles."

* commit '50ece5ec53661a51ce5a15f782fdcd747171bc02':
Add service_contexts to policy update bundles.
3d187c2e9f7604d199f9bc0a9a9ebb8376777976 12-Jun-2014 Svetoslav <svetoslavganov@google.com> Merge "Fix backwards compatibility for introspected windows."
f7174e87b6007000777b0124de9cef70d8618788 12-Jun-2014 Svetoslav <svetoslavganov@google.com> Fix backwards compatibility for introspected windows.

1. The APIs for introspecting interactive windows were reporting only
the touchable windows but were missing the focused window. The user
can interact with the latter by typing, hence it should always be
reported. Also this was breaking backwards compatibility as if the
focused window is covered by a modal one, the focused window was not
reporeted and this was putting the active window in a bad state as
the latter is either the focused window or the one the user is touching.

2. Window change events are too frequent as on window transition things
are chanign a lot. Now we are trottling the windows changed events
at the standard recurring accessibility event interval.

3. Fixed a wrong flag comparison and removed some unneded code.

buy:15434666
bug:15432989

Change-Id: I825b33067e8cbf26396a4d38642bde4907b6427a
ava/com/android/server/wm/AccessibilityController.java
ava/com/android/server/wm/Session.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
db6cf3a7685b6ec3cc27a65f5015c41dc9fe8953 12-Jun-2014 Amith Yamasani <yamasani@google.com> Merge "Guest user first iteration"
1e9c21871e81642669079cd290ef47818a3165bd 12-Jun-2014 Amith Yamasani <yamasani@google.com> Guest user first iteration

Setting for controlling if guest is enabled on the device.
Setting to hint to apps that they should skip showing first use clings.

User switcher handles creation and deletion of the guest user.
Some tweaks to the user switcher to show some feedback and make the icons
circular.

Change-Id: I187dc381d2ee7c372ec6d35e14aa9ea4dfbe5936
ava/com/android/server/pm/UserManagerService.java
61d3fab6908763860beb1a428efa4753e0349b80 12-Jun-2014 John Spurlock <jspurlock@google.com> am e2f6373c: Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev

* commit 'e2f6373c80e7d1a5a7c71412bff10a71c54cd451':
Heads-up notifications for low battery warnings.
7c9f5529ea07fda43a68f9b5de204cf2b90d1b61 12-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev

* commit '558aeb901144fac460575402e38fc8baa2da83eb':
Make NetworkCapabilities publicly immutable.
b41ed6ca70984f0696f85e1608306f00f60875d9 12-Jun-2014 RoboErik <epastern@google.com> am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev

* commit '8c4b4dc87f68d13331d67f4a25480455a7fb2378':
b/15330955 Make RemoteController use the new session APIs
93e9e7208e0de349a9592ac59153d6b06c202fe6 12-Jun-2014 Christopher Tate <ctate@google.com> am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev

* commit 'ba6e8ae5d2a364799fd6bc84179e33b6731e574b':
Relax duplicate-permission-definition constraints slightly
7dc78cf3af9fd11a4f1e2e981ce584a23755ea9e 09-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Minor changes to the LinkAddress API docs.

1. Rename getNetworkPrefixLength to getPrefixLength. Update all
callers in frameworks/base and add a shim method and a TODO
for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
been </ul>).
4. Remove the documentation that talks about creating
LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/net/IpConfigStore.java
98908aa0c97d9685045a168ca39ec1ee7988dabe 12-Jun-2014 Jeff Brown <jeffbrown@google.com> Merge "Add call to set power mode for display"
7baacb177b4d364097b13f80e388b03f1ac6d8f9 12-Jun-2014 John Spurlock <jspurlock@google.com> Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev
3332ba54ae85df14d761447d86d2aa19d448ce11 10-Mar-2014 John Spurlock <jspurlock@google.com> Heads-up notifications for low battery warnings.

Falls back to dialogs when heads-up are N/A.

Add new ongoing notification if battery saver mode
is active. Offer to start battery saver on warnings,
if not already started.

True up BatteryMeterView's levels to the latest threshold
levels. 15% for first warning.

Bug:13329308
Change-Id: Id8ad11a1997079ee7165ae003a8fa1c744462ab3
ava/com/android/server/notification/ZenModeHelper.java
4604abc97d7dd757bb76ff9b7fcf343dc4a15212 11-Jun-2014 Svetoslav <svetoslavganov@google.com> Moving and resizing windows not reported propely for accessibility.

When the position and size of a window changes we have to report that
to the accessibility layer if the window introspection is enabled.

bug:15569915

Change-Id: I3f869e0a582592bfa5f3743d5c2133ee8cb39b34
ava/com/android/server/wm/AccessibilityController.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
42c9800f4f3acef10d19dca39e8b739546407c04 12-Jun-2014 Jungshik Jang <jayjang@google.com> Use model name for local devices' osd name.

Till we find better name use model name as local devices' osd name.
Note that all local devices share display name.

Change-Id: I97e51d76f8cb9511acfe854b7bbe276eec56a661
ava/com/android/server/hdmi/HdmiControlService.java
1ffe68c9e0bbf4a9caea5139e9a3cf8433e61a3a 12-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Move message handling logic to local device instead of service."
092b445ef898e3c1e5b2918b554480940f0f5a28 11-Jun-2014 Jungshik Jang <jayjang@google.com> Move message handling logic to local device instead of service.

Local device is in charge of handling incoming messages
and for some messages such as <set menum language> or
<report physical address> each device has slightly different
behavior. Instread of checking destination address and
local device status from service, this change leaves it
to each local device.
Note that some messages are still left on service
and will be refactored in the following changes.

Along with this, following changes are included.
1. add missing jin interfaces
set_option
set_audio_return_channel
is_connected
Note that get_port_info is under review of jinsuk's change
2. if tv device receives <Report Physical Address>,
starts NewDeviceAction.
3. add constants variables related to new interfaces.
4. add two helper methods for physical address and vendor
id handling

Change-Id: I9c9d04744bc09fbf38431ecfa6e77097b0618a37
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiUtils.java
ava/com/android/server/hdmi/NewDeviceAction.java
ni/com_android_server_hdmi_HdmiCecController.cpp
4c07d0246fb37e6a77be2c5cdcdf55a989b90f75 12-Jun-2014 Craig Mautner <cmautner@google.com> Merge commit 'f5030ecb' into manualmerge

Conflicts:
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ie38e3e8b82f588d36e955664904f3ab84bdfaaf5
439688cf3940571fde9063a02e5f539857b66142 12-Jun-2014 Dianne Hackborn <hackbod@google.com> am 6d758619: Merge "Implement control of auto power save mode." into lmp-preview-dev

* commit '6d758619d90a0dda7f1136dcd44d0ac02cdada7e':
Implement control of auto power save mode.
104e14531ca2212117540d8b6abc06ab67564ebc 12-Jun-2014 Dianne Hackborn <hackbod@google.com> am f894cad0: Merge "Some tweaks to improve document task creation." into lmp-preview-dev

* commit 'f894cad093c1a3083f4aca099babc4677977a12f':
Some tweaks to improve document task creation.
7207b792d961deb78ccbe9b86e67c185992bc29a 11-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Define SendKeyAction for HdmiControlService"
cd97baf4d08f9a23797eb6a8eb0d57bba1086bec 02-May-2014 Jinsuk Kim <jinsukkim@google.com> Define SendKeyAction for HdmiControlService

SendKeyAction is one of FeatureAction classes that handles HDMI-CEC UCP/UCP
(User Control Pressed/Release) command transmission flow mechanism.

Change-Id: Iede8479103330c1f9db516218c6a94d09ef6b7f4
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/SendKeyAction.java
5945d484ca0d631ea934a1ac724d567c99b133f5 11-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Use cached message in NewDeviceAction."
a466929979a92a578d4ba00093fefa57cfb982b4 10-Jun-2014 Jungshik Jang <jayjang@google.com> Use cached message in NewDeviceAction.

Vendor id and osd name can be cached in be reused
later.
Along with this, fix a bug on HotplugDetectionAction.

Change-Id: I0583a9c266eed4281a99a59b1301f41b3e155505
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
ava/com/android/server/hdmi/NewDeviceAction.java
65c64c31abaeca044fd997df6f0787dddc611a68 10-Jun-2014 Jungshik Jang <jayjang@google.com> Implements Hdmi Cec keycode translater

In order to transfer some keyevent to other device
we need to have a logic to translate Android keycode
to Hdmi CEC keycode and vice versa.
HdmiCecKeyTranslater handles bidirectional keycode translation.
Basically it assumes bijection between android key code to
a pair of cec keycode and its optional param.
KeycodeEntry of HdmiCecKeycodeTranslate handles a mapping of it.

Note that all available mappings have no parameterized mapping.
If new Android keycode is defined for parameterized cec keycode,
entry should be added.

Change-Id: I287082a0a6ef5eb6f0916044b78179fe3fdfbece
ava/com/android/server/hdmi/HdmiCecKeycodeTranslator.java
04fcf1cabec82b7f2e349658ca764939f5641cc3 11-Jun-2014 Yohei Yukawa <yukawa@google.com> Merge "Show IME-related system IME dialogs over windows owned by the IME"
6de057816f2feb8e0ecbd2e9ccf73ad53e4dc7ed 11-Jun-2014 Dianne Hackborn <hackbod@google.com> Merge "Implement control of auto power save mode." into lmp-preview-dev
14272302a8b635bd8e9267c1411d0a7ef11bff45 11-Jun-2014 Dianne Hackborn <hackbod@google.com> Implement control of auto power save mode.

Follow the setting for auto power save mode in both
battery service and battery UI. Default level is 15 when
setting is not set; otherwise it is whatever the setting
gives, with 0 meaning auto battery save is off.

Change how we define the "turn off warn" level to be
an adjustment from the warn level, so we can have a good
value for whatever auto setting is set.

Fix power manager to never go in to power save mode when
plugged in, even if the user has manually turned it on.

Add new delete option to settings command, because I needed
it for testing.

Change-Id: I512b691df84399d50b8e751fd50732c6093ebe85
ava/com/android/server/BatteryService.java
ava/com/android/server/power/PowerManagerService.java
e4ad633a3654586ea3694e8d7d3f27a904c76676 11-Jun-2014 Dianne Hackborn <hackbod@google.com> Merge "Some tweaks to improve document task creation." into lmp-preview-dev
d38aed81420d7d992f65ef2efb5f69c1900fc61d 11-Jun-2014 Dianne Hackborn <hackbod@google.com> Some tweaks to improve document task creation.

- Mark the chooser activity as never launching in to a new
task, even if the caller asks for it. These are dialogs
so don't make sense as stand-alone tasks. (Maybe later
the policy should be to not launch into a new task in any
case that the activity is a dialog or even transparent at all.)

- Keep track in the task record of whether any activities in
it have been shown to the user, and use this to automatically
remove the task when all activities finish. This leans up
cases where apps are launching stub activities that get turned
in to tasks but are never seen by the user because they
immediately launch another activity in another task and
then finish.

Change-Id: I00b641c80aa96bd5071479f36ee2e4d8e3a81aeb
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/pm/PackageManagerService.java
9262cbe5518cf0762036da4040f7b154daf81778 12-Jun-2014 Jay Civelli <jcivelli@google.com> Merge "Temporary removing the Trust Agent permission change."
abc40bbeeb9d8a183b296a7c7ac3a0c55ed8c636 11-Jun-2014 Jay Civelli <jcivelli@google.com> Temporary removing the Trust Agent permission change.

Removing the permission check for Trust Agents, until the GMS core prebuilt
has that permission.

BUG: 15546358

Change-Id: Id42d3820d8d772b7788ea1f7431944bf13d4cc92
ava/com/android/server/trust/TrustManagerService.java
0aad830d1b3006c75a66c02d29d3147c8765b815 11-Jun-2014 Craig Mautner <cmautner@google.com> am 28084383: am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev

* commit '28084383c13660864f75452f99183c377c2798ec':
Add NO_ANIMATION flag to ActivityView Intents.
90c392fd2dfb354975a504f5890081ab41022fc6 11-Jun-2014 Kenny Root <kroot@google.com> resolved conflicts for merge of 579ace03 to master

Change-Id: I461879359824036ec861ad9b5b8804ae814179a9
86c9bb94b8929077827c012189baaeb7d275d5b0 11-Jun-2014 Matthew Williams <mjwilliams@google.com> am d6d72e5b: Merge "Fix battery controller non-fire bug" into lmp-preview-dev

* commit 'd6d72e5bc4e5659eb06606abce01da80e6d2f2b6':
Fix battery controller non-fire bug
0d3c637e8ad5d8b5223872253fa4c89cad802a74 11-Jun-2014 Christopher Tate <ctate@google.com> am 67691d13: Merge "Fix build" into lmp-preview-dev

* commit '67691d130e89135cc8de4cbe03d82058d9ee45b4':
Fix build
0188bee2c526270c178a0b1f918b2a09999de25f 11-Jun-2014 Christopher Tate <ctate@google.com> am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-dev

* commit 'd8f71d34c3c7fb161a1586de8edb52161c32d672':
Out with the old; in with the new
800c103495f221363c0e20795ba71d36e3e71a41 12-May-2014 justinzhang <justinzhang@google.com> 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
(cherry picked from commit cc2365ac9eae0393154c863a21286c9a95311e15)
ava/com/android/server/am/ActivityStackSupervisor.java
cc91c7b804a079f7b20404827277c61dd403805f 04-Jun-2014 Sreeram Ramachandran <sreeram@google.com> Add a new IpPrefix class and use it in RouteInfo.

This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/net/IpConfigStore.java
eeaf164bea829325af343b9e41196bc9680ecac9 11-Jun-2014 Nicolas Prevot <nprevot@google.com> Merge "Correcting a bug related to Uri permissions." into lmp-preview-dev
f233a7b8b22ad5605c968cedd2822fa4e80c09f7 22-May-2014 Nicolas Prevot <nprevot@google.com> Correcting a bug related to Uri permissions.

Making sure that an app cannot hold a permission for a uri on another user.
We were allowing apps to hold permissions for a different user, which should not be the case for privacy reasons (an app could just access apps on another profile)

As a consequence some of the cross profile share intents were not working because a check for the permission returned true so we did not separately grant permissions for uris. Granting permission for uris is required for accessing the content providers across users.

BUG: 15559256

Change-Id: I70765eb659151ce0c5af06075a844143c09429e8
(cherry picked from commit e55e0a1741b9258af77e23e16aa95a6d9e6a5c6f)
ava/com/android/server/am/ActivityManagerService.java
e6d80f4ce433e16dc72ea3291801169eb507a695 10-Jun-2014 Craig Mautner <cmautner@google.com> Add NO_ANIMATION flag to ActivityView Intents.

Add Intent.FLAG_ACTIVITY_NO_AMINATION to all Intents passed into
ActivityView.

Fixes bug 15393526.

Change-Id: I1899a5019416109e982f0254aaba410bb1f4a38d
ava/com/android/server/am/ActivityStackSupervisor.java
7060b04f6d92351b67222e636ab378a0273bf3e7 10-Jun-2014 Christopher Tate <ctate@google.com> Out with the old; in with the new

Switch to the official "JobScheduler" etc naming.

Bug 14997851

Change-Id: I73a61aaa9af0740c114d08188bd97c52f3ac86b7
ava/com/android/server/MountServiceIdler.java
ava/com/android/server/job/JobCompletedListener.java
ava/com/android/server/job/JobMapReadFinishedListener.java
ava/com/android/server/job/JobSchedulerService.java
ava/com/android/server/job/JobServiceContext.java
ava/com/android/server/job/JobStore.java
ava/com/android/server/job/StateChangedListener.java
ava/com/android/server/job/controllers/BatteryController.java
ava/com/android/server/job/controllers/ConnectivityController.java
ava/com/android/server/job/controllers/IdleController.java
ava/com/android/server/job/controllers/JobStatus.java
ava/com/android/server/job/controllers/StateController.java
ava/com/android/server/job/controllers/TimeController.java
ava/com/android/server/task/StateChangedListener.java
ava/com/android/server/task/TaskCompletedListener.java
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskMapReadFinishedListener.java
ava/com/android/server/task/TaskServiceContext.java
ava/com/android/server/task/TaskStore.java
ava/com/android/server/task/controllers/BatteryController.java
ava/com/android/server/task/controllers/ConnectivityController.java
ava/com/android/server/task/controllers/IdleController.java
ava/com/android/server/task/controllers/StateController.java
ava/com/android/server/task/controllers/TaskStatus.java
ava/com/android/server/task/controllers/TimeController.java
54f6e80d321fa5da6b09e820743f3475f5fd9815 10-Jun-2014 destradaa <destradaa@google.com> Merge "IPv6 support for GPS HAL."
965bba34341470fbb8541a4ade7b772a435ec3f2 10-Jun-2014 Amit Mahajan <amitmahajan@google.com> Merge "resolved conflicts for merge of 437a77d4 to master"
96a14701c0858ffa38b9488fae3b9a37a115cbf9 05-Jun-2014 destradaa <destradaa@google.com> IPv6 support for GPS HAL.

Change-Id: Iacaf3ab86009975ba07e1a13dbe539cf47c5a6f7
ava/com/android/server/location/GpsLocationProvider.java
ni/com_android_server_location_GpsLocationProvider.cpp
0409e9f0af69e1941b025c6c5cb788036a9dc7b6 10-Jun-2014 Amit Mahajan <amitmahajan@google.com> resolved conflicts for merge of 437a77d4 to master

Change-Id: I65585939a57c561064d370be131c0197de0f08c3
7683baad6c437af2931020423bf227f97a3ce0ba 10-Jun-2014 Craig Mautner <cmautner@google.com> am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev

* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
4a1c0bd20b317fbc48efc35f986b9a7f5cef128e 10-Jun-2014 Christopher Tate <ctate@google.com> am 2099866f: Merge "Switch framework to using new scheduled-work API" into lmp-preview-dev

* commit '2099866f0d9ae5692e6edfc053aebe7f93a21618':
Switch framework to using new scheduled-work API
1ee99c4627eeae1a94ada9a884a76b726cf6ca4c 10-Jun-2014 Yohei Yukawa <yukawa@google.com> Show IME-related system IME dialogs over windows owned by the IME

The IME-related system dialogs should be placed over any window
owned by the current IME. However, the framework has taken only
the main window of the current IME has been taken into account.
As a result, the system has not been able to show its IME-related
dialog properly layer when the IME is showing its own dialog.

This CL addresses the above issue.

BUG: 5809660
Change-Id: I205321c7ed42516f36a4bf29dd6a159ac34fd5ec
ava/com/android/server/wm/WindowManagerService.java
f53c295ae3ccabf1cf5a31c03f64233526e683eb 10-Jun-2014 Matthew Williams <mjwilliams@google.com> am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev

* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
Add OnNetworkActive to TaskManager and simplify locking.
8f70744221b739f749f4e5fecff53083ef1d075a 05-Jun-2014 Adam Connors <adamconnors@google.com> DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser

MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.

Bug: 14400206
Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
(cherry picked from commit c11c67b3e117b4fec3245f87b6d510461c1f8323)
ava/com/android/server/pm/PackageManagerService.java
3f51a909f03a5d0a09c3702d793f5b2a878a1aad 10-Jun-2014 Matthew Williams <mjwilliams@google.com> am a06fce7d: Merge "Add test app for JobScheduler" into lmp-preview-dev

* commit 'a06fce7dea359571877ae8d9cd9cf720934083f5':
Add test app for JobScheduler
ac383e52a9c76dcc1a14a82848abb49b81c49f99 09-Jun-2014 Adam Connors <adamconnors@google.com> DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.

And update the javadoc to explain use-case.

Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
ava/com/android/server/pm/UserManagerService.java
ef2b37ea87552f90af7bfb8d2b0e00d0e1091e0b 10-Jun-2014 Kenny Guy <kennyguy@google.com> Merge "Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only."
2ae1019c97c21b3f59e18521bf1fc2ff443d93d0 10-Jun-2014 Jungshik Jang <jayjang@google.com> Merge "Implement cec message cache."
e81e108c4035ea8933525baa8108cb392f8abf5d 05-Jun-2014 Jungshik Jang <jayjang@google.com> Implement cec message cache.

HDMI bus for CEC is quite slow and it may cause conflict
or timeout during device discovery stage or hot-plug
detection stage. However, some static information, such
as physical address, vendor id or osd name are usually
sent automatically when a device is connected, and
almost never change after updated.

Change-Id: I4df9d27ef1af04ee35d63a764580fed07c32d15d
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/HdmiCecMessageCache.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
df8e542a8a638c18074221f47c4e4afcd3502810 10-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev
e1ab884a67ecbb3cd879493364e9eb1f485d9023 10-Jun-2014 Craig Mautner <cmautner@google.com> Merge "resolved conflicts for merge of 1e6706ab to master"
f357c0ca514d73273a18b3896e565b2272e608ad 09-Jun-2014 Craig Mautner <cmautner@google.com> Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK

Change definition of FLAG_ACTIVITY_NEW_DOCUMENT from
FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to
FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET alone.

Also add new documentLaunchMode of "never" to allow activity
writers to keep their activity from being launched in document mode.

Fixes bug 15468528.

Change-Id: Ied11adf97e85c5d3f99f4c0bbbb4a2905dcfb24e
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskRecord.java
b27528d066644e9a81ebac27822186fa61c89003 06-Jun-2014 Amith Yamasani <yamasani@google.com> Make LocationManagerService aware of user profiles

LocationManagerService normally doesn't provide location to background users.
With managed profiles, there are more than one foreground users and they both
need to get location when in the foreground. So LMS will now compare the caller
against all foreground users and provide location if valid.

Bug: 14671472
Change-Id: If3baabfc5a3ab3f2f081d7fc28f35d840d5f1489
ava/com/android/server/LocationManagerService.java
115afdadb5863a02f0b0daefcc0511bfd35b531e 07-Jun-2014 Christopher Tate <ctate@google.com> Switch framework to using new scheduled-work API

Also add the intended permission-use enforcement to said API.

Bug 14994893
Bug 14993295

Change-Id: I5a3ffd32d0702c68f4ef6da68f7fa6e9de674380
ava/com/android/server/MountService.java
ava/com/android/server/MountServiceIdler.java
ava/com/android/server/task/TaskManagerService.java
effacfa75bd9c2ebc889a7bc4f002c07f82f4c31 06-Jun-2014 Matthew Williams <mjwilliams@google.com> Add OnNetworkActive to TaskManager and simplify locking.

Bug: 14993295
Hooks up a ConnectivityManager.NetworkActiveListener.
    
Previously was using 3 locks where 1 would suffice,
negligible to no performance issues b/c most of the previous locks
were nested.

Added OnNetworkActiveListener so that the ConnectivityController can kick of
tasks when it knows that the network is active.

Fixed some bugs that stopped timecontroller from executing tasks.

Requesting a retry will not add a deadline to that task. However backed-off
tasks are run as soon as they are ready, subject to their constraints.

Added receiver to listen for package removal and user removal, which will
delete any outstanding jobs for that uid.

Change-Id: I4c4523af558b927f19b8a215878fcc7198abb93f
ava/com/android/server/task/StateChangedListener.java
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskServiceContext.java
ava/com/android/server/task/TaskStore.java
ava/com/android/server/task/controllers/BatteryController.java
ava/com/android/server/task/controllers/ConnectivityController.java
ava/com/android/server/task/controllers/IdleController.java
ava/com/android/server/task/controllers/StateController.java
ava/com/android/server/task/controllers/TaskStatus.java
ava/com/android/server/task/controllers/TimeController.java
7119c0719206b9bd3ee5b9ecb329e08ba9ac8d17 10-Jun-2014 Michael Kolb <kolby@google.com> resolved conflicts for merge of 1e6706ab to master

Change-Id: Ia8e8fdf5e13acca496bf7ff9916c9950d5b13e4e
437a77d4bbbd342154c42205e4a89cf77c77acf4 09-Jun-2014 Amit Mahajan <amitmahajan@google.com> am 3f175a35: am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio.

* commit '3f175a3587f5f7c7d6189c0fd09468bae4e81325':
Handle provisioning APN by turning off/on radio.
1e6706abb23cd1196a7ef9dd1cc1939220ef7169 09-Jun-2014 Michael Kolb <kolby@google.com> am 4bdc93d6: Merge "Remove circular mask" into klp-modular-dev

* commit '4bdc93d63e9edc7840a227ea1824f1f7ac93933e':
Remove circular mask
508a8a0ab4c8172a8b28abf526a6cc331fa8e926 09-Jun-2014 Matthew Williams <mjwilliams@google.com> Merge "Add test app for JobScheduler" into lmp-preview-dev
3f175a3587f5f7c7d6189c0fd09468bae4e81325 09-Jun-2014 Amit Mahajan <amitmahajan@google.com> am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio.

* commit 'e5a28d34f662c469f85590dda28fc02eca12204b':
Handle provisioning APN by turning off/on radio.
e252909394921b65bce0e1910098b7c32c82232f 09-Jun-2014 RoboErik <epastern@google.com> am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev

* commit '6580a31db0727dfffba99069f4866ad01fc88cfb':
Adds listeners for changes to the list of active sessions
58af2199a53d56a57e1bfbe497d774e09d3665c2 09-Jun-2014 RoboErik <epastern@google.com> am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp-preview-dev

* commit 'ddbdcd092d1b71b987d680a8b1a5140832625410':
Add a way to get the package/pid of the session
5f670bd65c3562436bf87b368bccca0dfeb9f301 09-Jun-2014 RoboErik <epastern@google.com> am 7d0b1256: Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev

* commit '7d0b1256e3a08a1b0a98f217eb9a0e9f5809f57e':
b/15452153 Send 0 delta volume requests
a3d81885566f79b0e21438bd69634cc53a80918b 09-Jun-2014 RoboErik <epastern@google.com> Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev
20685929a4b3995d75f72059ac60a4770389a36f 09-Jun-2014 RoboErik <epastern@google.com> Merge "Add a way to get the package/pid of the session" into lmp-preview-dev
b6b31f2741acb8c0e45c34e92addada63ed9f915 09-Jun-2014 RoboErik <epastern@google.com> Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev
8d396392cce8a67f2e69271eb98e0790efd483fc 09-Jun-2014 Ji-Hwan Lee <jihwan@google.com> am 9a904962: Merge "Set mBound only when bind succeeds" into lmp-preview-dev

* commit '9a9049626d214a6329090abbba8e067ef3005c2e':
Set mBound only when bind succeeds
5adb67d4ce228a3afa6512e87d61c4d581dfd1e3 09-Jun-2014 Ed Heyl <edheyl@google.com> merge 4ce22057, regen api/current.txt

Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
d4b584ea7f6da5c06b7ba9b1ea75428dcc5fe7b2 09-Jun-2014 Adam Connors <adamconnors@google.com> Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.

And update the javadoc to explain use-case.

Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
ava/com/android/server/pm/UserManagerService.java
0fcedfd8ea4a613a6669bbe02cb0434c67bdbe01 09-Jun-2014 Yohei Yukawa <yukawa@google.com> Merge "Introduce a sequence number to avoid redundant IPCs"
3d1e8129ebd69db49d80e5d598f608c59b884cdf 06-Jun-2014 Yohei Yukawa <yukawa@google.com> Introduce a sequence number to avoid redundant IPCs

This CL introduces a sequence number to avoid redundant IPCs
between IMM and IMMS. The basic concept is that:
1. IMMS maintains a sequence number for #notifyUserAction.
2. IMMS increases the sequence number whenever the current
IME/subtype is changed.
3. IMMS notifies the new sequence number to IMM.
4. IMM maintains the last sent sequence number and the next
sequence number. IMM should call #notifyUserAction only
once per particular sequence number.
5. IMMS ignores #notifyUserAction if the specified sequence
number is not the expected one.

BUG: 7043015
Change-Id: I19ad8542659bc092b92ee13eb9f1d68ddd4b815a
ava/com/android/server/InputMethodManagerService.java
e17b2dd7bcc137bf4d842a779e8d62c63957a978 09-Jun-2014 Ji-Hwan Lee <jihwan@google.com> Set mBound only when bind succeeds

Fixes an issue that TV input is disabled forever after package upgrade,
when it's upgraded while in use. The root cause is as below:

- Package is killed while upgrade.
- Service disconnects, and tries to rebind for reconnecting, but bind fails
because service is not available temporarily. Still ServiceState.mBound is
set to true.
- Should rebind next when callback is registered or new session is created,
but doesn't because ServiceState is already marked bound.

Bug: 14981201
Change-Id: Ia5b0acb33f1247064213024438f114bc40238648
ava/com/android/server/tv/TvInputManagerService.java
f43cea009447cb2d3741de94c93c28e2fd413a43 09-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Remove HdmiCecService" into lmp-preview-dev
3f48068d782b81dc1c8a0190b91fbb2862007244 06-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Remove HdmiCecService

The service is replaced with HdmiControlService. Removing all the related
classes and the initialization of the service.

Change-Id: Ic7baaddffb9873613ddd1096e874f226da983939
ava/com/android/server/hdmi/HdmiCecDevice.java
ava/com/android/server/hdmi/HdmiCecDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecDeviceTv.java
ava/com/android/server/hdmi/HdmiCecService.java
ni/Android.mk
ni/com_android_server_hdmi_HdmiCecService.cpp
ni/onload.cpp
fb442b03840245c7e52cf2a540a77c5fc6c54587 08-Jun-2014 RoboErik <epastern@google.com> Add a way to get the package/pid of the session

We need a package/pid to connect a session to a notification. This
adds a way to get those from the controller of a session.

Change-Id: I7700a341beebd46116dfb7dc82f1a667c718e728
ava/com/android/server/media/MediaSessionRecord.java
0791e1713be3df6acfc9e3dfa0dd8be55cf1a165 08-Jun-2014 RoboErik <epastern@google.com> b/15452153 Send 0 delta volume requests

The new code was dropping volume requests with a delta of 0. These
are used to trigger a beep at the end of a volume adjustment.

Change-Id: Idd85cfeaffe78f9aaafb8e6989e240cb70409c1e
ava/com/android/server/media/MediaSessionService.java
df2b878ff4e7b4a258588d3a93574c399db78a07 06-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Fix public API of LinkProperties.

bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Tethering.java
ava/com/android/server/net/IpConfigStore.java
2e7a9167aeefeb451f8d8c769175b9a0163744f3 05-Jun-2014 RoboErik <epastern@google.com> Adds listeners for changes to the list of active sessions

The listeners get notified when sessions are added, removed, or
reprioritized.

Change-Id: I7f3bfc84049719c3b9c19016c6bac92e1a5c3179
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
13b0241248716b126a538457828a964e86109d58 07-Jun-2014 Matthew Williams <mjwilliams@google.com> Add test app for JobScheduler

Schedule either a delay/deadline task, or a task with
connectivity constraints
Change-Id: Ie7ea731d0f6673b680cef79f894cb609a61b795d
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskServiceContext.java
82b3201a95063a1fe51842417c444c0dfd8cf780 07-Jun-2014 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 13ed83ee to master

Change-Id: Ia3739cfa7af60e6a47bf94d403df190f3f2cd082
3c9f70dc86842f78c00d19c9c266b324478bb001 07-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Implement maxRecents and fix TaskPersister bug" into lmp-preview-dev
8c293fecaa4949f81509f99d0457e5f68eb20869 06-Jun-2014 Dan Sandler <dsandler@android.com> am 8612d151: Merge "NoMan: Rank by \'when\' instead of \'postTime\'" into lmp-preview-dev

* commit '8612d151b32e654daf4bb673ab93e402b56dd447':
NoMan: Rank by 'when' instead of 'postTime'
8a17910f81a75dfd395344dfcc548a489f212e45 06-Jun-2014 Amith Yamasani <yamasani@google.com> Fix build breakage in BatteryController

Caused due to a checkin race.

Change-Id: Icb636e4b2258064572b494ee5fcdd30538691d81
ava/com/android/server/task/controllers/BatteryController.java
2a03b2fa1f352f21c49a9758ce567e0c43acce99 06-Jun-2014 Dan Sandler <dsandler@android.com> Merge "NoMan: Rank by 'when' instead of 'postTime'" into lmp-preview-dev
599176b6162bd7127251e937a7042c53c31f982b 06-Jun-2014 Amith Yamasani <yamasani@google.com> Fix build breakage in BatteryController

Caused due to a checkin race.

Change-Id: Icb636e4b2258064572b494ee5fcdd30538691d81
ava/com/android/server/task/controllers/BatteryController.java
d8883df650b77dba3be38fb2ca8980594b901461 06-Jun-2014 Dianne Hackborn <hackbod@google.com> am 87bc3c25: Merge "Improvements to low power mode." into lmp-preview-dev

* commit '87bc3c258d8be516bc0fcedeb6eec34088582061':
Improvements to low power mode.
421e2fd044815f00f0160810a052658abd95c4d8 06-Jun-2014 Dianne Hackborn <hackbod@google.com> Merge "Improvements to low power mode." into lmp-preview-dev
eb94fa7975b1e8742f3b00cec6bd4f9d6b329e3a 04-Jun-2014 Dianne Hackborn <hackbod@google.com> Improvements to low power mode.

Add new public API for monitoring low power mode.

BatteryService now puts device in to low power mode when
battery level is low.

Window manager now watches low power mode to turn off
animations.

Modifying the animator scale now gets propagated to all
processes.

Change-Id: I8fa566994764ddd4e1977631e28381ab9409f8ee
ava/com/android/server/BatteryService.java
ava/com/android/server/VibratorService.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/wm/AccessibilityController.java
ava/com/android/server/wm/AppWindowAnimator.java
ava/com/android/server/wm/Session.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
52b7a5a5973c05fe59b751b82ee357fdfc1c5ef7 06-Jun-2014 Christoph Studer <chstuder@google.com> NoMan: Rank by 'when' instead of 'postTime'

Bug: 15461215
Change-Id: If17e2ff0a6e36ab45da07c2d883fcf8dc8025dc2
ava/com/android/server/notification/NotificationComparator.java
ava/com/android/server/notification/NotificationRecord.java
4bdc93d63e9edc7840a227ea1824f1f7ac93933e 06-Jun-2014 Michael Kolb <kolby@google.com> Merge "Remove circular mask" into klp-modular-dev
59b82c3eae2cd329461b7ad64bd8abee4898a90e 06-Jun-2014 Prashant Malani <pmalani@google.com> am 42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev

* commit '42db3761c9ee3df11a367cbc907f2ba433251634':
DO NOT MERGE Change display state modification during dozing
b8c0383b0c00ed372ab92d3d0a5095c352d3e642 06-Jun-2014 Christopher Tate <ctate@google.com> Relax duplicate-permission-definition constraints slightly

If the permission being redefined by the install-candidate package is
supplied by the system itself, ignore the redefinition but allow the
install.

Bug 14618942

Change-Id: I3d320e446587e528ae175dcd4782e607729caff7
ava/com/android/server/pm/PackageManagerService.java
42db3761c9ee3df11a367cbc907f2ba433251634 06-Jun-2014 Prashant Malani <pmalani@google.com> Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev
31363809b8eb065021d64f12ff4daf7e3f590529 06-Jun-2014 Prashant Malani <pmalani@google.com> Merge "Change display state modification during dozing"
448a4e59adf736e7d76daf715ff191e8a0a7eff5 28-May-2014 Prashant Malani <pmalani@google.com> DO NOT MERGE Change display state modification during dozing

Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.

Bug: 13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
ava/com/android/server/display/DisplayPowerController.java
5ca8f2f0059d0a2b39114678de6352d2ff334d02 05-Jun-2014 Matthew Williams <mjwilliams@google.com> Include forgotten file to fix build.

Change-Id: I4a5ddb6063e5feb18d95ee5c7fe7a126ca59d3b9
ava/com/android/server/task/TaskMapReadFinishedListener.java
910aff5f6b5ba9611db17b493f0a5fdb9c6d746e 05-Jun-2014 Justin Koh <justinkoh@google.com> am 89b6bf5a: DO NOT MERGE Readd removal of notification listener limit on posting

* commit '89b6bf5a118322d923cb9349515f06e32003c6ef':
DO NOT MERGE Readd removal of notification listener limit on posting
eb3bf68b57c0af3e731aab23a4464d15e00af2e7 05-Jun-2014 Matthew Williams <mjwilliams@google.com> Include forgotten file to fix build.

Change-Id: I4a5ddb6063e5feb18d95ee5c7fe7a126ca59d3b9
ava/com/android/server/task/TaskMapReadFinishedListener.java
89b6bf5a118322d923cb9349515f06e32003c6ef 05-Jun-2014 Justin Koh <justinkoh@google.com> DO NOT MERGE Readd removal of notification listener limit on posting

Listener packages are allowed to post > 50 notifications

This reverts commit 500a6b0ca68aaad6140b5af2dae94349be9f7aeb.
ava/com/android/server/notification/NotificationManagerService.java
92e49599e965e015860f0bc5e2950a5b8a562489 05-Jun-2014 Justin Koh <justinkoh@google.com> am c7a5d4a9: am 8200b667: Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev

* commit 'c7a5d4a920a7cd865da93ba56c35403c43c69971':
Revert "Add check to allow notification listener packages to post >50 notifications"
38b200fe6c1aba63b57b315f4274d337545f0c89 05-Jun-2014 Matthew Williams <mjwilliams@google.com> am 1a2f47d4: Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev

* commit '1a2f47d4cdc0ea40dff1b88f7976d64c19d687b1':
Add persistence of tasks for TaskManager & BatteryController
c7a5d4a920a7cd865da93ba56c35403c43c69971 05-Jun-2014 Justin Koh <justinkoh@google.com> am 8200b667: Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev

* commit '8200b667ea75b7d5353343f9e2f22e33b373077e':
Revert "Add check to allow notification listener packages to post >50 notifications"
2e8b27e898af3af1165a79e7c5f8b59f63f20a2f 05-Jun-2014 Michael Kolb <kolby@google.com> Remove circular mask

Change-Id: I83b1caea100d28be2fca46dc0280b05e9b78da44
ava/com/android/server/wm/CircularDisplayMask.java
ava/com/android/server/wm/WindowManagerService.java
8200b667ea75b7d5353343f9e2f22e33b373077e 05-Jun-2014 Justin Koh <justinkoh@google.com> Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev
500a6b0ca68aaad6140b5af2dae94349be9f7aeb 05-Jun-2014 Justin Koh <justinkoh@google.com> Revert "Add check to allow notification listener packages to post >50 notifications"

Broke build.

This reverts commit 2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d.

Change-Id: I2fdf1de21b6598f85bbd94acef44e771b2df9f42
ava/com/android/server/notification/NotificationManagerService.java
3d86fd2bb9db6067c49634bc4c6cdb4d5235ad36 17-May-2014 Matthew Williams <mjwilliams@google.com> Add persistence of tasks for TaskManager & BatteryController

Tasks are persisted only if the client has the RECEIVE_BOOT_COMPLETED
permission. This applies to both periodic and one-off tasks.
Write out task as xml, using PersistableBundle for the extras data.
Todo: Add persistable bundle to xml when ag/468207 is merged.

Also added BatteryController logic.

Change-Id: I23eeeb8b3bc6ba155e7fa4ec25857a68ee8b1567
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskStore.java
ava/com/android/server/task/controllers/BatteryController.java
ava/com/android/server/task/controllers/ConnectivityController.java
ava/com/android/server/task/controllers/IdleController.java
ava/com/android/server/task/controllers/StateController.java
ava/com/android/server/task/controllers/TaskStatus.java
ava/com/android/server/task/controllers/TimeController.java
29dee1bbba40976f4bb1122d134a0444b0ecb953 05-Jun-2014 Justin Koh <justinkoh@google.com> am 2304bf4c: am 2be3d6f9: Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev

* commit '2304bf4cd4e377994d80f55871fd31f82bb4f646':
Add check to allow notification listener packages to post >50 notifications
2304bf4cd4e377994d80f55871fd31f82bb4f646 05-Jun-2014 Justin Koh <justinkoh@google.com> am 2be3d6f9: Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev

* commit '2be3d6f9361311c1d272965afcd602ae12c769af':
Add check to allow notification listener packages to post >50 notifications
2be3d6f9361311c1d272965afcd602ae12c769af 05-Jun-2014 Justin Koh <justinkoh@google.com> Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev
38f650818a6a0d2e4f87c6d67c0f57b2720fcb82 05-Jun-2014 Chris Wren <cwren@android.com> am 413edd50: Merge "Disable the attention light on devices that do not have it." into lmp-preview-dev

* commit '413edd50540a7890949c5370d18f293f2e6f8841':
Disable the attention light on devices that do not have it.
ffcfcaadfefec2fb56f67a0a614a54bf4599d62b 05-Jun-2014 Craig Mautner <cmautner@google.com> Implement maxRecents and fix TaskPersister bug

Activities can now set the maximum number of times that they will
appear in the recent task lists when using DocCentric mode. The
default number is 15, the min 1, and the max 100.

Also a bug in TaskPersister that deleted files because it did not
properly parse their task ids is fixed.

Fixes bug 13736052.

Change-Id: I7ccb4e6f89d6202ff31c8577bb7b9d8d1b7e5e8d
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/TaskPersister.java
ava/com/android/server/am/TaskRecord.java
b5acfc6c4aec62c68c10b2f9f056dec2bd7a4dfb 05-Jun-2014 Chris Wren <cwren@android.com> am 89dcfe66: Merge "A notification that emerges from Zen Mode interception should beep." into lmp-preview-dev

* commit '89dcfe66c9101a4124d121d1c8df98e5cd8b7798':
A notification that emerges from Zen Mode interception should beep.
5116a821b9507b16bdfa8549a65556493813e111 04-Jun-2014 Chris Wren <cwren@android.com> Disable the attention light on devices that do not have it.

If the attention and notificaiton light are mapped to the same
physical LED, then pulsing the attention light can turn off the
notification light. See bug for detailed discussion.

Bug: 12900389
Change-Id: I2703af23f50ecc3e92140b9843aaf340d520bce5
ava/com/android/server/notification/NotificationManagerService.java
a344656a010dc3c88aef39109f1ac459792e7607 04-Jun-2014 Chris Wren <cwren@android.com> A notification that emerges from Zen Mode interception should beep.

If a notificaiton emerges from Zen Mode due to a ranking
reconsideration (possibly because a long-running query resolved an
important person) then it should get the oportunity buzz, beep, blink,
and send accessibility events.

Save what we need to know about the old notificaiton record on the new
record so we don't have to hold onto it.

Bug: 15383458
Change-Id: I15c7834fef03ff6a676e78e9d2caae24f00720ef
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationRecord.java
bd1205615443d7daa1498ae4e09e4cd22163e5c4 05-Jun-2014 Yohei Yukawa <yukawa@google.com> Merge "Trivial method renaming for notifyTextCommitted"
0297051162193ef2b7d906409868e404f77e4c31 05-Jun-2014 Yohei Yukawa <yukawa@google.com> Trivial method renaming for notifyTextCommitted

This CL does not change existing behavior but only renames
notifyTextCommitted with notifyUserAction so that we can use
not only text commit but also other actions such as just typing
a character will be used as a trigger to update the IME
rotation order for better IME switching experience.

BUG: 7043015
Change-Id: I7f3e13a7226ef0dceee82b67e8a0d8536f7e9807
ava/com/android/server/InputMethodManagerService.java
d5259c8ea5e94912e1e3758701121d7f6388c052 05-Jun-2014 Adam Connors <adamconnors@google.com> Merge "Allow system process to call getApplicationBlockedAsUser"
1a910ef2b40de91e834a5a82d9b75d117a45da04 05-Jun-2014 Adam Connors <adamconnors@google.com> Allow system process to call getApplicationBlockedAsUser

MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.

Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
ava/com/android/server/pm/PackageManagerService.java
2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d 04-Jun-2014 Justin Koh <justinkoh@google.com> Add check to allow notification listener packages to post >50 notifications

Bug: 13433398
Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68
ava/com/android/server/notification/NotificationManagerService.java
b6011c1c2a2452174c7ce973e1867b912996081d 05-Jun-2014 Craig Mautner <cmautner@google.com> Merge commit '21483b9f' into manualmerge

Change-Id: If9261cc1625f9f492697fe16c21d2b71c0cc0e11
21483b9f0b5a92aec10d858d9e3525abd190504c 05-Jun-2014 Craig Mautner <cmautner@google.com> am e34fcf8f: Merge "Add callback when ActivityView activities complete" into klp-modular-dev

* commit 'e34fcf8ff9a023641505a8decdeb1b77232d8a16':
Add callback when ActivityView activities complete
e34fcf8ff9a023641505a8decdeb1b77232d8a16 05-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Add callback when ActivityView activities complete" into klp-modular-dev
0f8b4b770c49b83fa8260833d8e1ec5c721a05d3 28-May-2014 Jungshik Jang <jayjang@google.com> Implement hotplug detection sequence.

Hotplug detection is periodic operation to detect new/removed device.
In case of directly connected device fires hotplug devices
but remote devices which are plugged in hdmi switch may not
report their existence.
Hotplug action polls all devices in regular base; 5s for
system audio (only when it's active) 15s for others.

Change-Id: I77c308ecfd5d6bf92f306923fa5ac9eabdad4127
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HotplugDetectionAction.java
3ee65720e91c7f92ad5a034d7052122a606aa8d5 03-Jun-2014 Jungshik Jang <jayjang@google.com> Refactor HdmiCecLocalDevice and logical address allocation logic.

1. Factor out logical allocation logic to HdmiControlService.
2. Contains a reference to HdmiControlService rather than
HdmiCecController so that it enables to access service's logic
directly.
3. Move launch device discovery logic to HdmiCecLocalDeviceTv.

Change-Id: Ic97b4d51311a3c18f6d586c2245cac410cbd370e
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
d94b47f3b671f5afbc79b061a9b8fa7aa8b22f87 03-Jun-2014 Craig Mautner <cmautner@google.com> Add callback when ActivityView activities complete

Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.

Fixes bug 15330616.

Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
6a5cacb8683ddd78fc78f01ef726f410bf4e0479 28-May-2014 Prashant Malani <pmalani@google.com> Change display state modification during dozing

Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.

Bug: 13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
ava/com/android/server/display/DisplayPowerController.java
c55929a2a5686fe456b19cd54a73b8bde2a4332b 25-May-2014 Prashant Malani <pmalani@google.com> Add call to set power mode for display

The blank/unblank interface is being replaced by a generic
setPowerMode() call. This will allow the support of low power modes in
displays where such functionality is available. Currently three modes
are defined:

- POWER_MODE_OFF
- POWER_MODE_DOZE
- POWER_MODE_NORMAL

POWER_MODE_OFF would be analogous to blanking the screen,
POWER_MODE_NORMAL akin to unblanking it, and POWER_MODE_DOZE would
trigger an entry into the display's low power mode.

We also tie the JNI call to set power mode to the call from services which
actually invokes it.

The generic setPowerMode() call can be expanded to potentially include
other display power states.

Bug: 13472578
Change-Id: I74677506d3ee2ccc50ba70c5102d96b31fe7b837
Signed-off-by: Prashant Malani <pmalani@google.com>
ava/com/android/server/display/LocalDisplayAdapter.java
64939ae385edf615ac2912060df5624dbaf57cab 04-Jun-2014 Matthew Williams <mjwilliams@google.com> DO NOT MERGE Redact SyncService stuff from master

Cherry-pick over from master.
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851

Change-Id: Ieebbbcd3324827098e88b36e45e6e82315a51e65
ava/com/android/server/content/ContentService.java
ava/com/android/server/content/SyncStorageEngine.java
4b8bb98d63c5a305d49d96f62eb72bda0ed1a191 05-Jun-2014 Matthew Williams <mjwilliams@google.com> Merge "Redact SyncService stuff from master"
5a9decd589f3f6a512168fd669ee2c5d8daa238b 04-Jun-2014 Matthew Williams <mjwilliams@google.com> Redact SyncService stuff from master

This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851
Change-Id: Ibefbb246f0e98d3159399151744279902468a23c
ava/com/android/server/content/ContentService.java
ava/com/android/server/content/SyncStorageEngine.java
7f2d5162fd19345945d54cc864b3cc82bea35a2e 04-Jun-2014 Robin Lee <rgl@google.com> am c774caff: am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"

* commit 'c774caff86d2e5dc5ca3a0008007cb0fd384568b':
Assign AID_EVERYONE gid to newly-created processes
c774caff86d2e5dc5ca3a0008007cb0fd384568b 04-Jun-2014 Robin Lee <rgl@google.com> am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes"

* commit '4891a9f9cfee569c0d362f1781f44493f5e320c0':
Assign AID_EVERYONE gid to newly-created processes
b4df2f586ad7b5a0387489401de0c83203610ba9 04-Jun-2014 Adrian Roos <roosa@google.com> am b2302d43: Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev

* commit 'b2302d437fd636d9973f466062cfad145cdd042d':
Ensure trust agents are only provided by platform packages
8ae980dcef1265f69fe41338f17266c2a8ec8d20 04-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE Report new network scores back to factories.

This is a first order approx of what we want - should probably be good enough in most cases.

bug:15277751

Change-Id: I10e3b25f6ad5c7e022ba966ed514d4e6a999180d
(cherry picked from commit 94a5c61cb82401dd777d0a7ac43183d92d955323)
ava/com/android/server/ConnectivityService.java
a995aba36fff573e30859e29a736e151e56fb50a 04-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Report new network scores back to factories."
52dea94557f93f52735cb0d44416f35896bca13d 04-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> am cffe6d73: Merge "Fix legacy APIs." into lmp-preview-dev

* commit 'cffe6d7315bc364d913e6a7daf1b62b7d173bfb7':
Fix legacy APIs.
ed021011dd305373c6039cd2176ffd53db14198f 04-Jun-2014 Dianne Hackborn <hackbod@google.com> am b96802d0: Merge "Force write battery stats after a --history-since." into lmp-preview-dev

* commit 'b96802d03cc5eb047a2be711a8d14d82498753e7':
Force write battery stats after a --history-since.
f3f8a73a57a34b405e73c83af8f4d42e9592079c 04-Jun-2014 Craig Mautner <cmautner@google.com> am 05cd6c39: Merge "Force all windows to redraw before unblanking screen" into lmp-preview-dev

* commit '05cd6c39824653e0f7e8641444a7134e8cac72f4':
Force all windows to redraw before unblanking screen
7b92af62b8334541744097e488a493497065c0fb 04-Jun-2014 John Spurlock <jspurlock@google.com> am 7e127344: Zen: Stateful condition panel.

* commit '7e12734486152ee4f6467e13e6b4cdd3a9c7bf8d':
Zen: Stateful condition panel.
ac96c52350a16706570f97491034fa8565c42a5e 04-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Report new network scores back to factories.

This is a first order approx of what we want - should probably be good enough in most cases.

bug:15277751

Change-Id: I10e3b25f6ad5c7e022ba966ed514d4e6a999180d
ava/com/android/server/ConnectivityService.java
30591cc1abb05c61bc63e358ba68680e7b21753e 04-Jun-2014 Chris Wren <cwren@android.com> am 1e58ac1d: Merge "Apply Zen Mode later, after we\'ve found the old record." into lmp-preview-dev

* commit '1e58ac1d71b630435c3e69180d9e92662c6f65dd':
Apply Zen Mode later, after we've found the old record.
450758a55cc625cc12bf818390cc1899ad0a74bc 04-Jun-2014 Dongwon Kang <dwkang@google.com> am 65d95bfa: Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev

* commit '65d95bfa011fa50e50403f41e08afa2af5d9746e':
Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.
1e9021aef89d53eb08d0e8a4e017c9e79d260241 04-Jun-2014 Adrian Roos <roosa@google.com> Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev
a07557471e43226fd23f6447c1e61177726524c9 04-Jun-2014 Yohei Yukawa <yukawa@google.com> Hardening token validation in InputMethodManagerService

This CL adds missing token validations in
InputMethodManagerService#switchToNextInputMethod and
InputMethodManagerService#shouldOfferSwitchingToNextInputMethod.

This CL also fixes a possible race condition when validating
the token in InputMethodManagerService#updateStatusIcon.

BUG: 15420379
Change-Id: I043aa30a19c821f33effd57dfd6590b0e3ed817b
ava/com/android/server/InputMethodManagerService.java
22c97be73b2686a4a06cf31d0b211f47e7b92595 04-Jun-2014 Yohei Yukawa <yukawa@google.com> Remove code duplication in InputMethodManagerService

This is a groundwork for the subsequent fix. It should not change
existing behavior.

BUG: 15420379
Change-Id: I106b3f50731c799e06b26d1eab9c6a406c06d78c
ava/com/android/server/InputMethodManagerService.java
4e02bc6f8fa64d8a8398371836e2e9abf3be3070 04-Jun-2014 Yohei Yukawa <yukawa@google.com> Remove redundant synchronization blocks from IMMS

This is a groundwork for the subsequent fix. It should not change
existing behavior.

BUG: 15420379
Change-Id: I6f81ec77e748a8c7c26ffa1f5faf39684b210ae4
ava/com/android/server/InputMethodManagerService.java
7722b379efe7528ffbcd9fc23a99fd155b6cd298 04-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix legacy APIs." into lmp-preview-dev
7737ab44b1a3c1e6afe2957006cdec6ecda63a86 04-Jun-2014 Dianne Hackborn <hackbod@google.com> Merge "Force write battery stats after a --history-since." into lmp-preview-dev
16b0b56c79ee0bd068ce47ce4460c24b5e62311d 04-Jun-2014 Dianne Hackborn <hackbod@google.com> Force write battery stats after a --history-since.

This should help the stats be more consistent across
system restarts.

Change-Id: If1736608373aada8b55d72ecf80fbbc52bd288bd
ava/com/android/server/am/BatteryStatsService.java
2d37070ec13df5650093f8967655938298290ee7 04-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Fix legacy APIs.

Two fixes. First make sure we mark the request as handled by the network handling it.
Second, convert ensureRouteToHostForAddress to use the new legacyNetworkForType.

bug:14993207
Change-Id: I230968938ca0ed91f834b36a2af60caff2eab682
ava/com/android/server/ConnectivityService.java
4021b3ba74471b35e510543b765a2265eff9912a 04-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Force all windows to redraw before unblanking screen" into lmp-preview-dev
8a0da0184f6c5c95d94ab6adfee79bace4040abd 01-Jun-2014 Craig Mautner <cmautner@google.com> Force all windows to redraw before unblanking screen

The screen turning on would show windows as they were when the screen
turned off. This fix forces all showing windows to redraw first and
only then allow the screen to turn on.

Fixes bug 15092354.

Change-Id: I52c3f47438176a5ac00ba9a4d5205b56a5aa48f9
ava/com/android/server/wm/WindowManagerService.java
856edebad73560e9b1cce021a7de9a0470d07176 02-Jun-2014 John Spurlock <jspurlock@google.com> Zen: Stateful condition panel.

When DND is on, expanded panel shows the current time
condition, or time remaining. The last time bucket
selected is remembered as the default option for the
next time.

Move the server-side countdown helper into a proper
condition provider, but register it in-process as a
system provider.

Move common countdown condition parsing into ZenModeConfig
to reuse from system components.

Keep the manual exit condition around in zen mode config
and add plumbing for getting / listening to the
controller.

Keep the last QS detail panel around instead of
recreating it every time.

Fix the time condition's plus and minus button
enabling logic, and enhance the click handler to
deal properly with the next or previous bucket.

Bug:15344758
Change-Id: Ie7018a1c20e20f6d7e5f9e7874188374e6f8e2ab
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/CountdownConditionProvider.java
ava/com/android/server/notification/NotificationManagerService.java
22af5b842869abff5418263e6fb0b4b925077629 04-Jun-2014 Craig Mautner <cmautner@google.com> am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev

* commit '81dfc082d2add8463469e3eac9db94d6d93005ce':
Force all windows to redraw before unblanking screen
81dfc082d2add8463469e3eac9db94d6d93005ce 04-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev
919902a0de62d4cddc5a2861ddeb56753565b4fa 03-Jun-2014 destradaa <destradaa@google.com> Merge "Re-work the initialization of FLP HAL to make isSupported() static. b/14839888"
52eba54eca02ef0b38e91490d10f9a697cbcb502 02-Jun-2014 Chris Wren <cwren@android.com> Apply Zen Mode later, after we've found the old record.

Copy the extracted signales from the previous record to the new
record. Do this before the signal extractors are called so that code
can decide what to do with the information.

Bug: 15383769
Change-Id: Ifa24fa0e4380f08979c2126b63d29794aa50a787
ava/com/android/server/notification/NotificationManagerService.java
9a7a805124a944312a5820330a1854159fb2c858 03-Jun-2014 Michael Kolb <kolby@google.com> am a4f593d7: am 576a0d14: Merge "Fix circular mask" into klp-modular-dev

* commit 'a4f593d7fb205b56412e3091fb21c592abe934cf':
Fix circular mask
5ce66d8dcc786b3d6a0fdfb42074e6c9741590ef 29-May-2014 destradaa <destradaa@google.com> Re-work the initialization of FLP HAL to make isSupported() static.
b/14839888

Change-Id: Ib5973586fd8a2d4a1e5fd09cf82dd4f4493398d0
ava/com/android/server/LocationManagerService.java
ava/com/android/server/location/FlpHardwareProvider.java
ni/com_android_server_location_FlpHardwareProvider.cpp
a4f593d7fb205b56412e3091fb21c592abe934cf 03-Jun-2014 Michael Kolb <kolby@google.com> am 576a0d14: Merge "Fix circular mask" into klp-modular-dev

* commit '576a0d14e19dae9fa6aa50e0bb836a1da793ef21':
Fix circular mask
2e0bacc2a363a6cb304c926f513705af17699821 03-Jun-2014 Jae Seo <jaeseo@google.com> am 594ac157: Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev

* commit '594ac1575f8301023d37c329f8c676ba9bda396c':
TvContract: Address the feedback from the API review
8d2d5c8d5caaf27ffe78841f42d958c8c9db1167 03-Jun-2014 Sungsoo Lim <sungsoo@google.com> am 61e4b1cf: Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev

* commit '61e4b1cf302ea659329952dfcebffb2f387bff3f':
Add ClientState for handling the crash of clients.
f573765bf1a70d3af7d6149fb01dbe0f74f95834 03-Jun-2014 Chulwoo Lee <chulwoo@google.com> am b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev

* commit 'b9c0a8ae7b0e69829a663fa2ca6bbdededa02d93':
Add a way to get the class name of SetupActivity and SettingsActivity
bcaffd05862b18a13d3aac5cbfc9114adf9ba595 03-Jun-2014 Dianne Hackborn <hackbod@google.com> am da4a186f: Merge "Some battery stats history fixes." into lmp-preview-dev

* commit 'da4a186f8bf49d8ea06d5ad6d402d9b073ee3841':
Some battery stats history fixes.
4c9e57f156d3cbd86b38e9897dfdab81964efe90 03-Jun-2014 Jae Seo <jaeseo@google.com> resolved conflicts for merge of ebe661c4 to master

Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
32aa65a11207e1fb7d346a68fdf3299f87a20db4 03-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Fix Legacy NetworkInfo API

Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.

bug:15290306
bug:15191336
bug:14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866
(cherry picked from commit 16fe1c18289de200d2249e51db8c0986619f487b)
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
c32a244e907719e03d0fae42b20401dcd2c595fc 03-Jun-2014 Narayan Kamath <narayan@google.com> am dd2e9d33: am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."

* commit 'dd2e9d3386d2d74f99f79bcad951ff5cdefa6fab':
Scan for renderscript files before deciding ABIs.
18ea893a2319e2a192188d2288bb881149c9b06e 28-May-2014 Adrian Roos <roosa@google.com> Ensure trust agents are only provided by platform packages

Prevents the TrustManagerService from binding to any non-platform
trust agents and updates the SampleTrustAgent to use the new
permission.

Bug: 15287044
Change-Id: I38c3deebd5ad359075e68f52d19417bab5ab43db
ava/com/android/server/trust/TrustManagerService.java
522a0278065b929e0d75d1d118e26a39ed57f010 03-Jun-2014 Narayan Kamath <narayan@google.com> am 41aa48be: am 032c5c05: Merge "Log process abis during start."

* commit '41aa48beacc93a1511a290e91293402eeb787165':
Log process abis during start.
dd2e9d3386d2d74f99f79bcad951ff5cdefa6fab 03-Jun-2014 Narayan Kamath <narayan@google.com> am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."

* commit '7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
Scan for renderscript files before deciding ABIs.
797b109c60bda8e122075b0c2101d3f2a0b67c07 03-Jun-2014 Narayan Kamath <narayan@google.com> am 7ed98c43: Merge "Add an --abi argument to "pm install""

* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
Add an --abi argument to "pm install"
41aa48beacc93a1511a290e91293402eeb787165 03-Jun-2014 Narayan Kamath <narayan@google.com> am 032c5c05: Merge "Log process abis during start."

* commit '032c5c054c331b63f2d45ee9c497ac852faec633':
Log process abis during start.
dad8f819a710510be28e9fdeee84f9b5b2ddacbf 03-Jun-2014 Narayan Kamath <narayan@google.com> Merge "Add an --abi argument to "pm install""
e4d7fc02ab0c333f5cd898928f97e7bce812dfa0 03-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Fix Legacy NetworkInfo API"
b90b20b5d57809da5c91bac9ff45c2ac323d9637 03-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Fix Legacy NetworkInfo API

Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.

bug:15290306
bug:15191336
bug:14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
116bdbd823b607d860b039ec334a1f985eed7a7f 29-May-2014 Narayan Kamath <narayan@google.com> Add an --abi argument to "pm install"

This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

bug: 14453227

(cherry picked from commit 6431d11cd420536aaa9d93ae510a3151ccc4df1d)

Change-Id: I85d4f8785deea02a6a4d3cb0b05e6ef8bf64826b
ava/com/android/server/pm/PackageManagerService.java
71b197a0a36483f931f3700a9d50cb97212a5d84 03-Jun-2014 Yuncheol Heo <ycheo@google.com> Merge "Add SystemAudioAction(FromAvr|FromTv)."
63a2e0696ce2a04fbe0f1f00cfe9c93189f944da 27-May-2014 Yuncheol Heo <ycheo@google.com> Add SystemAudioAction(FromAvr|FromTv).

The system audio can be initiated by Tv itself or by AVR through
<Set System Audio Mode> CEC message.

This CL also includes:
- Add HdmiConstants, HdmiUtil class to handle various constants and
utility functions.
- Add default message dispatcher to all queued actions.
- Add an argument on HdmiControlService.removeAction(class) to prevent
from removing the caller itself.

Change-Id: I9fd9089bed876f04b58c483879b64edfae94a298
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiConstants.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/HdmiUtils.java
ava/com/android/server/hdmi/RequestArcAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
ava/com/android/server/hdmi/SystemAudioAction.java
ava/com/android/server/hdmi/SystemAudioActionFromAvr.java
ava/com/android/server/hdmi/SystemAudioActionFromTv.java
228742d2781c2c6b924e2c2dc0ac2a6b62e33e10 01-Jun-2014 Craig Mautner <cmautner@google.com> Force all windows to redraw before unblanking screen

The screen turning on would show windows as they were when the screen
turned off. This fix forces all showing windows to redraw first and
only then allow the screen to turn on.

Fixes bug 15092354.

Change-Id: I349995bf6446d6c462dccdc2b599bab9ab0ab2c8
ava/com/android/server/wm/WindowManagerService.java
10621710900981a1e01cb53efa2a2f96f890b633 03-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Refactor NetworkFactory." into lmp-preview-dev
7b2ae34b97943a4dfe3fa6b5c1c74f415b468993 03-Jun-2014 Dongwon Kang <dwkang@google.com> Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev
55691b8cc725297e0d36799e234cba3c8c3410f6 27-May-2014 Robert Greenwalt <rgreenwalt@google.com> Refactor NetworkFactory.

Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use. Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
(cherry picked from commit 9a17b9c5a256cb4bb14821c5ee89b03b99c045e8)
ava/com/android/server/ConnectivityService.java
49fa8e15baa4aeeb7cc2581ce9c2d8689973c8c7 03-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Rewrite startUsingNetworkFeature for new API" into lmp-preview-dev
a3be12a236aef0d9c4ff1274075f1e7899d29153 02-Jun-2014 Dongwon Kang <dwkang@google.com> Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.

Bug: 14628404
Change-Id: I40abf647e9d608c2c793d007fd2fe0d511535bdd
ava/com/android/server/tv/TvInputManagerService.java
6fbe3982b035c200543454bb29b9f3e33b5e347a 03-Jun-2014 Jae Seo <jaeseo@google.com> Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev
5a26f00c846f62e5c5039923d7d6de2ac04c4436 03-Jun-2014 Sungsoo Lim <sungsoo@google.com> Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev
72ad7bf915ce40d8437a4ee2518ae07b73502e12 14-May-2014 Sungsoo Lim <sungsoo@google.com> Add ClientState for handling the crash of clients.

Bug: 15054040
Change-Id: I4dd8d1c350186fe705daa20c9944bc8e4dd556c2
ava/com/android/server/tv/TvInputManagerService.java
e7bb7d6bb2257c24076f5a4b9f536f90a6637f58 27-May-2014 Chulwoo Lee <chulwoo@google.com> Add a way to get the class name of SetupActivity and SettingsActivity

Now, there can be only one SetupActivity and one SettingsActivity for
one TIS apk though one TIS apk can contain several services. Each TIS
need to be able to have its own SetupActivity and SettingsActivity.

BUG: 15177340
Change-Id: I2d944e3ef35c3a981483ba643fd27b15925bab16
ava/com/android/server/tv/TvInputManagerService.java
bd23fa0ba1460a8d5194fd7c700030bf9c3f6fcb 01-Jun-2014 Jae Seo <jaeseo@google.com> TvContract: Address the feedback from the API review

This change addresses the following comments from the council:
- Provider authority should be "android.media.tv"
- Rename COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA and add comment to
indicate data is internal to the provider that inserted it, and should
not be decoded by other apps. It would be nice to restrict read access
to this column, but not essential.
- Hide COLUMN_LOCKED since implementation isn't defined yet, also
questions about how it interacts with Unicorn.
- Fix typo in ORIGINAL_NETWORK documentation.
- All provider MIME types need to be changed to follow platform
conventions: "vnd.android.cursor.dir/channel",
"vnd.android.cursor.dir/program", etc. (Notice singular tense and no
package prefixes since they're part of the platform API.)
- Rename Programs.COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA, along
with docs update, for the same reasons as above.
- Rename COLUMN_DESCRIPTION to COLUMN_SHORT_DESCRIPTION and update docs
to indicate it's a recommended maximum length, not a hard cap.
- COLUMN_GENRE should be split into two columns: COLUMN_BROADCAST_GENRE
(from broadcast standard) and COLUMN_CANONICAL_GENRE (from an Android
standard). Define a subclass with the Android canonical genres, which
are simple strings that are comma-separated when inserted into
COLUMN_CANONICAL_GENRE.

Bug: 15345342
Change-Id: I7f8e70aef617475a59d096fd73a551e7df8a1d3a
ava/com/android/server/tv/TvInputManagerService.java
562cc54536f1e75d80855de4d1eccaeefd689a32 16-May-2014 Robert Greenwalt <rgreenwalt@google.com> Rewrite startUsingNetworkFeature for new API

bug:14993207
Change-Id: I041a80faa07bf3094af13a6c606f3b15aa03f789
(cherry picked from commit 09fe5e618b09965183cf53fba87c39025a19e8d1)
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
3192dec32180f56733e631c2d9ec62fa1359283d 27-May-2014 Robert Greenwalt <rgreenwalt@google.com> Refactor NetworkFactory.

Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use. Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
ava/com/android/server/ConnectivityService.java
8f3799867d2c3322a7191803b2dda54583305ea0 03-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Rewrite startUsingNetworkFeature for new API"
0bec638839b0a07502ff27c9dcf4419b3c47a0d2 03-Jun-2014 Dianne Hackborn <hackbod@google.com> Merge "Some battery stats history fixes." into lmp-preview-dev
8d2a604ce4fc7666399e21f2ab9c1cdb98c5563a 03-Jun-2014 Craig Mautner <cmautner@google.com> am 39317b97: Merge "Compare task userId with userId profiles." into lmp-preview-dev

* commit '39317b9742cf796557583f6678a7443a991414f7':
Compare task userId with userId profiles.
3c784d6359f15a5451b670a18384e9ae3c9aa276 02-Jun-2014 Jae Seo <jaeseo@google.com> Merge "Put TV Input Framework under android.media.tv, including TvContract" into lmp-preview-dev
481acb86e435d1c9d7d7f744941619ca509906af 02-Jun-2014 Craig Mautner <cmautner@google.com> Merge "Compare task userId with userId profiles." into lmp-preview-dev
fc0641340ff927d9c35d5613723d25858f751118 02-Jun-2014 Dianne Hackborn <hackbod@google.com> Some battery stats history fixes.

- Now the full wake history uses the history tag if it can.
Hopefully this will still result in a consistent history,
since that isn't really want the tag is for... but the
current implementation in places will probably make this work.

- Possibly fix a bug with inconsistent state between partial
history snapshots: after a snapshot is printed, don't allow
any more batching into the most recent history entry, so the
next snapshot will not miss anything that might get placed
into it soon after.

Also rework command line arguments for enable/disable to make these
commands instead of options.

Change-Id: Ia33445cad1538bf8df549cef284f1e736efbc079
ava/com/android/server/am/BatteryStatsService.java
d5cc4a281e7ce29d1e8687ff3394b57a3a549260 31-May-2014 Jae Seo <jaeseo@google.com> Put TV Input Framework under android.media.tv, including TvContract

Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
ava/com/android/server/tv/TvInputHal.java
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
ni/com_android_server_tv_TvInputHal.cpp
830fd7036e7287df90d1889a43f6f8d3560c48bd 02-Jun-2014 RoboErik <epastern@google.com> am c7ed6f69: Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev

* commit 'c7ed6f69d474f23df89d36ed94ff0062daa8dcbc':
Minimum work to make volume handling work with sessions
e0d50cc15be2c8aa9e4a4aa6cf34cc7cf23c9109 02-Jun-2014 Craig Mautner <cmautner@google.com> Compare task userId with userId profiles.

Change comparison of Task.mUserId from comparing with only the
current user id to comparing with all current profile user ids.

Fixes bug 14930145.

Change-Id: Ibbae08da6f4eaa31b171becdd8957293758f527b
ava/com/android/server/wm/TaskStack.java
e78755e180c4f29ccc324112286dd81ab2016c40 02-Jun-2014 RoboErik <epastern@google.com> Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev
f3bbf2b80167faa0091ad31511405283792408a9 02-Jun-2014 Nicolas Prevot <nprevot@google.com> Merge "Small fix related to cross-profile result intents."
6b942b8c52f7071ae6c590f3080c7e52dfef7d9e 02-Jun-2014 Nicolas Prevot <nprevot@google.com> Small fix related to cross-profile result intents.

Change-Id: Id99d6406cdd8ceddacf6fee0cf66e7e59d749a15
ava/com/android/server/am/ActivityStack.java
9ec2eabe5ae9b17064412833ae11b113da453b75 02-Jun-2014 Florin Malita <fmalita@google.com> Merge "Add a native Canvas wrapper."
dc31af2d4ffa069fe87f4b748995c2616eae5a5f 02-Jun-2014 Amith Yamasani <yamasani@google.com> Merge "Handle saving and restoring ints in application restrictions"
5b5aa4072fb58aea47f523c724878c579adae294 02-Jun-2014 Amith Yamasani <yamasani@google.com> Handle saving and restoring ints in application restrictions

Unit tests for restrictions types and proper escaping.

Change-Id: Iac35521faf5798398a89fecbad82fcdd256a4146
ava/com/android/server/pm/UserManagerService.java
3ef57d99b3b1b751097d58c6c1b98db123d5ccc5 29-May-2014 Jungshik Jang <jayjang@google.com> DO NOT MERGE: Start Device Discovery after logical address allocation.

Usually TV initiates Device Discovery sequence after logical address
allocation of local devices. For that added new callback interface
to AddressAllocationCallback to HdmiCecDevice.
Along with this, add onAddressAllocated to HdmiLocalDevice so that
start sending local device information once logical allocation is done.

Change-Id: I4cdc5dd7770674a17a0f23c383a6c1ca221e3104
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
e74282b70b4a8ad1186fdc32204e1ecee16cd901 29-May-2014 Jinsuk Kim <jinsukkim@google.com> DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService

HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
ava/com/android/server/hdmi/HdmiCecService.java
ava/com/android/server/hdmi/HdmiControlService.java
ni/com_android_server_hdmi_HdmiCecController.cpp
48a0729d621d55b7b1d256106dbc9421b147ee89 28-May-2014 Jinsuk Kim <jinsukkim@google.com> DO NOT MERGE: Do not reply with <Feature Abort> to CEC Broadcast message

Broadcast message is not targeted to a specific device but for
announcement. Individual reponse with <Feature Abort> is neither
necessary nor useful. Changed to send the message back only for
direct messages.

Change-Id: I927aa8e58a9868e158ed945c753492207e7c97f6
ava/com/android/server/hdmi/HdmiCecController.java
e1e63c7c54b8a6a5d5d207bcedd08d2f8ac2465e 28-May-2014 Jinsuk Kim <jinsukkim@google.com> DO NOT MERGE: Dispatch incoming CEC messages to feature actions

This CL dispatches incoming CEC messages to feature actions that
the service manages.

Change-Id: I9221d6a25648846327d00fe5404aaf1e8ec786ce
ava/com/android/server/hdmi/HdmiControlService.java
d42a7a322b7adf532ae0b70cb9eb1df7e62a8f2d 27-May-2014 Jungshik Jang <jayjang@google.com> DO NOT MERGE: Implement device discovery sequence.

When device discover is launched it goes through the following step

1. clear all existing devices
2. send <Polling Message> of all logical addresses
excecpt one of local device
3. Once got all allocated logical addresses, gather physical address of
them
4. Once got physical address of them, gather display name of them
5. Once got display names, gather vendor id of them
5. Once got vendor id of them, register all gathered info to
internal device info list.

Change-Id: Ic9aca3b15d88ac7650f10b6d0bfa9c97923975e8
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
a8fd44b74b8822426cdc0e45351899c95bf30e16 28-May-2014 Jinsuk Kim <jinsukkim@google.com> DO NOT MERGE: Fix a couple of bugs in CEC services

- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable

Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
ava/com/android/server/hdmi/FeatureAction.java
c47e26ca2ff6f032c4b3a094810b1d1062bcb1ff 27-May-2014 Jungshik Jang <jayjang@google.com> DO NOT MERGE: Add cec message handler to hdmi cec jni implementation

Notification for incoming cec message can be issued
from any thread but jni can call java method
in the thread that jni knows like service thread.
So this change delegates incoming message to
jni-friendly thread, service thread by exploit
looper of service thread.

Change-Id: If3b141d917df3e209912af1778eb509777199969
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ni/com_android_server_hdmi_HdmiCecController.cpp
2c2a3017624678ee65d92feb51340f542a1d244c 27-May-2014 Jinsuk Kim <jinsukkim@google.com> DO NOT MERGE: Fix a bug using wrong addresses for CEC logical address allocation

Change-Id: I41da586c16dca4f325d147bb3abe5d4e09f7b91c
ava/com/android/server/hdmi/HdmiCecController.java
16e24a2d143345b2052ea7ccbe85fcda6d843608 26-May-2014 Jinsuk Kim <jinsukkim@google.com> DO NOT MERGE: 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
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
562ef5c513a859b3d2b0f54c15f25e4ec3ec9f7a 26-May-2014 Jungshik Jang <jayjang@google.com> DO NOT MERGE: Add HdmiCecDeviceInfo to HdmiCecLocalDevice

As HdmiCecLoclaDevice is a wrapper for local devices
it should include cec device info.

Change-Id: I479665b2aa6bd56470b79dbbb7fb1015f6356090
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
9d499bfe4a52068fd0c25b3cce34bd5e445e0f96 23-May-2014 Jungshik Jang <jayjang@google.com> DO NOT MERGE: 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
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
61ced38d61926bc28638d805436086db22b642c3 23-May-2014 Yuncheol Heo <ycheo@google.com> DO NOT MERGE: 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
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/RequestArcInitiationAction.java
ava/com/android/server/hdmi/RequestArcTerminationAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
47927f756a0f694358567cec845b53ab3fc980e9 20-May-2014 Jinsuk Kim <jinsukkim@google.com> DO NOT MERGE: 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
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
404d704158d068c9b1f066ec647461f0f9ec22cd 22-May-2014 Jungshik Jang <jayjang@google.com> DO NOT MERGE: 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
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/RequestArcInitiationAction.java
ava/com/android/server/hdmi/RequestArcTerminationAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
240b8368ce4de56f5a98f9571896e673424fe02b 02-Jun-2014 Dongwon Kang <dwkang@google.com> am 41e5f190: Merge "Add a path for generic event from a session to an application in Tv Input Framework." into lmp-preview-dev

* commit '41e5f1907dc029ab5117b9f8bcbc69c7a0abaa11':
Add a path for generic event from a session to an application in Tv Input Framework.
0bf8a21464d62857052cc033bf648077dbe20259 02-Jun-2014 Dongwon Kang <dwkang@google.com> Merge "Add a path for generic event from a session to an application in Tv Input Framework." into lmp-preview-dev
df7db074b5e6a19c8a33c2cc6be88f85eb5ee47c 01-Jun-2014 Amith Yamasani <yamasani@google.com> Derive LauncherAppsService from SystemService

And encapsulate the aidl interface implementation.

Change-Id: Id9a2544b411648e2596de18682079a64e95b0710
ava/com/android/server/pm/LauncherAppsService.java
3cccd63e562e764dbfd8b03f383620ee2ade6441 31-May-2014 Nick Kralevich <nnk@google.com> am 532536f1: am daa0ee13: am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks."

* commit '532536f145c3f295cd3ec790dd79f95c00d9d8f5':
SELinuxMMAC additions to perform policy versioning checks.
50ac763f927783ce3718728acc472687b1e9410e 31-May-2014 Nick Kralevich <nnk@google.com> am 332f3581: am 89b88f22: am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files."

* commit '332f35813e9860b8469b0f804f2b576daa0c823f':
Allow SELinuxPolicyInstallReceiver to update new policy files.
532536f145c3f295cd3ec790dd79f95c00d9d8f5 31-May-2014 Nick Kralevich <nnk@google.com> am daa0ee13: am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks."

* commit 'daa0ee137d43850c834b1ead3f871ceaa49814a7':
SELinuxMMAC additions to perform policy versioning checks.
332f35813e9860b8469b0f804f2b576daa0c823f 31-May-2014 Nick Kralevich <nnk@google.com> am 89b88f22: am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files."

* commit '89b88f226928e269e84100154bc78c0f8dc2016e':
Allow SELinuxPolicyInstallReceiver to update new policy files.
8cdef8293f75b3bf3ba4f57d4bb58dae2bad1a64 31-May-2014 Jorim Jaggi <jjaggi@google.com> am 698c8194: Merge "Fade scrim in unlock animation." into lmp-preview-dev

* commit '698c81948ed277253d567aa4c34996d2d0477992':
Fade scrim in unlock animation.
d48d7a6d506a72cc519e05fc4c124087b0db221b 31-May-2014 Jorim Jaggi <jjaggi@google.com> Merge "Fade scrim in unlock animation." into lmp-preview-dev
e29b2dbc762bfa66093d76f5a65f55328d8753c9 30-May-2014 Jorim Jaggi <jjaggi@google.com> Fade scrim in unlock animation.

This also introduces a startTime which gets sent from window manager
to SystemUI, which tells when the animation should start, to allow
for a more synchronized animation with fading out the scrim and
fading in the activity behind.

Bug: 15163546
Change-Id: I16212b1ef9eb76f1f98734da1d14fc5b7e626937
ava/com/android/server/wm/WindowAnimator.java
43e15653706d667a722a3b813ea89917d00ed42a 31-May-2014 Jeff Sharkey <jsharkey@android.com> am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-preview-dev

* commit '9a78d4deb2d00dc67b2c11daf76b389e0712b535':
Per-app media directories on external storage.
05dc18d69ad64254f2bcdd9c1e208ab54ee664fe 31-May-2014 Jeff Sharkey <jsharkey@android.com> Merge "Per-app media directories on external storage." into lmp-preview-dev
2ee3c1e189819cc6efb4d7de24f1438bdb824087 31-May-2014 Jeff Sharkey <jsharkey@android.com> Per-app media directories on external storage.

This change defines per-app directories on external storage that
will be scanned and included in MediaStore. This gives apps a way
to write content to secondary shared storage in a way that can
easily be surfaced to other apps.

Bug: 14382377
Change-Id: I4cb367c870509e76f0c2c598f01e2f699780030a
ava/com/android/server/MountService.java
b69ffd4dc2c8fa85e0064151141ebeee90de471e 30-May-2014 RoboErik <epastern@google.com> Minimum work to make volume handling work with sessions

This is the minimum change to make adjusting volume work with
MediaSessions. This only affects adjusting the volume and adjusting
the volume with a suggested stream. Adjusting a specific stream or
setting a specific stream will still use the same code.

This does not fix existing remote volume handling in RCC, which
will require a separate change to MediaController.

Change-Id: I5b957ff4bece1ee11e2364e1f216e1c08343c983
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
4e4160cd5e55662b994d01ab51a6d90fe2472a3f 31-May-2014 RoboErik <epastern@google.com> am 80ec18a9: Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev

* commit '80ec18a90a1ce3d1b68deba8bcf81abcca04e520':
Refactor transport controls APIs
API changes to sessions
283c907a6a84c5d9ffe38d3468e76131e6917105 31-May-2014 RoboErik <epastern@google.com> Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev

* changes:
Refactor transport controls APIs
API changes to sessions
9e427694a590b920f5af20b565ee008c4a73f714 30-May-2014 Chris Wren <cwren@android.com> am 3d2f4c6b: Add people signals to Zen mode.

* commit '3d2f4c6b1f3496de3b9c8ece1556684a6cb27903':
Add people signals to Zen mode.
9fd259dd2676043a41ffe1b6bb10aa2e5629dd63 30-May-2014 Chris Wren <cwren@android.com> am bef7d256: Merge "Track Zen Mode status in the NotificationRecord" into lmp-preview-dev

* commit 'bef7d25652c767f9850ec7ad6c51812b1c8db69d':
Track Zen Mode status in the NotificationRecord
ca5b9cfc07b345b373da1ced5384975e269dd7ac 23-May-2014 Michael Kolb <kolby@google.com> Fix circular mask

Bug: 15110243

Change-Id: Ic6a3728998f3f9fb73567ed1aff012d620a19486
ava/com/android/server/wm/CircularDisplayMask.java
99f963ea04d7a86219ece00c356f3f6bce33b6d6 28-May-2014 Chris Wren <cwren@android.com> Add people signals to Zen mode.

Depends-On: I51fcf689ddbee7715e3387b865f18a715887c943
Change-Id: I7c91dec1afeb54505426c4da59ec4d072a60c240
ava/com/android/server/notification/ValidateNotificationPeople.java
ava/com/android/server/notification/ZenModeHelper.java
4f0e39a929f2043c46ada9f34b23654616f93227 30-May-2014 Chris Wren <cwren@android.com> Merge "Track Zen Mode status in the NotificationRecord" into lmp-preview-dev
5c3d927e17e98e8fd4a9f3c86f7f4def0bcfa816 08-May-2014 Florin Malita <fmalita@google.com> Add a native Canvas wrapper.

Instead of storing a direct SkCanvas reference, Canvas now tracks
an opaque native wrapper class. The native wrapper can be used to
store additional info for emulating deprecated Skia features
(at this point it only stores a canvas).

Some notes:

* all native handle -> SkCanvas conversions are routed through a
handful of native utility methods.
* safeCanvasSwap() refactored as a lower level setNativeBitmp() - which
is what clients need.
* removed unused get_thread_msec() (Canvas.cpp)

Change-Id: I715a5a6f1e1621c1cfc1e510ae4f2ea15cf11114
ni/com_android_server_AssetAtlasService.cpp
333a61c3a5a83fe9c50ebeb5c947317f61385b7b 28-May-2014 Chris Wren <cwren@android.com> Track Zen Mode status in the NotificationRecord

This requires the record to be present in makeRankingUpdateForListener,
however, if the ranking object is created before the post to the handler,
then no cloning is necessary.

Depends-On: I907a1ff28123219db1c08889d723ad1b70b191ab
Change-Id: I51fcf689ddbee7715e3387b865f18a715887c943
ava/com/android/server/notification/NotificationComparator.java
ava/com/android/server/notification/NotificationIntrusivenessExtractor.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationRecord.java
ava/com/android/server/notification/NotificationSignalExtractor.java
ava/com/android/server/notification/NotificationUsageStats.java
ava/com/android/server/notification/RankingReconsideration.java
ava/com/android/server/notification/ValidateNotificationPeople.java
ava/com/android/server/notification/ZenModeHelper.java
515350a5e2b3fcac79f4ecfbd3d4d7485c04eff5 23-May-2014 Sreeram Ramachandran <sreeram@google.com> Support legacy routes added by apps via ensureRouteToHost().

Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9
(cherry picked from commit fb17b32550de624b7f476b70b7a2fc77f31dde7d)
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
8b466c19d6306c508aeaa2ad349f8c3225f62f0e 30-May-2014 Dianne Hackborn <hackbod@google.com> am f6550f0a: Merge "More work on voice interaction visuals." into lmp-preview-dev

* commit 'f6550f0ab2fb1abae6f9d694c87ccba9bede57f4':
More work on voice interaction visuals.
7b587884baeb98ca13b37f3034bd4e26881252c8 30-May-2014 Eric Laurent <elaurent@google.com> Merge "indicate in and out audio device connection separately"
20d94749043d0851f1da10c7749fd7eb13a35081 30-May-2014 Dianne Hackborn <hackbod@google.com> More work on voice interaction visuals.

There is now a special theme for voice interaction activities
to use, so they can be a panel that is better intergrated with
the rest of the voice interaction experience. This is still
not completely working, I have some hacks in the demo app to
get it right; I'll fix that in a future change.

Also improve VoiceInteractor to be retained across activity
instances, for things like rotation.

And bump up the number of concurrent broadcasts that are allowed
on non-svelte devices, since they can handle more and this makes
the boot experience better when dispatching BOOT_COMPLETED.

Change-Id: Ie86b5fd09b928da20d645ec2200577dee3e6889d
ava/com/android/server/am/ActiveServices.java
92b25a0ef8f6cf73d5c4e2209a8eac3288ecafd0 30-May-2014 Nicolas Prevot <nprevot@google.com> Merge "Cleaning CrossProfileIntentFilters on user deletion."
dfed4bc99f9f3d48ee7bf9e8ea051a8d5bc4f299 30-May-2014 Narayan Kamath <narayan@google.com> am f7871c31: am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation."

* commit 'f7871c31469c6245c1b232a15104704f7481103c':
Support an ABI flag for instrumentation.
f7871c31469c6245c1b232a15104704f7481103c 30-May-2014 Narayan Kamath <narayan@google.com> am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation."

* commit 'b9b31f4b8eda123e7b544d1a0fa886576064adca':
Support an ABI flag for instrumentation.
8627cef5382035dac8f3e68823b239724cc39708 30-May-2014 Yohei Yukawa <yukawa@google.com> Merge "Rebuild the enabled IMEs list when changed in Settings page"
3d46bab02978df14354379c4b10d7f68c3b80771 30-May-2014 Yohei Yukawa <yukawa@google.com> Rebuild the enabled IMEs list when changed in Settings page

With this CL, the input method switching controller is notified
even when the list of enabled IMEs is changed by System
Settings.

Ideally we should hook every setter method in
InputMethodSettings to ensure that InputMethodSettings and
InputMethodSubtypeSwitchingController can share the same list.
Until then, most of user visible weirdness should disappear
with this CL.

BUG: 15299968
Change-Id: Ie41da226d71b58d2e12057f85e4793b35e8b9f23
ava/com/android/server/InputMethodManagerService.java
832860fb9f6b3a7188a6af2d5d67806593595800 21-May-2014 Youngsang Cho <youngsang@google.com> Add a path for generic event from a session to an application in Tv Input Framework.

Plus, Video size changed event is also added.

Bug: 14126559
Change-Id: I04c553481fbaf8d92adbcc34f3c9d26acc87b361
ava/com/android/server/tv/TvInputManagerService.java
c162902f9acc3c865e1985e4cbc09a3a6451c81d 30-May-2014 Jungshik Jang <jayjang@google.com> Merge "Start Device Discovery after logical address allocation."
ccf2e6b1e6aab20351ff9f69a928e7f27387c6d6 30-May-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Support legacy routes added by apps via ensureRouteToHost()."
8b308d93c8fdcc7304b33d9b445ae3807eae97c8 29-May-2014 Jungshik Jang <jayjang@google.com> Start Device Discovery after logical address allocation.

Usually TV initiates Device Discovery sequence after logical address
allocation of local devices. For that added new callback interface
to AddressAllocationCallback to HdmiCecDevice.
Along with this, add onAddressAllocated to HdmiLocalDevice so that
start sending local device information once logical allocation is done.

Change-Id: I4cdc5dd7770674a17a0f23c383a6c1ca221e3104
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
ava/com/android/server/hdmi/HdmiControlService.java
1fbcb2719828f16aec8b2d742a20b98e4a2cf17c 23-May-2014 Sreeram Ramachandran <sreeram@google.com> Support legacy routes added by apps via ensureRouteToHost().

Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
a4ab093ddca0ea34e9923f24184f46201d2016c8 30-May-2014 Jose Lima <joselima@google.com> am 9dbe6159: Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev

* commit '9dbe6159a0eef0f14825ceee101681df7272d9af':
Only allow 1 Stack on Leanback-only devices
4f8a92bd20be374811b2cab855f390221893279a 30-May-2014 Jose Lima <joselima@google.com> Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev
094b2136f0804e2804de6bafafc94d33266a5fee 30-May-2014 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 92ab0b91 to master

Change-Id: I66d6849700759163669faa930f07a7e968df5155
92ab0b91cdcb83c3cb101386d01f04c7d7dfd404 30-May-2014 Jeff Brown <jeffbrown@google.com> am aeb4e071: Merge "Add dumpsys to dock observer." into klp-modular-dev

* commit 'aeb4e071abb100d10c39d154b05c2911d399395d':
Add dumpsys to dock observer.
010e561a703381e16dd17caa7c942dea6978e6dc 30-May-2014 Jeff Brown <jeffbrown@google.com> Add dumpsys to dock observer.

Minor refactoring of dock observer to allow its state to be
inspected and modified via dumpsys for debugging purposes.

eg. View current state.
adb shell dumpsys DockObserver

eg. Simulate being docked.
adb shell dumpsys DockObserver set state 1

eg. Reset back to normal.
adb shell dumpsys DockObserver reset

Change-Id: Ie48db775290ebed9aa4d9d9d5ac5a6fcb6122ac9
ava/com/android/server/DockObserver.java
ae4506e9b5fc3e0c6d9862fbc05b9af7d6742a6e 30-May-2014 Eric Laurent <elaurent@google.com> indicate in and out audio device connection separately

Modified AudioService and WiredAccessoryManager to use separate
device connection indications for input and oputput devices in case
of combined devices like wired headset or BT SCO headset.

Change-Id: Ifebaaab177191e2f505824420a13998d7a424aec
ava/com/android/server/WiredAccessoryManager.java
b8861f8b6b6095b9c5e3d52e2d6dbc915a6d861a 29-May-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Stop publishing HdmiCecService, start publishing HdmiControlService"
3d5e5c7b266863953ece3d77ab2c334e9a9c4ebc 29-May-2014 Christopher Tate <ctate@android.com> Merge "DO NOT MERGE Implementation of TaskManager reschedule/cancel" into lmp-preview-dev
c5b5275b8d8a0102a93faadd74be90e6844540ca 29-May-2014 Winson Chung <winsonc@google.com> am 48e3f61c: Merge "Updating task view style, fixing performance on enter-recents animation." into lmp-preview-dev

* commit '48e3f61cfcd804575780d2958bd4e53420bd8266':
Updating task view style, fixing performance on enter-recents animation.
073c2e4ad1437bcb97b5290ad31ab40ef309716b 29-May-2014 Winson Chung <winsonc@google.com> Merge "Updating task view style, fixing performance on enter-recents animation." into lmp-preview-dev
8692fc68a413c7aca75f094bb02bcbabcc277c73 29-May-2014 Jinsuk Kim <jinsukkim@google.com> Stop publishing HdmiCecService, start publishing HdmiControlService

HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
ava/com/android/server/hdmi/HdmiCecService.java
ava/com/android/server/hdmi/HdmiControlService.java
ni/com_android_server_hdmi_HdmiCecController.cpp
24cf152483c03dc446875c8d6440348174317bc5 29-May-2014 Winson Chung <winsonc@google.com> Updating task view style, fixing performance on enter-recents animation.

Change-Id: I42ca9296170a93a14184ae8963abbd3f0494e503
ava/com/android/server/wm/AppTransition.java
79fa4630bbca7c6c251eea99fe8997e4b45becee 28-May-2014 RoboErik <epastern@google.com> API changes to sessions

Changes requested by API Council review. A second CL will refactor
TransportController and TransportPerformer based on feedback.

Change-Id: Ie26a7d01d7021232a66c2edf1eb58120437fdfde
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionStack.java
8756a9897a9b94c1abaabd69945e5b0a36b7fa86 29-May-2014 Chris Wren <cwren@android.com> Merge "add tests for ValidateNotificationPeople.getExtraPeople()"
1015efb143b51a5d31f2f932528f295cfa1add1f 29-May-2014 Nicolas Prevot <nprevot@google.com> Merge "Making the content resolver work with result intents."
7a184985590e25c9b4a5b534953924d0abef5ef1 29-May-2014 Craig Mautner <cmautner@google.com> am b5b37c2b: Merge "Add methods to coordinate unlock animation." into lmp-preview-dev

* commit 'b5b37c2babe744acb002ed9b8556a9d9cd2202fc':
Add methods to coordinate unlock animation.
71ac80c46a1b094ad951e59c24791d9e9ef769bf 29-May-2014 Craig Mautner <cmautner@google.com> Merge "Revert "Modify task navigation to return to recent tasks." DO NOT MERGE" into lmp-preview-dev
b9a6c8ad99c7885dccc23223068c0a551f350cd5 29-May-2014 Craig Mautner <cmautner@google.com> Revert "Modify task navigation to return to recent tasks." DO NOT MERGE

This reverts commit 1a4e211e03f1f795d935058e27356a0e8bc5df7c.

Change-Id: Ia691b93347c7eb2395933e5a5ba385ea94e08d6f
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/wm/WindowManagerService.java
fdaaf91f356a1dcd960c48a5f0137869d561cb23 29-May-2014 Craig Mautner <cmautner@google.com> Merge "Revert "Modify task navigation to return to recent tasks.""
719e621186adc1ba5a365bddea01cbe73bb26b02 29-May-2014 Craig Mautner <cmautner@google.com> Revert "Modify task navigation to return to recent tasks."

This reverts commit 19174878e25ebfd8806595f83df7bdea1d239c07.

Change-Id: I98db2c9aa975495c5828b3d16b8b45f515e6a5fa
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/wm/WindowManagerService.java
219d7a50fb7a269fe54dd9d70587c269d217336f 29-May-2014 Craig Mautner <cmautner@google.com> Merge "Add methods to coordinate unlock animation." into lmp-preview-dev
92af372fc60f59c628a7169d4a506e9c834c097a 27-May-2014 Chris Wren <cwren@android.com> add tests for ValidateNotificationPeople.getExtraPeople()

Change-Id: Ieb8acce58574c25cccce674b4494f75d96b57125
ava/com/android/server/notification/ValidateNotificationPeople.java
a422a07d29b115a6eed1eda6dba55fb8aa1f55a1 29-May-2014 Nicolas Prevot <nprevot@google.com> Merge "Small fix related to Cross-profile intents."
bce0106c417db7dd04daec9dc4cef9e7cf30446d 29-May-2014 Lorenzo Colitti <lorenzo@google.com> Don't break things if a network goes back to CONNECTED.

Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected. This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052

(cherry picked from commit cfff026ec47afc7e31f60f80e3deea7f4e2f9be5)

Change-Id: I52c2220e8f1d98fca765880be3040593e92722ed
ava/com/android/server/ConnectivityService.java
adbb17906e6755202a20420957caad7a00097055 29-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Don't break things if a network goes back to CONNECTED."
ad0634c50c5c4a18b5b66f2c8250e6a09bf69f1c 29-May-2014 Nicolas Prevot <nprevot@google.com> Small fix related to Cross-profile intents.

Change-Id: Id4cadd051c337776451ed807a2edac6d869b372a
ava/com/android/server/pm/Settings.java
c6cf95c0f5f7250c65e40c441fe58d8cbfd114c9 29-May-2014 Nicolas Prevot <nprevot@google.com> Making the content resolver work with result intents.

prepareToLeaveUser is called if necessary on result intents.
Adding the targetUserId to grantUriPermissionFromIntentLocked
This allows the GET_CONTENT intent to work across profiles.

Change-Id: Id81280c23247aeda7ad56e34af9b12a6f3a00a3c
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
51ed158a946f3a908b691389296dbb0136bc1c9c 29-May-2014 Lorenzo Colitti <lorenzo@google.com> Don't break things if a network goes back to CONNECTED.

Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected. This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052
Change-Id: Ifd73558e5be452d9ef88c64cca429d5f302bf354
ava/com/android/server/ConnectivityService.java
d3a5b916b1655c9a36d531afc8420fc5ca0ccfdd 29-May-2014 Dianne Hackborn <hackbod@google.com> am c2091a1f: Merge "Add system layer for voice interaction services." into lmp-preview-dev

* commit 'c2091a1fbc463941b3e42db36e369124ac3c1013':
Add system layer for voice interaction services.
415f354134254fbc70db48d5798e82fc87751df2 29-May-2014 Christopher Tate <ctate@google.com> am ba922631: Merge "Don\'t crash on boot" into lmp-preview-dev

* commit 'ba9226316df301fb612606f919aa69e109645c82':
Don't crash on boot
3a2f74373a6892ca5c11cd19b4b662c069634717 28-May-2014 Jinsuk Kim <jinsukkim@google.com> Do not reply with <Feature Abort> to CEC Broadcast message

Broadcast message is not targeted to a specific device but for
announcement. Individual reponse with <Feature Abort> is neither
necessary nor useful. Changed to send the message back only for
direct messages.

Change-Id: I927aa8e58a9868e158ed945c753492207e7c97f6
ava/com/android/server/hdmi/HdmiCecController.java
c3923ea50dd0b161ba84941c071d34bb98c0700a 28-May-2014 Jinsuk Kim <jinsukkim@google.com> Dispatch incoming CEC messages to feature actions

This CL dispatches incoming CEC messages to feature actions that
the service manages.

Change-Id: I9221d6a25648846327d00fe5404aaf1e8ec786ce
ava/com/android/server/hdmi/HdmiControlService.java
cc5ef8c918e96516a5c51cc40735a1b8a24d8497 27-May-2014 Jungshik Jang <jayjang@google.com> Implement device discovery sequence.

When device discover is launched it goes through the following step

1. clear all existing devices
2. send <Polling Message> of all logical addresses
excecpt one of local device
3. Once got all allocated logical addresses, gather physical address of
them
4. Once got physical address of them, gather display name of them
5. Once got display names, gather vendor id of them
5. Once got vendor id of them, register all gathered info to
internal device info list.

Change-Id: Ic9aca3b15d88ac7650f10b6d0bfa9c97923975e8
ava/com/android/server/hdmi/DeviceDiscoveryAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
bab6ee2fa99c483375ccf789b21fb0fb3e5ff6ae 29-May-2014 Jungshik Jang <jayjang@google.com> Merge "Add cec message handler to hdmi cec jni implementation"
9b9244b6941110ea2d940d9fc8eed0cdff96a016 14-May-2014 Matthew Williams <mjwilliams@google.com> DO NOT MERGE Implementation of TaskManager reschedule/cancel

Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions
ava/com/android/server/task/StateChangedListener.java
ava/com/android/server/task/TaskCompletedListener.java
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskServiceContext.java
ava/com/android/server/task/TaskStore.java
ava/com/android/server/task/controllers/ConnectivityController.java
ava/com/android/server/task/controllers/IdleController.java
ava/com/android/server/task/controllers/StateController.java
ava/com/android/server/task/controllers/TaskStatus.java
ava/com/android/server/task/controllers/TimeController.java
a923758d80ad50ac79a22074cf6e4c9463bb2b0b 29-May-2014 Dianne Hackborn <hackbod@google.com> Merge "Add system layer for voice interaction services." into lmp-preview-dev
e30e02f5d9a9141c9ee70c712d4f9d52c88ea969 28-May-2014 Dianne Hackborn <hackbod@google.com> Add system layer for voice interaction services.

New window layer that voice interaction service windows
go in to. Includes a new voice-specific content rectangle
that voice activities are placed in to.

Add specific animations for this layer, sliding down from
the top (though this can be customized by the voice interaction
service).

Also add the concept of activities running for voice interaction
services for purposes of adjusting the animation used for them,
again sliding from the top, but not (yet?) customizable by the
voice interaction service.

Change-Id: Ic9e0e8c843c2e2972d6abb4087dce0019326155d
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/wm/AppTransition.java
ava/com/android/server/wm/AppWindowToken.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
ava/com/android/server/wm/WindowStateAnimator.java
f889ed11d21bfd3010f8e4e192a0532b7f6f7994 29-May-2014 Christopher Tate <ctate@google.com> Don't crash on boot

...when removing dangling preferred-activity entries.

Bug 15310848

Change-Id: Ibe9d82a06f8c608b866a2c3c6b286da2ededacca
ava/com/android/server/pm/PackageManagerService.java
560ce61c598d9912c4adbd9c602f1a870fb478f4 28-May-2014 Christopher Tate <ctate@google.com> Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-preview-dev
00f535845bebe4fba1de77ebd0119c7c23197a4f 28-May-2014 Dan Stoza <stoza@google.com> Merge "SurfaceFlinger: Add sourceCrop to screenshot"
d5ba868b0df68685193300dba62895d823feaddd 28-May-2014 Amith Yamasani <yamasani@google.com> Merge "Fix singleUser attribute"
4b9d79c30eccb61645d98a4f0d49b7769e8c7ccc 22-May-2014 Amith Yamasani <yamasani@google.com> Fix singleUser attribute

Make it work correctly for singleton content providers.
Relax which apps can export singleton content providers.

Change-Id: I43d315c25ed76a876bfa6d5e0d1351bc19c9bdba
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BroadcastQueue.java
ava/com/android/server/content/ContentService.java
29fae7b39447977c4247bb901721df86d8a92ef8 28-May-2014 Christoph Studer <chstuder@google.com> am 1468841a: Merge "NoMan: Don\'t unbind system listeners" into lmp-preview-dev

* commit '1468841afc1431ddd0d3c843e41fa7a14c16e430':
NoMan: Don't unbind system listeners
19a81a616f3b70510e557caaeaf3cae4ec1356ad 28-May-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Don't unbind system listeners" into lmp-preview-dev
b0674f0f7c04b707ca7b11f5700bdb9e51b61872 28-May-2014 Jinsuk Kim <jinsukkim@google.com> Fix a couple of bugs in CEC services

- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable

Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
ava/com/android/server/hdmi/FeatureAction.java
4085d0ef62554c7e139b82bca0f97161bb159f8c 27-May-2014 Jungshik Jang <jayjang@google.com> Add cec message handler to hdmi cec jni implementation

Notification for incoming cec message can be issued
from any thread but jni can call java method
in the thread that jni knows like service thread.
So this change delegates incoming message to
jni-friendly thread, service thread by exploit
looper of service thread.

Change-Id: If3b141d917df3e209912af1778eb509777199969
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ni/com_android_server_hdmi_HdmiCecController.cpp
58e66d69f9f239a444a90c7ff5eae32557fe350c 28-May-2014 Jose Lima <joselima@google.com> Only allow 1 Stack on Leanback-only devices

- For Leanback only devices we will force all activities to
live in the same app stack. This is a design decision for the
shy/gregarious changes we are planning to implement for
leanback devices.

Change-Id: I5e65f9b079830a9485b5a136700993755c3f555f
ava/com/android/server/am/ActivityStackSupervisor.java
bc132a068b47994dc3f8e3c75c963f4676c2e970 28-May-2014 Matthew Williams <mjwilliams@google.com> Merge "Implementation of TaskManager reschedule/cancel"
4a4a17aa1107e75ba4c0ece87c90a3eff6d4c918 28-May-2014 Fabrice Di Meglio <fdimeglio@google.com> am f52b9c8a: Merge "Revert "Only allow 1 Stack on Leanback-only devices"" into lmp-preview-dev

* commit 'f52b9c8a4aebf6d04b747e45c921fa4f51344b34':
Revert "Only allow 1 Stack on Leanback-only devices"
c82e7d30e34ff7cc273edf1ea8ddd11b713fec5b 28-May-2014 Fabrice Di Meglio <fdimeglio@google.com> Revert "Only allow 1 Stack on Leanback-only devices"

This is making a HH device (and probably others) in a reboot loop

This reverts commit 0cac71e9bdee1e9e6b2faafec0f9f894effbcb67.

===

See:

W/dalvikvm( 2320): threadid=1: thread exiting with uncaught exception (group=0x952d3f28)
E/AndroidRuntime( 2320): *** FATAL EXCEPTION IN SYSTEM PROCESS: main
E/AndroidRuntime( 2320): java.lang.RuntimeException: Failed to create service com.android.server.am.ActivityManagerService$Lifecycle: service constructor threw an exception
E/AndroidRuntime( 2320): at com.android.server.SystemServiceManager.startService(SystemServiceManager.java:89)
E/AndroidRuntime( 2320): at com.android.server.SystemServer.startBootstrapServices(SystemServer.java:304)
E/AndroidRuntime( 2320): at com.android.server.SystemServer.run(SystemServer.java:244)
E/AndroidRuntime( 2320): at com.android.server.SystemServer.main(SystemServer.java:161)
E/AndroidRuntime( 2320): at java.lang.reflect.Method.invokeNative(Native Method)
E/AndroidRuntime( 2320): at java.lang.reflect.Method.invoke(Method.java:515)
E/AndroidRuntime( 2320): at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:836)
E/AndroidRuntime( 2320): at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:631)
E/AndroidRuntime( 2320): at dalvik.system.NativeStart.main(Native Method)
E/AndroidRuntime( 2320): Caused by: java.lang.reflect.InvocationTargetException
E/AndroidRuntime( 2320): at java.lang.reflect.Constructor.constructNative(Native Method)
E/AndroidRuntime( 2320): at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
E/AndroidRuntime( 2320): at com.android.server.SystemServiceManager.startService(SystemServiceManager.java:78)
E/AndroidRuntime( 2320): ... 8 more
E/AndroidRuntime( 2320): Caused by: java.lang.NullPointerException
E/AndroidRuntime( 2320): at com.android.server.am.ActivityStackSupervisor.isLeanbackOnlyDevice(ActivityStackSupervisor.java:3508)
E/AndroidRuntime( 2320): at com.android.server.am.ActivityStackSupervisor.<init>(ActivityStackSupervisor.java:220)
E/AndroidRuntime( 2320): at com.android.server.am.ActivityManagerService.<init>(ActivityManagerService.java:2145)
E/AndroidRuntime( 2320): at com.android.server.am.ActivityManagerService$Lifecycle.<init>(ActivityManagerService.java:2073)
E/AndroidRuntime( 2320): ... 11 more
E/AndroidRuntime( 2320): Error reporting crash
E/AndroidRuntime( 2320): java.lang.NullPointerException
E/AndroidRuntime( 2320): at com.android.internal.os.RuntimeInit$UncaughtHandler.uncaughtException(RuntimeInit.java:89)
E/AndroidRuntime( 2320): at java.lang.ThreadGroup.uncaughtException(ThreadGroup.java:693)
E/AndroidRuntime( 2320): at java.lang.ThreadGroup.uncaughtException(ThreadGroup.java:690)
E/AndroidRuntime( 2320): at dalvik.system.NativeStart.main(Native Method)
I/Process ( 2320): Sending signal. PID: 2320 SIG: 9
I/ServiceManager( 174): service 'power' died
I/ServiceManager( 174): service 'sensorservice' died

Change-Id: Ib90ae4dff6542d67f5827b100a3ab6158ce88ae2
ava/com/android/server/am/ActivityStackSupervisor.java
b61c506a5002d7cf3bae535bfde919a0c72cd8c0 14-May-2014 Matthew Williams <mjwilliams@google.com> Implementation of TaskManager reschedule/cancel

Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions

Change-Id: I0264c2614cc52c28730abbcb1557f314f058f991
ava/com/android/server/task/StateChangedListener.java
ava/com/android/server/task/TaskCompletedListener.java
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskServiceContext.java
ava/com/android/server/task/TaskStore.java
ava/com/android/server/task/controllers/ConnectivityController.java
ava/com/android/server/task/controllers/IdleController.java
ava/com/android/server/task/controllers/StateController.java
ava/com/android/server/task/controllers/TaskStatus.java
ava/com/android/server/task/controllers/TimeController.java
ca7ddbfef7ae5f205b456d5c4dce70c2f5eec489 28-May-2014 Jose Lima <joselima@google.com> am 00430954: Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev

* commit '004309546b7efa188df56e58539e4227ed192cf7':
Only allow 1 Stack on Leanback-only devices
a5c7e0f80f6a0ea59e29df01c886376da56ebbbc 27-May-2014 Jose Lima <joselima@google.com> Only allow 1 Stack on Leanback-only devices

- For Leanback only devices we will force all activities to
live in the same app stack. This is a design decision for the
shy/gregarious changes we are planning to implement for
leanback devices.

Change-Id: I201f56541ba22356e9598f09419ad41e588c74dc
ava/com/android/server/am/ActivityStackSupervisor.java
b9fc22029f766e5b5a19d5615b5d64f163476b20 28-May-2014 Adrian Roos <roosa@google.com> am 9fb0925e: Merge "Add and improve logged TrustAgent connection events" into lmp-preview-dev

* commit '9fb0925e0ea64ac6124cc0c843db05155cc4ea64':
Add and improve logged TrustAgent connection events
26690339e9c9a134eb4607b3381947673b1dacad 28-May-2014 Adrian Roos <roosa@google.com> Merge "Add and improve logged TrustAgent connection events" into lmp-preview-dev
0d674623facfbd3e9c520d2be4ed98977b92a1a2 21-May-2014 Jorim Jaggi <jjaggi@google.com> Add methods to coordinate unlock animation.

Introduce IWindowManager.keyguardGoingAway to notify that Keyguard
wants to dismiss it self. This method starts the state machine in
WindowAnimator which animates in the activity behind the keyguard.
Animating out the keyguard is done by the StatusBar/Keyguard
software when it receives the startKeyguardExitAnimation() callback.

Bug: 14118756

Change-Id: Id3b8f41189410bad808b4892fbec74245e59efce
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
70c117a87385d3764d154873aff09431348e8478 28-May-2014 Nick Kralevich <nnk@google.com> Fix Tethering NPE

Bug: 10733373
Change-Id: I1d81eb8a60be2b672b925be7577f1288fe870237
ava/com/android/server/connectivity/Tethering.java
afa05c0b43cbc065181d5c2d6ee368a08bb00c3b 22-May-2014 Robert Greenwalt <rgreenwalt@google.com> Move dis/enable of mobile data to Telephony

ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)
ava/com/android/server/ConnectivityService.java
71bf33a02f49444fbfa35b267c70592f3b07a07d 16-May-2014 Robert Greenwalt <rgreenwalt@google.com> Rewrite startUsingNetworkFeature for new API

bug:14993207
Change-Id: I041a80faa07bf3094af13a6c606f3b15aa03f789
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
a64a5fe68ced5ffca58248d76eadd90759ab4164 27-May-2014 Winson Chung <winsonc@google.com> am bff02603: Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev

* commit 'bff026033d40ee48e9bf8dca17e1fbbee8b41293':
Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)
8804ce96b1ef3aa260076091e77abcce0b1ea1d9 27-May-2014 Winson Chung <winsonc@google.com> Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev
42db9d0b234f50c60050c4d1e7c4b0fdb4480712 27-May-2014 Chris Wren <cwren@android.com> am ba8af498: Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev

* commit 'ba8af498f08d4ac2e7712a8d307d24112ca1bc8e':
Reduce logspam by catching unexpected types ourselves.
2ed67e6de7b2aefce82b2b10fc637dbc4e72773d 27-May-2014 Chris Wren <cwren@android.com> Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev
9693d9534342c9785877a9f98ec5aff6fd9ac496 27-May-2014 Winson Chung <winsonc@google.com> Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)

Change-Id: I371ee43296a983782eaed2e661b1febc71c86433
ava/com/android/server/am/ActivityManagerService.java
5859fc1096274a00f388a8ffc11b8919e9cb8dae 27-May-2014 Winson Chung <winsonc@google.com> Merge "DO NOT MERGE" into lmp-preview-dev
7d59b4f981e24a4a446522e9b8d3d6a7115c1459 27-May-2014 Adrian Roos <roosa@google.com> Add and improve logged TrustAgent connection events

Adds events for when a TrustAgentService gets connected
or is stopped. Also explicitly revokes trust when a
trust agent gets disconnected, such that it shows up in
dumpsys.

Bug: 15281644
Change-Id: I5875a34da923345683279c1f755d43454ff6318d
ava/com/android/server/trust/TrustAgentWrapper.java
ava/com/android/server/trust/TrustArchive.java
21b6c49a2d6ef8beb2a1f5d4910ce2c96eac171f 27-May-2014 Christoph Studer <chstuder@google.com> am f626c676: Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev

* commit 'f626c67604a317bbcb1963a71b66a30b92df2973':
NoMan: Allow disabling SQLiteLog.
d68200c66b775ae991e9217dd021ef3713f4cc8e 27-May-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Disable SQLite log DO NOT MERGE" into lmp-preview-dev
e39752144960e36aba3db8d3c5399bce7f374011 27-May-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev
2eb4f9c377c01b5644c00f4b0cca2e655e107998 22-May-2014 Winson Chung <winsonc@google.com> DO NOT MERGE

Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
ava/com/android/server/am/ActivityStack.java
8f4f2ff5cbd9cf5733437afeb54f8a2453d9e616 27-May-2014 Winson Chung <winsonc@google.com> Merge "DO NOT MERGE " into lmp-preview-dev
39c1f59541c806471bd538adfb981f26f58b647f 27-May-2014 Craig Mautner <cmautner@google.com> resolved conflicts for merge of 754a8c4c to master

Change-Id: I750b714248486eb8609951caa10be7a543f624da
c752919c7cd29b497918618cc9ebf56c18995a76 27-May-2014 Craig Mautner <cmautner@google.com> Merge "Do not start tasks on ActivityViews unless explicit. DO NOT MERGE" into lmp-preview-dev
b539b3aafb2b0e55fc9578344eff35256fd5a94e 27-May-2014 Craig Mautner <cmautner@google.com> 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
ava/com/android/server/am/ActivityStackSupervisor.java
754a8c4c9535cb465cc18ad9d5eafc99aa5a170d 27-May-2014 Craig Mautner <cmautner@google.com> am 1b4bf857: Do not start tasks on ActivityViews unless explicit

* commit '1b4bf857d34dc58a4ef84f5f0761bb7685051fbb':
Do not start tasks on ActivityViews unless explicit
1b4bf857d34dc58a4ef84f5f0761bb7685051fbb 27-May-2014 Craig Mautner <cmautner@google.com> Do not start tasks on ActivityViews unless explicit

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
ava/com/android/server/am/ActivityStackSupervisor.java
bcede43413ed7d31f97e5014d5a372c16f8712f1 27-May-2014 Craig Mautner <cmautner@google.com> am b984a072: Merge "Add more error checking to xml restore" into lmp-preview-dev

* commit 'b984a072a7addc2404ea9ae2f67ccfa85e686167':
Add more error checking to xml restore
5d0045835b0bfd456b9400be1cacdc8cb16d6cc7 27-May-2014 Craig Mautner <cmautner@google.com> Merge "Add more error checking to xml restore" into lmp-preview-dev
711259a9e4ce842265874f76ee391e1734dd9b5b 27-May-2014 Christoph Studer <chstuder@google.com> NoMan: Disable SQLite log DO NOT MERGE

Bug: 15279504
Change-Id: I76f9283675537607729ed450471ef4b1d9ec3898
ava/com/android/server/notification/NotificationUsageStats.java
05e288497258493d11537194439f4ec100175019 27-May-2014 Christoph Studer <chstuder@google.com> NoMan: Allow disabling SQLiteLog.

Bug: 15279504
Change-Id: I561391a312f88a7d5e11b180984f18bb1d3dcda0
ava/com/android/server/notification/NotificationUsageStats.java
5122fb6a92d2fa99f2f2cafc138527931c0dc183 27-May-2014 Craig Mautner <cmautner@google.com> am 463f9006: Merge "Only start TaskPersister once." into lmp-preview-dev

* commit '463f9006c56d66b5213edecc150863b450a7e573':
Only start TaskPersister once.
b45a730efb75402faf2bfb2fdf3f26ceaab6148c 27-May-2014 Craig Mautner <cmautner@google.com> Merge changes I88865c02,I34cc1310 into lmp-preview-dev

* changes:
Check for null DO NOT MERGE
Improve DocCentric documentation. DO NOT MERGE
e88d180d6cc5713049489d9f30e998fe846145f1 27-May-2014 Craig Mautner <cmautner@google.com> am e2c92ac8: Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev

* commit 'e2c92ac847d151cbf4d578ee85d3ff10126e9ada':
Update launchFlags after changing Intent flags
8aa29921df684f2a991d12aa360d80ced7dc7b48 27-May-2014 Craig Mautner <cmautner@google.com> Merge "Only start TaskPersister once." into lmp-preview-dev
fb69da323b97ae4712054d37fb2f7d54cddb7dbd 16-May-2014 Chris Wren <cwren@android.com> Reduce logspam by catching unexpected types ourselves.

Also fix a bug in the conversion of ArrayLists to String[].

Change-Id: I839c80d0b571be298062d511dd3c83cc1e263f54
ava/com/android/server/notification/ValidateNotificationPeople.java
bf1bf9dea7fdd0690e242a28a16b151b8d7411e6 27-May-2014 Craig Mautner <cmautner@google.com> Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev
e0129b3c672f5555deb75366b1a7159f41737874 26-May-2014 Craig Mautner <cmautner@google.com> 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
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/TaskPersister.java
a0f48855493b7b9c3cdc93a1c8f7d18f9578ed66 27-May-2014 Nicolas Prevot <nprevot@google.com> Cleaning CrossProfileIntentFilters on user deletion.

When a user is deleted, remove all CrossProfileIntentFilters that have this user as their target.

Change-Id: I1cac3ecc0c053ee129d7f0ad13648f44737a378d
ava/com/android/server/pm/Settings.java
e282c97e21197d0fdf2c814fbe5716cb9630152e 27-May-2014 Nicolas Prevot <nprevot@google.com> Merge "Rename code related to cross-profile intents."
0bc8b0718f740cc543e88b45591da903bb235f90 27-May-2014 Jinsuk Kim <jinsukkim@google.com> Fix a bug using wrong addresses for CEC logical address allocation

Change-Id: I41da586c16dca4f325d147bb3abe5d4e09f7b91c
ava/com/android/server/hdmi/HdmiCecController.java
7fe2ae0fe9c24f0a1a5ddf20850069b56af2c2fd 26-May-2014 Jinsuk Kim <jinsukkim@google.com> 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
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
c3a6e23e3f286271abbda0d99edee35d0ceb6692 27-May-2014 Wonsik Kim <wonsik@google.com> am e32b2d32: Revert "Revert "Add physical TV input handling to TvInputManagerService""

* commit 'e32b2d32d7e4a492bb3038c7bc55988a908437a4':
Revert "Revert "Add physical TV input handling to TvInputManagerService""
c22dbb69194c8e8fe2a32326d1f37a738cad0904 26-May-2014 Wonsik Kim <wonsik@google.com> Revert "Revert "Add physical TV input handling to TvInputManagerService""

This reverts commit 1940e197a8de186df5edf0b78e0907ae539bd215.

Bug: 14118245, Bug: 15197740
Change-Id: Ia308f16d2ed8ec55112a4d21c180ccb97e8d7c6a
ava/com/android/server/tv/TvInputHal.java
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
ni/Android.mk
ni/com_android_server_tv_TvInputHal.cpp
ni/onload.cpp
87f851d0bad0183eccbb59b1fb378db9155e4a66 27-May-2014 Craig Mautner <cmautner@google.com> 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
ava/com/android/server/am/ActivityManagerService.java
5d423844f253951a1d79dabe638aba81a21207bc 23-May-2014 Christoph Studer <chstuder@google.com> NoMan: Don't unbind system listeners

Listeners registered via INotificationMananger.registerListener()
must not be unbound by NoMan because it won't be able to re-bind
them later.

Bug: 15131411
Change-Id: Ic5088252c86e7c32c522ba1606f123cefde3720d
ava/com/android/server/notification/ManagedServices.java
1a4485dcd25ed036fb8de1a271b37121d8135f4e 26-May-2014 Jungshik Jang <jayjang@google.com> Add HdmiCecDeviceInfo to HdmiCecLocalDevice

As HdmiCecLoclaDevice is a wrapper for local devices
it should include cec device info.

Change-Id: I479665b2aa6bd56470b79dbbb7fb1015f6356090
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
02bb4265ac41e1974ec7d4793e6c2a0ed2adc3c4 23-May-2014 Jungshik Jang <jayjang@google.com> 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
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
1178cd29b2a9268a915f5ba60def9142d5d1da78 26-May-2014 Yuncheol Heo <ycheo@google.com> Merge "Add the constants for the callback result of SendCecCommand()."
ece603b7955938d6001c376f351ca0a2219330ac 23-May-2014 Yuncheol Heo <ycheo@google.com> 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
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/RequestArcInitiationAction.java
ava/com/android/server/hdmi/RequestArcTerminationAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
a254cd7e0ffd7d3b131f3c7a69c9fa13dbacc0bd 26-May-2014 Craig Mautner <cmautner@google.com> 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
ava/com/android/server/am/ActivityStackSupervisor.java
2918e9e133de8066ab497a5f8dac1c310c792767 20-May-2014 Jinsuk Kim <jinsukkim@google.com> 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
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecLocalDevice.java
ava/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
82d96d5e21641be086108838a70ab7b41374c0f1 24-May-2014 Guang Zhu <guangzhu@google.com> Merge "Revert "Add physical TV input handling to TvInputManagerService""
70aa0c6db3cf89adafe3e1946e3713c18b0de8f0 24-May-2014 Guang Zhu <guangzhu@google.com> Revert "Add physical TV input handling to TvInputManagerService"

Bug: 15197740

This reverts commit c8324a8e70d9f617c92f49e7c0b3e2484d9190fd.

Change-Id: Ie7b5405e929b5903f43188c3445fe9d24ecf92c2
ava/com/android/server/tv/TvInputHal.java
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
ni/Android.mk
ni/com_android_server_tv_TvInputHal.cpp
ni/onload.cpp
1f74bad9acd816cd0974ca7d8a9eafe7f671ee57 23-May-2014 Craig Mautner <cmautner@google.com> Check for null DO NOT MERGE

Fixes bug 15129354.

Change-Id: I88865c021a024ab94e44dc71f09f8325a79e0775
ava/com/android/server/wm/WindowManagerService.java
e67a784eb2c914c04c62ea5dfa1e3751df5582cc 21-May-2014 Craig Mautner <cmautner@google.com> 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
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/wm/WindowManagerService.java
4d22b4a016684c6a1061ed6d6dda6c52ee5f256b 24-May-2014 Craig Mautner <cmautner@google.com> Merge "Modify task navigation to return to recent tasks."
5d038b9d6f2ab1eedb6825bee0c241b41df7767e 24-May-2014 Wonsik Kim <wonsik@google.com> Merge "Add physical TV input handling to TvInputManagerService"
df6523f2703920a1d2a84c45b862b325b8cebf40 21-May-2014 Craig Mautner <cmautner@google.com> 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
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/wm/WindowManagerService.java
21d24a21ea4aaadd78e73de54168e8a8a8973e4d 23-Apr-2014 Craig Mautner <cmautner@google.com> 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
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskPersister.java
ava/com/android/server/am/TaskRecord.java
fa380e982e41b0dcbbcf2201803abf26808016b5 19-May-2014 Christopher Tate <ctate@google.com> DO NOT MERGE - Run the task manager service at startup

Also moves most of it into android.app.task rather than android.content.

(Cherrypick from master)

Change-Id: Ic07a664bf54bc3e40aa0b892946edba4bf37262a
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskServiceContext.java
ava/com/android/server/task/TaskStore.java
ava/com/android/server/task/controllers/ConnectivityController.java
ava/com/android/server/task/controllers/TaskStatus.java
94d643a1c22df2109dcaac59a71298d30cb67d7b 24-May-2014 Craig Mautner <cmautner@google.com> Merge "Check for null"
6000a6c663467809cd89bb4e98b4e112553819da 24-May-2014 Christopher Tate <ctate@google.com> Merge "Run the task manager service at startup"
8f64f80888ab6cc2a4e3f8a65d8b54650e07fc5c 19-May-2014 Christopher Tate <ctate@google.com> 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
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskServiceContext.java
ava/com/android/server/task/TaskStore.java
ava/com/android/server/task/controllers/ConnectivityController.java
ava/com/android/server/task/controllers/TaskStatus.java
deec695253aa5856135be3ffdcd35eaafed9e526 24-May-2014 Craig Mautner <cmautner@google.com> Merge "Add code for persisting tasks and activities to disk"
ec41d7ababd3145b7f19e5bd69480e9436cb5c7c 24-May-2014 Christopher Tate <ctate@google.com> Merge "DO NOT MERGE - Don't crash uninstalling updates to system apps" into lmp-preview-dev
c137a2d6c16fa4bbc73a7904f785b20e21d615de 23-May-2014 justinzhang <justinzhang@google.com> Merge "Hide status bars in lock task"
5286d3ff47135976d66d67888cadca52ef2ab244 12-May-2014 justinzhang <justinzhang@google.com> 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
ava/com/android/server/am/ActivityStackSupervisor.java
b20f796dab61472ecbad36de053a1c6fcb5b3530 23-May-2014 Craig Mautner <cmautner@google.com> Check for null

Fixes bug 15129354.

Change-Id: I88865c021a024ab94e44dc71f09f8325a79e0775
ava/com/android/server/wm/WindowManagerService.java
9b7135645e70e3613f7820ae0a68350a1ff47362 23-May-2014 Dmitriy Ivanov <dimitry@google.com> am 190ed5db: am 2137d6a8: am d5ee4144: Merge "Increase start timeout for wrapped process"

* commit '190ed5db4ac90612c1f6420f87ea462076fbe1a0':
Increase start timeout for wrapped process
376543bc5f1f8a4465f6f0f9c9b45f96f37b3d06 22-May-2014 Winson Chung <winsonc@google.com> 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
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
759c9b9688b953fbaf0220e7257a6140fbaa885b 23-May-2014 Kenny Guy <kennyguy@google.com> Merge "Fix bug with removeUser assuming it is called from system uid."
9890e341bf9d565309cd7db5e6c4194c66c0a1d8 23-May-2014 Dan Stoza <stoza@google.com> SurfaceFlinger: Add sourceCrop to screenshot

Adds a sourceCrop Rect parameter to screenshot commands, which allows
clients to capture only a portion of the screen instead of the whole
screen.

Bug: 15137922
Change-Id: I629447573cd34ffb96334cde7ba02490b9ea06d8
ava/com/android/server/wm/WindowManagerService.java
ee58b4f44d1c2ecd94e9b39fe74b70b28c859c1a 23-May-2014 Kenny Guy <kennyguy@google.com> 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
ava/com/android/server/pm/UserManagerService.java
470c1accf5a54f9844a779eafab74e63c09342b5 21-May-2014 Chris Wren <cwren@android.com> 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)
ava/com/android/server/notification/NotificationIntrusivenessExtractor.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationSignalExtractor.java
ava/com/android/server/notification/RankingFuture.java
ava/com/android/server/notification/RankingReconsideration.java
ava/com/android/server/notification/ValidateNotificationPeople.java
e3dd9118a2fe96ae951f04305b8be85c997767c7 23-May-2014 Chris Wren <cwren@android.com> Merge "Fix a concurrency bug in the ranking reconsideration."
4ad99682dd726c6b5de9e9b34c0e8daaa52139ad 21-May-2014 Chris Wren <cwren@android.com> 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
ava/com/android/server/notification/NotificationIntrusivenessExtractor.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationSignalExtractor.java
ava/com/android/server/notification/RankingFuture.java
ava/com/android/server/notification/RankingReconsideration.java
ava/com/android/server/notification/ValidateNotificationPeople.java
f176e3be88ffeaf806acc6e95b131789018bcaf5 23-May-2014 Adrian Roos <roosa@google.com> am fe3a59cf: Merge "Add a cache to LockPatternUtils" into lmp-preview-dev

* commit 'fe3a59cfa476fd22006f585b1c5ae8624d5191df':
Add a cache to LockPatternUtils
98157e8dbb29bef0d10899d88e87a5c1f8dcd3dc 23-May-2014 Adrian Roos <roosa@google.com> Merge "Add a cache to LockPatternUtils" into lmp-preview-dev
4f7884542ce8fba5bfed01ed834a32e6d3e2dea5 22-May-2014 Adrian Roos <roosa@google.com> Add a cache to LockPatternUtils

Caches responses from LockSettingsService in the client process.

Bug: 15088101
Change-Id: If77c5ec45f52a02c800d50cb8550bfcb180f301d
ava/com/android/server/LockSettingsService.java
8194899071e0a84c95ef10614bd1b9485b48f589 16-May-2014 Nicolas Prevot <nprevot@google.com> Rename code related to cross-profile intents.

For example, replace ForwardingIntentFilter by CrossProfileIntentFilter

Bug: 15023443

Change-Id: Iee8cdf578817ef9956bcdece803a49b0d07b67f7
ava/com/android/server/pm/CrossProfileIntentFilter.java
ava/com/android/server/pm/CrossProfileIntentResolver.java
ava/com/android/server/pm/ForwardingIntentFilter.java
ava/com/android/server/pm/ForwardingIntentResolver.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
ab17ddf66fb464ae326907a79052f9fead91317b 23-May-2014 Christoph Studer <chstuder@google.com> am 44ff0d4e: Merge "NoMan: Allow SysUI to register as listener" into lmp-preview-dev

* commit '44ff0d4e5b59b15788f9b5ad01ef82b59237c8a7':
NoMan: Allow SysUI to register as listener
00b206e39bc359466ae43cf20e34bb35f9069440 23-May-2014 Christoph Studer <chstuder@google.com> Merge "NoMan: Allow SysUI to register as listener" into lmp-preview-dev
0cc609606ae8d3b643fed41fe136b6ce7bb83a1b 23-May-2014 Christoph Studer <chstuder@google.com> Merge "SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE" into lmp-preview-dev
1f589759969f170fe58303d495b1a3e096c91780 04-Mar-2014 Wonsik Kim <wonsik@google.com> 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
ava/com/android/server/tv/TvInputHal.java
ava/com/android/server/tv/TvInputHardwareManager.java
ava/com/android/server/tv/TvInputManagerService.java
ni/Android.mk
ni/com_android_server_tv_TvInputHal.cpp
ni/onload.cpp
ef73ee1dd98acfc4a19561367cfc3e4d8bbe06ea 23-Apr-2014 Craig Mautner <cmautner@google.com> 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
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskPersister.java
ava/com/android/server/am/TaskRecord.java
46038ae0207ba6f6a8e04bce7267da7af8767f29 23-May-2014 Jungshik Jang <jayjang@google.com> Merge "Add SendMessageCallback to Hdmi control service."
190ed5db4ac90612c1f6420f87ea462076fbe1a0 23-May-2014 Dmitriy Ivanov <dimitry@google.com> am 2137d6a8: am d5ee4144: Merge "Increase start timeout for wrapped process"

* commit '2137d6a843b82996e08f0e03376e48860919d8bc':
Increase start timeout for wrapped process
d643f764f72efc1e7aa67392bf9ac40720ae14c3 22-May-2014 Jungshik Jang <jayjang@google.com> 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
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/RequestArcInitiationAction.java
ava/com/android/server/hdmi/RequestArcTerminationAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
d9a6475c9c4825b2d8fc5ea09b9de54ad4f91ee3 22-May-2014 Christopher Tate <ctate@google.com> DO NOT MERGE - Don't crash uninstalling updates to system apps

Bug 15167960

Cherrypick from master

Change-Id: Ibcb3275adb27b20939a237511aaaa8b0011127e1
ava/com/android/server/pm/PackageManagerService.java
5ec9aed64cd03545eded622cca214c83c170ab22 23-May-2014 Jeff Sharkey <jsharkey@android.com> Merge "Offer to stream and fsync() install sessions."
293251318168ad2dbfeb3d18176936fe2cc16325 22-May-2014 Dianne Hackborn <hackbod@google.com> (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
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
78cc340c2de873d6995c283b777476f7237d690f 22-May-2014 Jeff Sharkey <jsharkey@android.com> Offer to stream and fsync() install sessions.

Installers are interested in both streaming APK data and establishing
a happens-after relationship to support resuming downloads after a
process kill or battery pull.

This exposes a generic OutputStream for writing, and hooks up flush()
to be a blocking call which returns only when all outstanding write()
data has been fsync()'ed to disk.

Tests to verify behavior.

Bug: 14975160
Change-Id: I38289867c80ac659163bb0c2158ef12d99cc570d
ava/com/android/server/pm/PackageInstallerSession.java
4e7a22558997e9a9f7e3d2a6d25fc5d07f19ec90 23-May-2014 Christopher Tate <ctate@google.com> Merge "Don't crash uninstalling updates to system apps"
f71ece48a14e5c7da97024b0ced83da69e648a89 22-May-2014 Christopher Tate <ctate@google.com> Don't crash uninstalling updates to system apps

Bug 15167960

Change-Id: I606638292e524078f2859ba6be0a4861a4e01c00
ava/com/android/server/pm/PackageManagerService.java
3e144d3dfcf209349ead9995877f53feb0b5a66e 22-May-2014 Christoph Studer <chstuder@google.com> 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
ava/com/android/server/notification/ManagedServices.java
ava/com/android/server/notification/NotificationManagerService.java
71f18fd1b64071e486bafff237b1f87a56d4aead 20-May-2014 Christoph Studer <chstuder@google.com> 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)
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerInternal.java
ava/com/android/server/statusbar/StatusBarManagerService.java
f13cd857e007bed434e199e38e39c4546f4f9469 22-May-2014 Winson Chung <winsonc@google.com> Merge "Removing unnecessary public values. (Bug 14995844)"
6784f1c62379f2226d895cd944d716c17f4cb195 22-May-2014 Winson Chung <winsonc@google.com> Removing unnecessary public values. (Bug 14995844)
ava/com/android/server/am/ActivityStack.java
31d8b9333bf3b1e6048182885149b80c6fa6b500 22-May-2014 Winson Chung <winsonc@google.com> Merge "Invalidating screenshots when we resume the task that they were taken in. (Bug 13587139)"
02a217fad03a695522b2c4d4872f69e3e083059e 22-May-2014 Dianne Hackborn <hackbod@google.com> Merge "Battery monitoring fixes:"
2d4b4ed681efcfb64c4d2b4d2a2d236aae1dc7ee 22-May-2014 Dianne Hackborn <hackbod@google.com> 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
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
f0ee5a795a9deada60aaad41ecbbeed69a7b161b 22-May-2014 Nicolas Prevot <nprevot@google.com> Merge "Correcting a bug related to Uri permissions."
dcb27fadcde2c45e14ee1658db4d16cc699ec250 22-May-2014 Nicolas Prevot <nprevot@google.com> Correcting a bug related to Uri permissions.

Change-Id: I70765eb659151ce0c5af06075a844143c09429e8
ava/com/android/server/am/ActivityManagerService.java
540b01e024c040dfb1ee50cfcdc96a401adfcf25 20-May-2014 Christoph Studer <chstuder@google.com> SysUI: Use SBN keys instead of IBinder keys

In preparation of migrating to NotificationListenerService,
remove dependence on IBinder keys for notifications and switch
to SBN.getKey() instead.

Bug: 15131411
Change-Id: Ic272e4a05fde6481c734144c5b34c49b2f021649
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerInternal.java
ava/com/android/server/statusbar/StatusBarManagerService.java
07fb5a884f488b26a850a3e2f5f1264da9809835 22-May-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Move dis/enable of mobile data to Telephony"
995757e330237813a62e8d163a243e98984fc535 22-May-2014 Adrian Roos <roosa@google.com> Merge "Remove dead TrustListeners"
4fae8e165b3e10d8365ab9c08b13704d57e119c7 22-May-2014 Yohei Yukawa <yukawa@google.com> Merge "Remove unnecessary internal lock"
5a647b69be8ac8d40c33ed9abe63e41514699e5b 21-May-2014 Yohei Yukawa <yukawa@google.com> 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
ava/com/android/server/InputMethodManagerService.java
47eecf03307acfb1bc7d4ad51311beb4eeb99366 22-May-2014 Robert Greenwalt <rgreenwalt@google.com> Move dis/enable of mobile data to Telephony

ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
ava/com/android/server/ConnectivityService.java
dbbceffd9b7fc812da9a5b0a1269d43f748c37b8 22-May-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Add feature actions for HDMI-CEC playback device"
0ddf4db856442b1af05f2c58d070a379d7b51242 22-May-2014 Jungshik Jang <jayjang@google.com> Merge "Add finish() after timeout of Reqeust Arc operations."
78d695d8ba532214b02e7f18e0ccf89cf099163d 13-May-2014 Jinsuk Kim <jinsukkim@google.com> Add feature actions for HDMI-CEC playback device

- OneTouchPlayAction
- DevicePowerStatusAction
- addHotplugEventListener
- removeHotplugEventListener

Change-Id: Ia7f31507ca62127efbacbbfe07ab43ba1f9bd4cf
ava/com/android/server/hdmi/DevicePowerStatusAction.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/OneTouchPlayAction.java
f1cc12950c52ba7669fe1edfd8900aab1c40b78b 22-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Delete the EthernetDataTracker."
cc12f28e5dc6bd027971c995c7aab63dadcc0d35 22-May-2014 Winson Chung <winsonc@google.com> Invalidating screenshots when we resume the task that they were taken in. (Bug 13587139)

- Removing multiple calls to get the same thumbnail screenshot
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
5569ba20b6ffa54e2bc2229111367377ddb5a801 22-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Fix a typo in IpConfigStore."
3c44c99af500601fbb8ba6b8f71e5d930ca5e269 22-May-2014 Lorenzo Colitti <lorenzo@google.com> 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
ava/com/android/server/ConnectivityService.java
56cf7c517e33df5f871f85c13a2e2315b20cb2ed 22-May-2014 Lorenzo Colitti <lorenzo@google.com> Fix a typo in IpConfigStore.

Change-Id: I1fc845bf4547ae9a86db02ed29b6d5ba60a01277
ava/com/android/server/net/IpConfigStore.java
7220faeec616f87b9a8b98885956348b218026bf 22-May-2014 Winson Chung <winsonc@google.com> Merge "Small perf tweaks."
47a3e65acc35cd3061bf3867e8b20753870fd892 22-May-2014 Winson Chung <winsonc@google.com> Small perf tweaks.
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
711b7a5428041a39512b540402a654d149152261 21-May-2014 Jason Monk <jmonk@google.com> Merge "Don't exit lock task on sleep"
a562f5daf6863640afb931db9e9ea66bea94b828 21-May-2014 narayan <narayan@google.com> am 82ec8c58: am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."

* commit '82ec8c58b1f1cd0cce56d11b7679440f6ba54f4a':
Fix NPE in PackageManagerService.
82ec8c58b1f1cd0cce56d11b7679440f6ba54f4a 21-May-2014 narayan <narayan@google.com> am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."

* commit 'ab3d85ab1a0ae58add5df6efc30607624475405b':
Fix NPE in PackageManagerService.
2d437d04614ba79ad54546b05f9aec93a479b603 21-May-2014 Jason Monk <jmonk@google.com> Don't exit lock task on sleep

Change-Id: I332088ce31ce06a771461a78fcc63f4afc824813
ava/com/android/server/am/ActivityStackSupervisor.java
cee44ba418bef83571349acb2d24ef29833502e0 20-May-2014 Christoph Studer <chstuder@google.com> 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
ava/com/android/server/notification/NotificationManagerService.java
5b53148a4e8d47b88362703445010c54f9fd6ecc 21-May-2014 RoboErik <epastern@google.com> Merge changes I1cbdff1d,I23906b4c

* changes:
Handle headsethook voice launching
Add 5s timeout to wakelock
7bd35c7e6f5e8b4085bc8ee708e67872cab9743f 12-May-2014 justinzhang <justinzhang@google.com> Use DeviecPolicyManager to authenticate lock task

Uncomment lines in ActivityManagerService. Before start lock task,
ActivityMangerService calls DevicePolicyManager to see if the
app can go into lock task.

Change-Id: I9ad784d7cc637d45884dcb2623b4c59ff802f93d
ava/com/android/server/am/ActivityManagerService.java
d0ec8438820d936e13664ec052c01f14d8a4e8e3 21-May-2014 Dan Sandler <dsandler@android.com> am 7509733c: Elide extras strings from noman dumpsys output.

* commit '7509733c8dfb4e65dbb45ab582e09d599dfaaa28':
Elide extras strings from noman dumpsys output.
7509733c8dfb4e65dbb45ab582e09d599dfaaa28 16-May-2014 Dan Sandler <dsandler@android.com> Elide extras strings from noman dumpsys output.

Bug: 14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
(cherry picked from commit 44de3cfc08428378b93172a2b03f9785a3638678)
ava/com/android/server/notification/NotificationManagerService.java
eac222a002797646b7a8a2d14828c44b27535000 21-May-2014 Yohei Yukawa <yukawa@google.com> Merge "Update InputMethodSubtypeSwitchingController correctly"
efb5d8d317b3aedc360a05cfb366f703c12f1c23 21-May-2014 Adrian Roos <roosa@google.com> Merge "Add dumpsys facility and a history to TrustManagerService"
c834a2590cc7ac478ba2ef5a6d8eb7ce471df132 21-May-2014 Yohei Yukawa <yukawa@google.com> Update InputMethodSubtypeSwitchingController correctly

User visible behavior is supposed to be identical with and
without this CL.

Previously, there is some corner cases where
InputMethodSubtypeSwitchingController#resetCircularListLocked is
not called but the list of enabled input method is updated.

Fortunately, this corner cases are not observable for a user
because we have not updated the the rotation order dynamically.

However we should fix this before implementing smarter rotation
algorithm that changes the rotation order dynamically.

BUG: 7043015
Change-Id: I145a514dc4cde369ba50431c408c916046ab0c6e
ava/com/android/server/InputMethodManagerService.java
b979f23c5970138d75d5c2e76ded1470f7a8eb83 16-May-2014 Dan Sandler <dsandler@android.com> Elide extras strings from noman dumpsys output.

Bug: 14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
ava/com/android/server/notification/NotificationManagerService.java
5daa4598e2cc764f89b4138d2ac15ce3f8f4f56f 21-May-2014 Chris Wren <cwren@android.com> Merge "add ranking information to the dumpsys info"
4bfcae9a3f3f1e225bed08b0a7c09ebf293d6c87 21-May-2014 Jeff Brown <jeffbrown@google.com> am 77669abb: am 9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev

* commit '77669abb8300b672700418216939b9253dc98bee':
Defer display ready until brightness ramp completes.
d862ebb6036a769cb3be371b396e9e33f89ee365 21-May-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of fcc4fed3 to master

Change-Id: Icebca982b01debd67a1470c02651ef8936f6e5b0
358164c09e367199cd3d4af6381a9f342ac9f0ef 21-May-2014 Jungshik Jang <jayjang@google.com> Add finish() after timeout of Reqeust Arc operations.

If <Request ARC Initiation> and <Request ARC Termination>
receive no <Initiate ARC> and <Termniate ARC> and
it should clean up itself, i.e call finish().

Change-Id: Id10fbe416cf5f5ab836935a1b560864b5cbd3b83
ava/com/android/server/hdmi/RequestArcAction.java
3856204c0ef3bf35e3c991fb401f30e54aefb4f0 21-May-2014 Sander Alewijnse <salewijnse@google.com> Merge "Disallow adb sideloading if UserManager flag is set for user."
1c91077bf7e13f8fe4e58cef8389d9b7a3ddb230 14-May-2014 Sander Alewijnse <salewijnse@google.com> Disallow adb sideloading if UserManager flag is set for user.

Solution is based on "redefining" the User_all.

Change-Id: Ie1ce5d6391e807f8caa05fe2a92009923d1032a8
ava/com/android/server/pm/Settings.java
77669abb8300b672700418216939b9253dc98bee 21-May-2014 Jeff Brown <jeffbrown@google.com> am 9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev

* commit '9beccf9f9e28f74bd78041e4381b59ce0a2351e7':
Defer display ready until brightness ramp completes.
fcc4fed3c16a57ef713a96b7298ed43aaeef2df4 21-May-2014 Jeff Brown <jeffbrown@google.com> am 6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev

* commit '6fb904bfd1f943547d6e5bc6f199ffec2290da01':
Make power button behavior configurable.
1d265716954122f79d5fdd9d953a98e303d298c9 21-May-2014 Brian Carlstrom <bdc@google.com> am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared user ids."

* commit 'e77a77d081ff9d05100702f5880f356da27fd087':
Improve ABI handling for shared user ids.
e1a2e26a03e76279c9b03bdd81f92df70f8707e7 21-May-2014 Jungshik Jang <jayjang@google.com> Merge "Add several actions for ARC (Audio Return Channel)"
2f51aec689226e259d08bf04d838251f249572e3 20-May-2014 Jungshik Jang <jayjang@google.com> Fix NullPointerException on init of HdmiMhlController.

Change-Id: I2f79ce0ef3a368c2fcc8d047de2dcad914679e0c
ava/com/android/server/hdmi/HdmiControlService.java
67ea521d14f366fe5aac09e512865d31bfa0ee53 15-May-2014 Jungshik Jang <jayjang@google.com> Add several actions for ARC (Audio Return Channel)

ARC channel is established by both TV and AV Reciever.
From TV, it sends <Request ARC Initiation> and AVR
responds with <Initiate ARC>.
From AVR, it can be initiated by sending <Initiate ARC> directly
to TV.
Once TV receives <Initiate ARC> it sets up ARC internally
and replies <Report ARC Initiated> to AVR.
Termination steps are almost same except for message name
(use Terminate instread of Initiation).

In order to implement the above steps, this change introduces
following classes.

RequestArcInitiation(Termination)Action:
handles <Request ARC Initiation> (<Request ARC Termination>)
RequestArcAction handles common logic of them.

SetArcTransmissionStateAction:
handles ARC set up, enabling/disabling ARC and
reports results to AVR.

<Initiate ARC> and <Terminate ARC> handles directly in
HdmiControlService

Along with this, this change has implmentation for
add&removeAction. To avoid synchronization issue
they are isolated to main thread.

Change-Id: I3c5cf7c777e6c1de50d63ce4643b191dfe15fe1f
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/RequestArcAction.java
ava/com/android/server/hdmi/RequestArcInitiationAction.java
ava/com/android/server/hdmi/RequestArcTerminationAction.java
ava/com/android/server/hdmi/SetArcTransmissionStateAction.java
96db91e0ff30c872dacc7f9a5d5a67e950e4ba26 20-May-2014 Narayan Kamath <narayan@google.com> Improve ABI handling for shared user ids.

The key improvement is that we need to keep track of
the package that's currently being scanned (this includes
new installs and upgrades of existing packages) and treat
it specially. If we didn't do that, In the case of upgrades
we would perform the shared UID calculation based on the ABI
of the old package, and not the current package.

This change also allows us to perform the CPU ABI calculation
before dexopt, which saves us from having to do it twice and
fixes a bug where we were using the wrong package path to
dexopt a package.

This also has the side effect of fixing 15081286.

bug: 15081286

(cherry-picked from commit b851c89d2252cf3d1dc504558ce1553527885316)

Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
ava/com/android/server/pm/PackageManagerService.java
4255869ac00e700395832ee73b2294603d4b6ece 21-May-2014 Jeff Brown <jeffbrown@google.com> Defer display ready until brightness ramp completes.

Bug: 14494096
Change-Id: I6da6fffbbce2c7058170e5c6139eae4cb5a06d88
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/display/RampAnimator.java
6d8fd27e51d799cf7418b14092b5e806d9792812 21-May-2014 Jeff Brown <jeffbrown@google.com> Make power button behavior configurable.

Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.

Bug: 14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
ava/com/android/server/power/PowerManagerService.java
7a32533c62fc7ac5d38f40de7372bc4314f7f2e5 21-May-2014 Jeff Brown <jeffbrown@google.com> am ccf51bef: am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev

* commit 'ccf51bef288652cb618a566a376173e252b84af0':
I'm feeling the good vibrations.
df3bad37d2e3b52a86b18e0d9c84ede4d5098f92 21-May-2014 Jeff Brown <jeffbrown@google.com> am 8f120dd6: am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev

* commit '8f120dd6d631ac632d3356b81403a53f958021f0':
Allow display timeouts to be set in config.xml.
ccf51bef288652cb618a566a376173e252b84af0 21-May-2014 Jeff Brown <jeffbrown@google.com> am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev

* commit '2d9b513dab78242281bca125b4abc6b8235089a6':
I'm feeling the good vibrations.
8f120dd6d631ac632d3356b81403a53f958021f0 21-May-2014 Jeff Brown <jeffbrown@google.com> am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev

* commit '0702786d81eb9f9bf47c3a0827d3f2824c3f4228':
Allow display timeouts to be set in config.xml.
969579bb9d208c91e081ff96d2fd788269d254bd 21-May-2014 Jeff Brown <jeffbrown@google.com> I'm feeling the good vibrations.

When the device enters a non-interactive state, we normally
cancel all active vibrations as a safety precaution. However if
the system is performing haptic feedback then we want to allow
it to run to completion.

Bug: 14319563
Change-Id: I673781bbf32562e45c1595689e6b423bd178ea73
ava/com/android/server/VibratorService.java
27736f5c0ada99bf2a7e007a1dec0ad51f65fa52 21-May-2014 Jeff Brown <jeffbrown@google.com> Allow display timeouts to be set in config.xml.

Bug: 13671523
Change-Id: I79fc21999bc62743178d2d22071455a0c11070c9
ava/com/android/server/power/PowerManagerService.java
00592c2700f5b23c6d1ec6f132b013cd9e91390a 21-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Move IP config from WifiConfiguration to IpConfiguration."
cd47ecb6903edb57f4a2ec52ecd33d4346ba13e9 21-May-2014 Yuncheol Heo <ycheo@google.com> Merge "Fix the wrong conversion of byte to int."
6346155c5a48495944041e65ec279c88b0fa1391 10-Mar-2014 Jaewan Kim <jaewan@google.com> Move IP config from WifiConfiguration to IpConfiguration.

This is so that Ethernet can use it in the future.

Bug: 7606609
Bug: 8687763

Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
ava/com/android/server/net/DelayedDiskWrite.java
ava/com/android/server/net/IpConfigStore.java
863ddcc7acef56eaf49f424586d83543c6ba2bbf 21-May-2014 Amith Yamasani <yamasani@google.com> Merge "Per-user telephony restrictions"
9f6c25f57e26f3e2f9c744547a139d14b7d3db5c 16-May-2014 Amith Yamasani <yamasani@google.com> Per-user telephony restrictions

Allow profile owners or administrators of restricted profiles
to restrict access to telephony features such as calling and
texting for a user.

Change-Id: I89f97608c07c647ad8a7b43fef9d1e6bc4a84e95
ava/com/android/server/pm/UserManagerService.java
9a9d0b5f6f4be758ed6c8b837a9dd01a451bc0c0 20-May-2014 RoboErik <epastern@google.com> Handle headsethook voice launching

This launches voice search when headsethook is long pressed unless
you're in a call. The handling is done in MediaSessionService. This
CL also adds a switch to the new APIs to the fallback event handler
which was missed previously.

Change-Id: I1cbdff1d6e9f5293885dd8aaed8ba13cb15b36d4
ava/com/android/server/media/MediaSessionService.java
418c10ca9df1505509afeffd558cd92fc97bc635 19-May-2014 RoboErik <epastern@google.com> Add 5s timeout to wakelock

Also filed a b/15110168 to anr the app if it doesn't finish with the
button event in 5s.

Change-Id: I23906b4c7f17d3d3a29eef92b523d8653c87017e
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
c0e439f1b7dcd937b6cc842eafc7a4e7c8abce9b 20-May-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem: add new audio device definitions"
53dd1f7ffce9165889a7e0a42e58172c7e7d4dab 20-May-2014 Winson Chung <winsonc@google.com> Merge "Fixing transition to/from Recents with full screen apps."
ae0844164959c2b1bf006d3fef26dbabc66c5873 20-May-2014 Winson Chung <winsonc@google.com> Fixing transition to/from Recents with full screen apps.

Change-Id: I2f400b6736581a37d38a75ee7194fc7cb6438460
ava/com/android/server/wm/AppTransition.java
ava/com/android/server/wm/WindowManagerService.java
d1dd0277552b8729154ffe67c14e7dcfb833b04a 20-May-2014 Chris Wren <cwren@android.com> add ranking information to the dumpsys info

Change-Id: Ie08186066821a10feef010fd7967150b5517cd54
ava/com/android/server/notification/NotificationManagerService.java
3bf27231930d10c1552f2822f90d4fc5fc97cba9 20-May-2014 Dianne Hackborn <hackbod@google.com> Merge "Delay the dispatching of non-wakeup alarms."
d4e6d467cd61d6bec1ae25744a415a96f0a0f760 17-May-2014 Dianne Hackborn <hackbod@google.com> Delay the dispatching of non-wakeup alarms.

When the screen is off, there are no guarantees about when
non-wakeup alarms will be dispatched. Historically they are
dispatched any time the device wakes up. With this change,
we will delay the dispatch until sometime later.

The amount of delay is determined by how long the screen has
been off. Currently there are three possible delays: up to
2 minutes if the screen has been off for less than 5 minutes;
up to 15 minutes if it has been off for less than 30 minutes;
and otherwise up to an hour.

When the screen is turned on or a wakeup alarm is dispatched,
all delayed alarms will also be dispatched.

Note that one of the things this delays is TIME_TICK, which
means the in many cases we won't deliver TIME_TICK until the
screen is in the process of waking up. The current
implementation causes this to be delayed until the SCREEN_ON
broadcast is sent; we probably want to improve this to have
the power manager tell the alarm manager about the screen
turning on before it sends that broadcast, to help make sure
things like the lock screen can update their current time
before the screen is actually turned on.

In addition, switch all of the alarm stats to use the new
PendingIntent "tag" identifier for its operations, instead
of the old code to try to construct a pseudo-identifier
by retrieving the raw Intent.

Also add a new package manager command to immediately write
packages.xml.

Change-Id: Id4b14757cccff9cb2c6b36de994de38163abf615
ava/com/android/server/AlarmManagerService.java
ava/com/android/server/InputMethodManagerService.java
ava/com/android/server/pm/PackageManagerService.java
a67be03f9e2734c0a6c03af20e17f963daaed257 17-May-2014 Robert Greenwalt <rgreenwalt@google.com> Add NetworkFactory names and unregistration.

Some Factories come and go (Telephony) and so they need to be able to unregister.
Also, debugging is tough when the factories are anonymous, so add names for logging.

Lastly, only send single set of NetworkRequests to a newly registered NetworkFactory
and only send the requests.

Change-Id: I717d63363f25c446f8ecf38d933b1a35d744af6e
ava/com/android/server/ConnectivityService.java
05ad48206a082057e17723d32493c153faa6881e 16-May-2014 Christoph Studer <chstuder@google.com> Add ZEN and speedbump to NotificationListenerService

Change-Id: I39fae5d77863e0d10cf236a096cc589167d146d3
ava/com/android/server/notification/NotificationManagerService.java
7a4f3d448b17b4bea190c906d7ecc7f8bec9ff80 02-May-2014 Adrian Roos <roosa@google.com> Add dumpsys facility and a history to TrustManagerService

TrustManagerService now keeps track of all events that
influence its state and reports them when it is dumped or
a bugreport is collected.

Bug: 15079129

Change-Id: Iac13de8a848d2b12c8d06168a6969f55b264144a
ava/com/android/server/trust/TrustAgentWrapper.java
ava/com/android/server/trust/TrustArchive.java
ava/com/android/server/trust/TrustManagerService.java
87be9ba1eaa396c95c5f335c8ba51123d304a7bb 20-May-2014 Jason Monk <jmonk@google.com> Merge "Fix reference to ProxyInfo extra"
a4ba56ba879b83e2866c31b4eb395d38302a1769 20-May-2014 Adrian Roos <roosa@google.com> Remove dead TrustListeners

Follow-up to I972a9134aed18fc160c919eac93e9d488b5691f1
Bug: 15092272

Change-Id: I46d718edcbad0e46416263dd21507fa8abeb8d7b
ava/com/android/server/trust/TrustManagerService.java
03e8a834da8189b3a20023cee31e78a17a45b07b 20-May-2014 Yuncheol Heo <ycheo@google.com> Fix the wrong conversion of byte to int.

Because 'byte' type is signed, we need a mask when converting it to 'int' type.

Change-Id: I3a8fcb38c9d108c0280d66301e29144391807401
ava/com/android/server/hdmi/NewDeviceAction.java
948d32748caaac5be06c991ebf00f74265a7849f 17-May-2014 Eric Laurent <elaurent@google.com> AudioSystem: add new audio device definitions

Change-Id: Ib7675bc33771365b2dbb7694c522469317b11457
ava/com/android/server/WiredAccessoryManager.java
3fa61b671eaa5ba1aa06a882d275ab88e9c0c4c7 20-May-2014 Amith Yamasani <yamasani@google.com> Merge "Allow adding a user while still removing other users"
f584f014dbb281727fccfea10bc9c2539a752f17 20-May-2014 Amith Yamasani <yamasani@google.com> Allow adding a user while still removing other users

When at the user limit, removing and adding a user causes a race
condition where the deleted user is still being removed and adding
another one fails.

This change excludes deleted users from the counting to compare
against the limit.

Also fix an ArrayIndexOutOfBounds recently introduced in AppOpsService.

Bug: 13282768
Change-Id: Ib79659e7604396583a280dbbc560b288a6d9051c
ava/com/android/server/AppOpsService.java
ava/com/android/server/pm/UserManagerService.java
fe4e1b655fd2ea99cdb907bc8ce628e747e2ee03 20-May-2014 Jim Miller <jaggies@google.com> Merge "Fix infinite loop in TrustManagerService exception handler."
ce271360daaa566e4d29bb2c827e9c46f54ac092 20-May-2014 John Spurlock <jspurlock@google.com> Merge "Dump the countdown condition, if active."
fb8eb00bcd56429fc6a4f1f349ee09a45074ebbf 20-May-2014 John Spurlock <jspurlock@google.com> Dump the countdown condition, if active.

Change-Id: I3fa1d239379565bae74094dc2bc2da76326f41dd
ava/com/android/server/notification/ConditionProviders.java
577b6f6ae4c41ee5a5b79a82962f38df395e8752 20-May-2014 Jim Miller <jaggies@google.com> Fix infinite loop in TrustManagerService exception handler.

Fixes bug 15092272

Change-Id: I972a9134aed18fc160c919eac93e9d488b5691f1
ava/com/android/server/trust/TrustManagerService.java
4661a2574a9936bae7207077e975ded66b91ec29 19-May-2014 Winson Chung <winsonc@google.com> Merge "Fixing regression in dismissing Recents."
6cb485fd2e2f8ace05e1ff281ab0fc824d3652cb 19-May-2014 Winson Chung <winsonc@google.com> Fixing regression in dismissing Recents.

- Restoring app info functionality when developer options are enabled and you long-press on the app icon.

Change-Id: I8a20ff5f595eefa20db5528c0d5b1a1f0b110834
ava/com/android/server/statusbar/StatusBarManagerService.java
45d50a1363222ce5c3e352c6ba17f90e29bb3467 19-May-2014 Adrian Roos <roosa@google.com> Merge "Speed up brightness transition if auto brightness adjustment is changed"
b19c19265448a6252b1c14f3da85d52e50be34c3 19-May-2014 RoboErik <epastern@google.com> Merge "Rename session classes to have media prefix, hide routes"
b4f4f69e4c56ad1217be9a3c792d4723f6db2256 19-May-2014 RoboErik <epastern@google.com> Merge "Move media key processing to sessions"
3662ad4aece1a1ae4f16c9965f32eb3ba547a2ad 19-May-2014 David Christie <dnchrist@google.com> Merge "Fix bug where location provider fails on secondary users. Bug: 12592045"
5d2e896457b3a803309f7babeb984a7d1a3b4f5f 19-May-2014 Robert Greenwalt <rgreenwalt@google.com> Fix the build

Change-Id: I18f78f6055f6f9c14571058d6834c8dec01aa732
ava/com/android/server/ConnectivityService.java
958e559b98bd7c3ab6dd20bf530bf58f56f20b63 19-May-2014 Winson Chung <winsonc@google.com> Merge "Initial changes to enable keyboard support with alternate Recents. (Bug 14067913)"
9aeb60739909aa2b8100c95157835e4e3db28519 19-May-2014 Winson Chung <winsonc@google.com> Merge "Enabling alternate recents on all form factors."
c47bb2a3238996dd690a9dbf8a269ab97cbc2661 19-May-2014 Adrian Roos <roosa@google.com> Merge "Fix cropping for fullscreen windows"
34524f06fb77607884c69f891471725f4ac0889a 19-May-2014 Robert Greenwalt <rgreenwalt@google.com> Add javadoc for NetworkRequest.

Also moved the requestId serial number out of this public class into CS.

Had to leave NetworkRequest hidden for now because the docs refer to things still hidden
in ConnectivityManager.

Change-Id: I14d1fe52d992adf5e4dc197b8f5433e40b0adfe6
ava/com/android/server/ConnectivityService.java
f6edb97b62a89789f7eea5ca4b31f697333c88cc 19-May-2014 Narayan Kamath <narayan@google.com> am 9672ee12: am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."

* commit '9672ee125d6aee73bf1e5425c4089285714f25bf':
Fail if we're unable to agree on an ISA for shared UIDs.
9672ee125d6aee73bf1e5425c4089285714f25bf 19-May-2014 Narayan Kamath <narayan@google.com> am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."

* commit 'deda5467f44fc4a03c3435f0c6d7bda4ea298b99':
Fail if we're unable to agree on an ISA for shared UIDs.
3eeb4e6e40e2c23a0bcfe24937688bd437c15e2a 19-May-2014 Adrian Roos <roosa@google.com> Fix cropping for fullscreen windows

Bug: 15046646
Change-Id: I526c0044e3715a4096373b8bbbdbd0c864be2df9
ava/com/android/server/wm/WindowStateAnimator.java
b503d782f506aa07662a31de83b2f36bb89dc952 19-May-2014 Yohei Yukawa <yukawa@google.com> Merge "Do not pass null to IInputMethod#setSessionEnabled"
9d91b43c8d0fa233905ecf132c6e6ee664904694 19-May-2014 Yohei Yukawa <yukawa@google.com> Do not pass null to IInputMethod#setSessionEnabled

It doen't make sense to pass null as IInputMethodSession
for IInputMethod#setSessionEnabled. If we do this, it
causes NPE.

BUG: 14980068
Change-Id: Ide48d098d5e7640890257e31f8872e79b9821eb2
ava/com/android/server/InputMethodManagerService.java
4b0b0391d5b3ef289e00423ec701b450ac2a0eb3 19-May-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Initialize internal CEC logical devices"
337a63aea7e6483a119ba876d72629acc17a9a1b 18-May-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Decouple network_sampling frequency from VDBG"
810c2b5f4dab0de8fe38a9091ea68e3e35567c77 18-May-2014 Craig Mautner <cmautner@google.com> Merge "Pass correct task to window manager"
abcc59c32fd67c507f2ff192e82fef971968b2db 18-May-2014 Craig Mautner <cmautner@google.com> Pass correct task to window manager

The target task when starting is not always the top task. If it's not
the window manager gets into a bad state.

Fixes bug 14684143.

Change-Id: I90145ae43bdc5d980dc25ac19e12aa84debfed71
ava/com/android/server/am/ActivityStackSupervisor.java
71dc28b11eedd0e7c99fe11b832f1301f262ce33 17-May-2014 Winson Chung <winsonc@google.com> Merge "Refactoring RecentsActivityValues into TaskDescription, and ensuring they are resolved when set. (Bug 14995928, 14832629)"
1e8d71b605b4872e93200706a80a88a3ff25498c 17-May-2014 Winson Chung <winsonc@google.com> Initial changes to enable keyboard support with alternate Recents. (Bug 14067913)

Change-Id: Icc5d2a784ed3c3c27143eb04cbb4305549ee223a
ava/com/android/server/statusbar/StatusBarManagerService.java
311060571ccf5c9bd6ece57c109a22494d1c1db1 17-May-2014 Robert Greenwalt <rgreenwalt@google.com> Decouple network_sampling frequency from VDBG

Add a special debug flag for testing network sampling.

Change-Id: Ibe572c3b5648ca25f1e5be2c61e5c5ad2979b2cb
ava/com/android/server/ConnectivityService.java
27fb0eec9013b0526ced25d1f9c28f5b9f681ade 17-May-2014 Christopher Tate <ctate@google.com> Merge "Add idle-state controller for the Task Manager"
851f3d5110c48bcdba4762739c4ad9b9b479d9af 15-May-2014 Christopher Tate <ctate@google.com> Add idle-state controller for the Task Manager

"Idle time" is currently defined to begin ~ an hour (actually slightly
more) after the screen turns off and/or dreaming begins. Screen-on
and dreams-ending are the triggers for declaring "idle" time to be
over.

Bug 14993295

Change-Id: I0898871d5b76a52d647ae2ebcb1b2f941ec45e79
ava/com/android/server/task/controllers/IdleController.java
1bc91f0d2e3a4469a0a7dbc546c0b61d2fd88552 17-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Stop clatd when starting the Nat464Xlat service."
42ea7eecd149161ed192d3029f0d77d1d08a4aa5 17-May-2014 RoboErik <epastern@google.com> Rename session classes to have media prefix, hide routes

This renames several of the core session classes to be prefixed
with Media. It also adds @hide to all route references for now.

Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
ava/com/android/server/media/MediaRouteProviderProxy.java
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
a449dc033b79775b8945d9cc5a035a6deb145065 16-May-2014 Winson Chung <winsonc@google.com> Refactoring RecentsActivityValues into TaskDescription, and ensuring they are resolved when set. (Bug 14995928, 14832629)

Change-Id: I582221468e63a96a5dfd132a31b09e72099b170f
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/TaskRecord.java
8a2cfc309ab9126e90022916967c65a793c034f0 16-May-2014 RoboErik <epastern@google.com> Move media key processing to sessions

Send all media key events over to the MediaSessionService instead
of AudioManager. This does not affect volume handling yet, so it
is possible to get into a state where volume will be handled by
a different thing than media buttons. Except for corner cases
this shouldn't be noticable.

Change-Id: I00a576175d9c82937f0836e509b9a98d5cb77b83
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
fdd920319201d241f053a287e342a900934f8e73 16-May-2014 Matthew Williams <mjwilliams@google.com> Refactored code didn't make it into previous CL

Change-Id: I7ec93e783267d0c0fb39fbc8d0abe7270bdaea68
ava/com/android/server/task/StateChangedListener.java
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskServiceContext.java
ava/com/android/server/task/controllers/ConnectivityController.java
6da87ab684f104baa836138ca5153eb2d6c1f929 16-May-2014 Adrian Roos <roosa@google.com> Speed up brightness transition if auto brightness adjustment is changed

Bug: 15019366
Change-Id: Id6e18f6b74d801bc8e87ba84c0948bbbabda368b
ava/com/android/server/display/DisplayPowerController.java
43b76dfddbfe2a27a0658dbca8632a9b1dc8d6ff 16-May-2014 Lorenzo Colitti <lorenzo@google.com> Stop clatd when starting the Nat464Xlat service.

If a runtime restart happens while clatd was running, we try to
start clatd, which causes a fatal exception because netd returns
a 400 error (clatd already started.

Bug: 13450716
Bug: 15012035
Change-Id: I102a06d6193fb5f4a1ebe5ad52e5647ff72ca0da
ava/com/android/server/connectivity/Nat464Xlat.java
4b291fbffc22c47f55355d79c8d1cbe8ac6742dc 16-May-2014 Matthew Williams <mjwilliams@google.com> Merge "TM TaskServiceContext implementation"
4b0ec7e924a9d0665cc44dfed17d85c00ba9b0ce 16-May-2014 Adrian Roos <roosa@google.com> Merge "Trust Agents: Withhold trust until user has authenticated"
dc0d5d185003ed1e375e727e2fa9bbc084c65180 16-May-2014 Adrian Roos <roosa@google.com> Merge "Trust Agents: Implement DPM override"
3fce73a866e58232b484ca26b58b1394b0121b6a 16-May-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix recording of wake_lock_in."
7046bfd054b67fd3cfe8f462f7b9ea126652610f 16-May-2014 Adrian Roos <roosa@google.com> Trust Agents: Withhold trust until user has authenticated

Bug: 14229695
Change-Id: I40d9fa442aa05437c20081c007ed64f984042418
ava/com/android/server/trust/TrustManagerService.java
9a7554300637902bbb25991ffba41a9b8f682eff 16-May-2014 Dianne Hackborn <hackbod@google.com> Fix recording of wake_lock_in.

There was a bug that would allow the nesting count
to get off. Also better documentation of times in
HistoryItem, and new option to disable resetting of
the stats when unplugging.

Change-Id: If1b39a02475c5b620c67b700a323a6d0462d5c61
ava/com/android/server/am/BatteryStatsService.java
691e93e82cf97338a760c5fbf900ef29ed9224c2 13-May-2014 Matthew Williams <mjwilliams@google.com> TM TaskServiceContext implementation

Each task is run on the client from within a TaskServiceContext.
TSC tracks the state of execution of each task on the client.

Change-Id: I93c306a83c1115559f4e9675d9997dceae3f186a
ava/com/android/server/task/TaskCompletedListener.java
ava/com/android/server/task/TaskList.java
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskServiceContext.java
ava/com/android/server/task/TaskStore.java
ava/com/android/server/task/controllers/ConnectivityController.java
ava/com/android/server/task/controllers/TaskStatus.java
8974f2490992b2921b636c0b65ebeb5b19dda89b 16-May-2014 Jason Monk <jmonk@google.com> Merge "Notify AppOpsService of UserRestrictions and Owners"
fcfef283d8707f8e695645fe10dba531b7673c14 16-May-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Clean up when we switch networks."
62062996dd256df8b575b2ba1f0bf97109c4e0ba 06-May-2014 Jason Monk <jmonk@google.com> Notify AppOpsService of UserRestrictions and Owners

This makes the DevicePolicyManagerService and UserManagerService
push the DeviceOwner/ProfileOwners and user restrictions on boot
as well as on any change.

This also adds a list of restrictions that allow any op to connected with
a user restriction such that it will return MODE_IGNORED when the user
restriction is present (except for the device/profile owner).

Change-Id: Id8a9591d8f04fe5ecebd95750d9010afc0cd786c
ava/com/android/server/AppOpsService.java
ava/com/android/server/pm/UserManagerService.java
ca36b95bd3e0cc8b6f1685bd57a09419db756b91 16-May-2014 Adrian Roos <roosa@google.com> Trust Agents: Implement DPM override

Disable trust agents when a device policy
disabling them is in effect.

Bug: 14619289
Change-Id: I0920a17021cbf045d2362735df49ef4d013fcc7f
ava/com/android/server/trust/TrustManagerService.java
4064af844ca6e58dc2908525634c13c4be277eac 16-May-2014 Robert Greenwalt <rgreenwalt@google.com> Clean up when we switch networks.

Need to unhitch mNetworkForRequestId when a network is no longer
satisfying a request.

Change-Id: I3b3cde7dd92ec87a76ae7a0825ad22e892fa8fd5
ava/com/android/server/ConnectivityService.java
3242f51c936d804c5308971a8cc10a251f9690fe 16-May-2014 Adrian Roos <roosa@google.com> Merge "Apply revised TrustAgent API"
7e03dfcb796ef1a6000a5fd5fda03c9e15ea62e1 16-May-2014 Adrian Roos <roosa@google.com> Apply revised TrustAgent API

Bug: 14997466
Change-Id: I81042e058a20f28603a11471882f3dcfc4f8b13c
ava/com/android/server/trust/TrustAgentWrapper.java
ava/com/android/server/trust/TrustManagerService.java
6f16aec6de6e9c49304e3589abc75eeff6d6f6af 16-May-2014 Kenny Guy <kennyguy@google.com> Merge "Send profile removed intent earlier so launchers updates."
b0650e8ff3113f9b9dbb6d249339dbd7921b4517 16-May-2014 Jungshik Jang <jayjang@google.com> Merge "Add ARC commands"
00bcf01a916938c5be4ca84c5fd8a3d6f502edb9 16-May-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Add net.dns system properties"
d5648dcf6a477a350c281c769bae07b8cbe982a3 16-May-2014 Robert Greenwalt <rgreenwalt@google.com> Add net.dns system properties

Some apps rely on them.

bug: 14992618
Change-Id: I5766f26b77004e9cfcc90fac657817eab67f9ac7
ava/com/android/server/ConnectivityService.java
7e89723bb4204537ede2058b61b94c4e99444c03 16-May-2014 RoboErik <epastern@google.com> Merge "Add UserRecords to separate user interactions"
0a3103e755218c1ee48c7d078892eb6b42cc2081 15-May-2014 Dianne Hackborn <hackbod@google.com> Merge "Battery stats more wake history, power save mode."
e78e6f923774ac2cadee43fbf09b4df6b2b4ee87 15-May-2014 Adrian Roos <roosa@google.com> Merge "Colorize SystemUI"
cbefd8dd2befcb768f911a63becc427ec4c13250 14-May-2014 Dianne Hackborn <hackbod@google.com> Battery stats more wake history, power save mode.

Add new option for battery stats to record the full wake
lock history, and recording the current power save mode.

Also add in some additional error constants when generating
Binder error exceptions.

And fix issue #14974572: Avoid repeating wakeup_reason at
the beginning of history

Change-Id: I7c1a2ab9569de216634f63d8ad69f1294ef1d235
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/power/Notifier.java
ava/com/android/server/power/PowerManagerService.java
177cf2155dae43cb8766dd239d34a861d8fba335 15-May-2014 Svetoslav Ganov <svetoslavganov@google.com> Merge "Adding custom events to AccessibilityNodeInfo"
74bc19476536f2b5462eaa29e6f3029ee897c16d 29-Apr-2014 Kristian Monsen <kristianm@google.com> Adding custom events to AccessibilityNodeInfo

Change-Id: Id7a1985d1a6c4a9f7153f6d4d7e45f80c8d2b2b0
ava/com/android/server/wm/ViewServer.java
44d81a4b86f73ecf79861bc576c90b8f8e4ba761 14-May-2014 Chris Wren <cwren@android.com> Add email validation and star support to ValidateNotificationPeople.

Also fix a bug with multiple pending lookups dropping information.

Change-Id: I8348f126e6b0a17cf762ebb720d1c306d3b4923a
ava/com/android/server/notification/ValidateNotificationPeople.java
ea56251d92050e9a672d1f66d0d4621e4dd4136e 05-May-2014 Adrian Roos <roosa@google.com> Colorize SystemUI

Makes the color of the status and navigation bars customizable by
the app.

Bug: 14564488
Change-Id: I036edc228cfe1b659c7f11a43cdc4598ee705ff8
ava/com/android/server/wm/WindowManagerService.java
f8d3a232e8df65aa75545963ee0ccf753b2d8fb9 15-May-2014 Kenny Guy <kennyguy@google.com> Send profile removed intent earlier so launchers updates.

This sends the profile removed intent when the user has
been disabled.

Bug: 14981942
Change-Id: I32ab9c68ca53ec3aac0c930c0bbf93da7ff5b479
ava/com/android/server/pm/UserManagerService.java
7dab61455c32c0a93711ae977d197202dacb6bb6 15-May-2014 Jason Monk <jmonk@google.com> Fix reference to ProxyInfo extra

Also remove unneeded null check.

Change-Id: Ic25d1087f93632a24755b284ede41d870492e25d
ava/com/android/server/am/ActivityManagerService.java
5d5f19a339bc4a8f10f75b51625d8d50ee0729e0 15-May-2014 Narayan Kamath <narayan@google.com> am 6e2e6868: am 706b1d7e: Merge "Remove "required" prefix from ABI fields."

* commit '6e2e686889037711170ee145f9dfdb442cee85db':
Remove "required" prefix from ABI fields.
be9cd8eb3fe64a572f9c7dfc41f04defd46a752d 15-May-2014 Jungshik Jang <jayjang@google.com> Add ARC commands

ARC, Audio Return Channel is newly introduced in HDMI CEC 1.4.
Here is a list of new command
<Initiate ARC>
<Report ARC Initiated>
<Report ARC Terminated>
<Request ARC Initiation>
<Request ARC Termination>
<Terminate ARC>

Along with it replaced <Get OSD Name> with <Give OSD Name>
which is renamed in CEC 1.4.

Change-Id: If4a7aedef839c8413a8e3b5f66f3df0c7234104b
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/NewDeviceAction.java
ni/com_android_server_hdmi_HdmiCecService.cpp
1e74c37f8e1acb595f407e0f65744bb6b00c9314 15-May-2014 Narayan Kamath <narayan@google.com> Merge "Remove "required" prefix from ABI fields."
d04cf4ccf426f70d80e98b46dc74c4dfb18f338f 15-May-2014 Christoph Studer <chstuder@google.com> Merge "Track notification airtime"
a8a5e50c6f9ba3ae0ff59eda76354e93515d6f8f 15-May-2014 Jinsuk Kim <jinsukkim@google.com> Initialize internal CEC logical devices

Allocates logical address of internal HDMI-CEC logical device(s)
using the resource config_hdmiCecLogicalDeviceType.

Change-Id: I1a0d2f7bce36fc643887241f03161dc053d6c25c
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
3bb41a20db87309ee994d06d135d3ddda03f87e5 15-May-2014 Jungshik Jang <jayjang@google.com> Merge "Implement handlers for system information query command."
e8b718c264a2752c475d3022d3cfd6d8dbbce494 15-May-2014 Jeff Sharkey <jsharkey@android.com> Merge "Initial support for split APKs, PackageInstaller."
3a44f3f1b446315ef894e01d2ab9b5388c2bd8c4 29-Apr-2014 Jeff Sharkey <jsharkey@android.com> Initial support for split APKs, PackageInstaller.

Defines a new PackageInstaller class that will be used for installing
and upgrading packages. An application desiring to install an
application creates a session, stages one or more package files in
that session, and then kicks off the install.

Previously, PackageManager would always make its own copy of a package
before inspecting it, to ensure the data could be trusted. This new
session concept allows the installer to write package data directly to
its final resting place on disk, reducing disk I/O and footprint
requirements. Writes are directed through an intermediate pipe
to ensure we can prevent mutations once an install has been initiated.
Also uses fallocate() internally to support optimal ext4 block
allocation using extents to reduce fragmentation.

Sessions are also the way we support installing multiple "split" APKs
in a single atomic operation. For a set of packages to form a valid
application, they must have exactly the same package name, version
code, and certificates. A session can also be used to add a small
handful of splits to an application by inheriting existing packages
when not performing a full install.

Add PackageParser support for extracting split names and certificates.

Bug: 14975160
Change-Id: I23d1bf4fbeb9f99a8c83be0c458900a0f0d1bccc
ava/com/android/server/pm/PackageInstallerService.java
ava/com/android/server/pm/PackageInstallerSession.java
ava/com/android/server/pm/PackageManagerService.java
4fe8628006e7754f2ddeb212c2672298eedcd83d 15-May-2014 Winson Chung <winsonc@google.com> Merge "Adding method for applications to query their own tasks. (Bug 14627210)"
1f141c1cbc1925fec36edb8a34a229cf6209d13a 15-May-2014 David Christie <dnchrist@google.com> Fix bug where location provider fails on secondary users.
Bug: 12592045

Change-Id: I196b8621c7f61c3492ad29ae90b608304dc29d66
ava/com/android/server/LocationManagerService.java
00dc056b61b38871ca0a0964082399a10af1513d 14-May-2014 David Christie <dnchrist@google.com> Fix typo in comment

Change-Id: I880385f250d95ad9eea1c39bdf126797177e00a1
ava/com/android/server/location/LocationRequestStatistics.java
4646d288821d62fdfe481be67d8b7fed7d7eabd8 13-May-2014 RoboErik <epastern@google.com> Add UserRecords to separate user interactions

Each user record maintains the list of sessions and providers that
are running under that user. Lifecycle for providers has been modified
to stop discovery when the user is no longer current but keep the
binder connection open so long as there's a session that has selected
a route from that provider. When a user is stopped all providers on
that user will be unbound even if they were still in use.

Change-Id: Iadf1efded3415f7ecf384d3a73513883de9c86b0
ava/com/android/server/media/MediaRouteProviderProxy.java
ava/com/android/server/media/MediaRouteProviderWatcher.java
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
154f8283656d6c879a568fe4be19286dbb2c7121 14-May-2014 Chris Wren <cwren@android.com> Merge "Add intrusiveness signal extractor."
1147c406515bbfbcb7dbd750f81c7a5de928c5c6 14-May-2014 Winson Chung <winsonc@google.com> Adding method for applications to query their own tasks. (Bug 14627210)

Change-Id: I33299bf59784849171b19af4a5be2ab7665581c5
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/TaskRecord.java
9e317da9364bae6a7d40c94cd46748b2255c7e1e 14-May-2014 Adrian Roos <roosa@google.com> Merge "Fix adaptive auto brightness bugs"
3c659dea477fd11fc4a498a0c7bc119fe431ecc8 14-May-2014 Jae Seo <jaeseo@google.com> Merge "Add more columns to help identify TV channels"
5190c0fefac9923931b5c1c02cab2d00c2d6b82b 08-May-2014 Chris Wren <cwren@android.com> Add intrusiveness signal extractor.

Temporarily bump noisy things to the top so the user can find them.
This is the first example of a delayed ranking reconsideration.

Change-Id: I07271ba197101ad462e4f99fb7c369a39c8c2e2f
ava/com/android/server/notification/NotificationComparator.java
ava/com/android/server/notification/NotificationIntrusivenessExtractor.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/RankingFuture.java
6dee605c834fe4926cc1ae5c584563bdb2b608a1 14-May-2014 Adrian Roos <roosa@google.com> Fix adaptive auto brightness bugs

Fix update of the light sensor in AutoBrightnessController.
Register observer for Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ.

Change-Id: I5201259c4efc0afa200fea3ad9fe3af2991d8676
ava/com/android/server/display/AutomaticBrightnessController.java
ava/com/android/server/power/PowerManagerService.java
ffeb0c38145709b51dee0254b770bccc9083ea5c 07-May-2014 Christoph Studer <chstuder@google.com> Track notification airtime

...and write it together with posttime to the
SQLite log.

Bug: 13672846
Change-Id: I605447f89a0c89782a320c298ddb59cbb8994367
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationUsageStats.java
54b6fd0cbe48fc0980da0617352785c973c60c86 14-May-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Add networks and requests to CS.dump"
c9c90c771c9cd1381a49b714df9a2bc392959fcc 14-May-2014 Robert Greenwalt <rgreenwalt@google.com> Add networks and requests to CS.dump

Adds debugging.

Change-Id: I352dfe970c990fd210f3d1598519e321bbdd6ed5
(cherry picked from commit 9bdf6bd99db56c652ba9a62d91f258d11d19ca9f)
ava/com/android/server/ConnectivityService.java
9258c64bef1a01fe89bc7c1fa402c44c0e6a1255 27-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> Add Multinetwork API

Change-Id: I3a9cef0d416db96d05098dd989ee3fef3b1e9274
(cherry picked from commit cc5e6afa1ba0bef099bcb21a64a36bc2bf7951db)
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
ava/com/android/server/connectivity/Tethering.java
98e8c26b90ed3cbe3910617b906d412ffa55d234 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Handle legacy synchronous inspectors"
612bf2f8d62fe9171482d21a1e5dac0eeb743003 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Get clatd/Nat464Xlat working with new NetworkAgents."
111ac91393295c47b4d250b9996c30a80f9f677e 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Fix compile errors after merge."
1163c5363cc8d99c01100be25540a0c897e1d3ba 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Disable calls to MobileDataStateTracker.isProvisioning() as there is no more MobileDataStateTracker so these just crash."
6fd7b551223469fd2670e73051c8ff96227f0329 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Add NetworkMonitor. At present the network evaluation / captive portal detection is disabled pending addition of API to bind socket to network."
131dcda9a223aaf3f92933278bf00841db9905e4 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Separate network and interface addition/removal netd APIs. This should facilitate stacked interfaces (i.e. clatd)."
df3ef993cb787ade3c01bde1327b1ce76e23afa7 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Enabling internal msg apis"
4a0e0173f4b718d63a729028fe75a98f3b0eeb77 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Specify netId when adding/removing routes."
af46637e4044630be6255a5f80c96d63f32a4b79 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Set and clear the default network."
9bc300e98f2f7fbb12b9b37f78bdb8238a816670 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Update netd API."
dffe0236c6da5a717a589aea1ac993952d6b6197 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Use NetId instead of interface name when communicating DNS changes to netd."
e8dbda2f769467fa88c7011087ddbfc75b40ca50 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Update the API for permission set/clear."
02af9da5a9522673448af47b48cd9b835ba6ab31 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Update netd interface"
afabcf86417670e3dce80b8d0a61cb0ee7b63dd3 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Add multinetwork netd calls"
807913fec5e1b106825281071c4889934b8cc12d 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Stop adding host routes for dns"
ef7f57d5ff2e540b024895b84fd5a138926eb91a 14-May-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Ensure only enabled profile apps can be launched"
cea2978737146485b88f06b24b5df5656f9586e1 06-May-2014 Alexandra Gherghina <alexgherghina@google.com> Ensure only enabled profile apps can be launched

Change-Id: I396e99eb6b8a957d994962300eeffeec61d7c46a
Bug: 13691041
ava/com/android/server/pm/LauncherAppsService.java
12e6735f77a6f8cbf71edde4f156f40668d2d25b 14-May-2014 Robert Greenwalt <rgreenwalt@google.com> Handle legacy synchronous inspectors

getNetworkInfo, getActiveNetworkInfo, etc

Conflicts:
services/core/java/com/android/server/ConnectivityService.java

Change-Id: I4611d6481b1a76fe4a4ce22232a2a329de2a6e0c
ava/com/android/server/ConnectivityService.java
3b75982e39ed9370153ae7f238f1d6041b9506ed 13-May-2014 Paul Jensen <pauljensen@google.com> Get clatd/Nat464Xlat working with new NetworkAgents.

Change-Id: I65dfb59ce519a42bdb872940d229039b5403fd92
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Nat464Xlat.java
7ef92576016aaa43e3488b6ddc213b7c1e52b118 14-May-2014 Lorenzo Colitti <lorenzo@google.com> Fix compile errors after merge.

These are due to changes to ConnectivityService that were made
after master-multinetwork-dev branched off. They mostly didn't
cause merge conflicts because they were in different parts of
the file from the multinetwork changes, but they cause compile
errors now. These particular changes should be fine - they are
all in dead code anyway, and their functionality had already
been re-implemented in the new code.

Change-Id: I0ac9e39c3c975c8e8dc04ad11b6b85366693865c
ava/com/android/server/ConnectivityService.java
b6bb6c61dd77c1b3007f0b0bbb89ee693e63d0b6 12-May-2014 Paul Jensen <pauljensen@google.com> Disable calls to MobileDataStateTracker.isProvisioning() as there is no more
MobileDataStateTracker so these just crash.

Change-Id: Ib45a85db505c0a99fb65d9a6d0c39b860f9d019d
ava/com/android/server/ConnectivityService.java
ca8f16ad14819ba17f5ff3d2e2bf6fbc9bbaa9f7 09-May-2014 Paul Jensen <pauljensen@google.com> Add NetworkMonitor.
At present the network evaluation / captive portal detection
is disabled pending addition of API to bind socket to network.

Change-Id: I5d1f5dc86d4dd9481d52dd45d6da0732054c8315
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
ava/com/android/server/connectivity/NetworkMonitor.java
992f25257938ecc0378514f21c6e6e6375272976 28-Apr-2014 Paul Jensen <pauljensen@google.com> Separate network and interface addition/removal netd APIs.
This should facilitate stacked interfaces (i.e. clatd).

Change-Id: Ib3e7a4d3847ef6ec4449451f6da42e75959baa4f
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
7b81602f3c18df8a4ca0342c514af8f7e394c0d7 19-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Enabling internal msg apis

NetworkFactory and NetworkAgent. First trying with wifi and
getting rid of WifiStateTracker.

Conflicts:
api/current.txt
services/core/java/com/android/server/ConnectivityService.java

Change-Id: I7f0ec13d7d8988b32f3c6dc71f72012f3349fe02
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/NetworkAgent.java
ava/com/android/server/connectivity/NetworkAgentInfo.java
b2829fa165124264c7ec06a6e23b08a1d97b99e5 16-Apr-2014 Sreeram Ramachandran <sreeram@google.com> Specify netId when adding/removing routes.

Change-Id: I07fd950aee726e9721153f75c3e4c10d8e19d8e9
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
79a10584802f327bcfca11c5000658b3be74819d 16-Apr-2014 Sreeram Ramachandran <sreeram@google.com> Set and clear the default network.

Change-Id: I305951e0c4735d708804baa597cc2d9b10f501c0
ava/com/android/server/ConnectivityService.java
f047f2a8f49cd06d9cb94238861f4acce937d87b 16-Apr-2014 Sreeram Ramachandran <sreeram@google.com> Update netd API.

Remove:
- resetOldSockets from setDefaultNetId: netd takes care of this automatically.
- {add,remove}DnsServersForNetId: equivalent to "resolver setnetdns".

Change-Id: I819a8be216d07cf9a8c05f51745b64658027ed02
ava/com/android/server/NetworkManagementService.java
13e817df516a803fbedeacca2c802a9fc1c1370f 10-Apr-2014 Paul Jensen <pauljensen@google.com> Use NetId instead of interface name when communicating DNS changes to netd.

Change-Id: Ic82b73de6f50d39d56c5e1a32f5b1f3ebb80bb7d
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
e4bde7d475135252cfa799d337ebbb029ebaf937 11-Apr-2014 Sreeram Ramachandran <sreeram@google.com> Update the API for permission set/clear.

Change-Id: I1d10a5702a77cb24fa52016bb497d52270379f8a
ava/com/android/server/NetworkManagementService.java
913c895216c0cb248ed0ce910e69dd84b285c064 08-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Update netd interface

Adding netId for route changes

bug:13732575
Change-Id: Id171412a0f580f71398c9b0b8742acb1f3ef5a1e
ava/com/android/server/NetworkManagementService.java
568891d9282383747c418a59ee714281726f390a 04-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Add multinetwork netd calls

bug:13732575
Change-Id: I7f030bd63971ff71d32a221e50318c781e7f2370
ava/com/android/server/NetworkManagementService.java
89fb3eb718f890ace30e63bd4ab4ad5409d8600d 31-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> Stop adding host routes for dns

bug:13550136
Change-Id: I748e13b96dab111f8f6a4b11d9beaf2a72d0742b
ava/com/android/server/ConnectivityService.java
cd10d7c5950d979ac0bdca4e0a3635f951445fb4 14-May-2014 Adrian Roos <roosa@google.com> Merge "A better auto brightness"
daf7d410fc97647f2b3ab4254f73c09c923018de 13-May-2014 Adrian Roos <roosa@google.com> A better auto brightness

Bug: 14927472
Change-Id: I62d0695b7da16ffa7a27c465c3b6bc4b1515f9c0
ava/com/android/server/display/AutomaticBrightnessController.java
a1fa91fe263c483cf13066e2847a440de2cd52a5 08-May-2014 Jungshik Jang <jayjang@google.com> Implement handlers for system information query command.

System information query commands are stateless command and
it should be replied immediately when it receives query command.
Here is a list of command handler (and it's reply) implemented
in this change.
1. <Get Menu Language> -> <Set Menu Language>
2. <Give(Get) OSD Name> -> <Set OSD Name>
3. <Give Physical Address> -> <Report Physical Address>
4. <Give Device Vendor ID> -> <Device Vendor Id>
5. <Give CEC Version> -> <CEC Version>

In order to centralize all cec message building, added new
builder class, HdmiCecMessageBuilder for HdmiCecMessage.
Accordingly, all helper methods for building of HdmiCecMessage
are moved to HdmiCecMessageBuilder class.

Change-Id: Ib7c5d2b0cb3d69d51159af8bc277ffb49a60909b
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiCecMessageBuilder.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/NewDeviceAction.java
e049c23980409be6576da3d30538a6cdc43854dd 12-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Add NetworkFactory support.

This is a protocol allowing transports to dynamically register with CS for
Handler to Handler communications.

bug:13885501
Change-Id: Ic7275e3724a15efc7e5f80981560c4cb3106007b
ava/com/android/server/ConnectivityService.java
1ad4468dff5c49633245f9aa65ed330fbe4f1f13 12-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Add NetworkAgent

Used as a bag for a details about a Network and its state.

bug:13885501
Change-Id: I19cdaf3a833a9dad1df84591b8efd5045c67f38c
(cherry picked from commit 344279bb3e0e521d4ca5f8c94a8f0bd235059aa3)
ava/com/android/server/connectivity/NetworkAgent.java
7fd239cf0a1ddc0500b51d97e0e6c3539b42639f 14-May-2014 Craig Mautner <cmautner@google.com> Merge "Pass ActivityOptions back from finishing activity."
fd08622588d5a90c11216894344e58147ff6359a 14-May-2014 Winson Chung <winsonc@google.com> Enabling alternate recents on all form factors.

Change-Id: I9dec6da7646205b72f46cedf604fadfb03cab6d4
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/wm/AppTransition.java
ava/com/android/server/wm/WindowManagerService.java
af8d6c44f06d2f8baac2c5774a9efdae3fc36797 07-May-2014 John Spurlock <jspurlock@google.com> New quick settings implementation.

Bug:14133785
Change-Id: I7f57f8e7ebcc3e1a06fa5204f477470f14299e1f
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/ManagedServices.java
ava/com/android/server/notification/NotificationManagerService.java
f5cd0b388ac31104e014f9193d06080851a09e18 13-May-2014 Jae Seo <jaeseo@google.com> Add more columns to help identify TV channels

Also added the prefix COLUMN_ to clearly denote each column of the
tables for TV metadata.

Change-Id: I426e9854da5580066f39d416207abe56baf4de14
ava/com/android/server/tv/TvInputManagerService.java
202259785972be771075dce8d3e43c29b8d8f1f1 13-May-2014 Nicolas Prevot <nprevot@google.com> Merge "Resolving resources across users."
233ceeebab7efe6ad4783371003c4cf29b896436 10-May-2014 Craig Mautner <cmautner@google.com> Pass ActivityOptions back from finishing activity.

Adding an ActivityOptions parameter to convertToTranslucent provides
a mechanism for delivering these options to the activity that
launched the one that is returning.

Fixes bug 13032208.
Fixes bug 14469460.
Fixes bug 14597427.

Change-Id: I4115dd3c69de9d175f6df0498a6e964fca5eca29
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
b01c6855c08a25636806eff56c7acabfabed3f9f 13-May-2014 Jason Monk <jmonk@google.com> Merge "Switch PacUrl storage from String to Uri"
590afb8bbd4c963a7dac850645fe26a203560100 13-May-2014 Jason Monk <jmonk@google.com> Merge "Don't show switcher button when IME switcher shown"
807ef76e23e08405532a0e7e2d71e7433bf7ae9a 08-May-2014 Jason Monk <jmonk@google.com> Don't show switcher button when IME switcher shown

This keeps track of when the switcher is being shown and disables
the IME switcher button/notification when it is up.

Bug: 14631536
Change-Id: I4adf24bc5fa6377645915419583d60596b3bdde0
ava/com/android/server/InputMethodManagerService.java
d85fc72fb810858f7502e7e7f1bad53e1bf03edd 16-Apr-2014 Nicolas Prevot <nprevot@google.com> Resolving resources across users.

When an intent is sent to another profile:
For content uris contained in this intent:
The userId of the source user is added to the userInfo part.
The ActivityManagerService has been modified to resolve resources in the user specified by the uri.
The user id to which the uri belongs to is stored in the UriPermission.

Change-Id: I43dc76895aba692bf148d276253aeaf9c75fce34
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/UriPermission.java
ava/com/android/server/am/UriPermissionOwner.java
ava/com/android/server/clipboard/ClipboardService.java
9876e6334d1d3649ecd1e99e597834e70c531d57 13-May-2014 Robert Greenwalt <rgreenwalt@google.com> Comment out some new netd calls to fix networking.

bug:14869053
Change-Id: Ifc44f3cbadd0402c7b06e01962695e6b65dc48b3
ava/com/android/server/ConnectivityService.java
34f6084bc21b07ae9112be6e7a8f50c49828ac9c 30-Apr-2014 Narayan Kamath <narayan@google.com> Remove "required" prefix from ABI fields.

As per a comment on an earlier code review.

Change-Id: I3ae30f8a7bc90730068644f93b926e0e05a2cdfb
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/PackageSetting.java
ava/com/android/server/pm/PackageSettingBase.java
ava/com/android/server/pm/Settings.java
59618a1890e4b8691f2a482fbf392f4a19b711be 13-May-2014 Sander Alewijnse <salewijnse@google.com> Merge "AccountManager cannot modify accounts according to device policy."
2b35a72a69f6fc39d21f7de9e21044d64db1380d 17-Apr-2014 Sungsoo Lim <sungsoo@google.com> Handle the crash of TIS.

- Implement DeathRecipient for SessionState.
- Implement onServiceDisconnected.
- Add callback methods for notifying the death of Session.

Bug: 14073482
Change-Id: Ifdc54266a878224844a221f0b52415d0bc378e39
ava/com/android/server/tv/TvInputManagerService.java
51391666ee91d46cac36640e161668b9b424d152 13-May-2014 Sungsoo Lim <sungsoo@google.com> Merge "Replace ComponentName to InputId."
adcc5763632bcf79c47ef4b880646c32655bb717 13-May-2014 Zhentao Sun <robinvane@google.com> Merge "Make sure nativeInit is called on an object."
a4dfc2c56b0efd0094d8cf9156c7b24fb4e67d25 13-May-2014 Zhentao Sun <robinvane@google.com> Make sure nativeInit is called on an object.

This bug is introduced by the attempt to fix b/14117917.
Worked around b/14469172. The implementation of nativeInit assumes that
it's called on a object instead of class.

Change-Id: I73241e62aa73ce98358ff37b772d1a26daf9e53c
ava/com/android/server/LocationManagerService.java
ava/com/android/server/location/FlpHardwareProvider.java
027c75d5e2861e90058bcd2d267b47498caf82cf 13-May-2014 Brian Carlstrom <bdc@google.com> am f230061b: am 2ce02bba: am b7d7cbc9: Merge "Fix background PackageUsage writing."

* commit 'f230061b383f3e5fa63a266d84477963dc5f226c':
Fix background PackageUsage writing.
f230061b383f3e5fa63a266d84477963dc5f226c 13-May-2014 Brian Carlstrom <bdc@google.com> am 2ce02bba: am b7d7cbc9: Merge "Fix background PackageUsage writing."

* commit '2ce02bba1eea682282408b8521dad8c91837fbab':
Fix background PackageUsage writing.
d6672b51c5e07ec376a61057cfbb6bb7491a76b3 30-Apr-2014 Sungsoo Lim <sungsoo@google.com> Replace ComponentName to InputId.

Change-Id: Ia4b5b7fa3f2dfa68629f78981b4ea7f7017d6504
ava/com/android/server/tv/TvInputManagerService.java
5ae2afdc2aeec468436ca126a6da1e8dd90d7aff 13-May-2014 bulic <bulic@google.com> Merge "Prevent home task from being set as ontopofhome"
f9cb86aebe9647e0fe0137fc198ba16c017445c6 09-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Replace LinkCapabilities with NetworkCapabilities

Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
ava/com/android/server/ConnectivityService.java
ava/com/android/server/TelephonyRegistry.java
6de79e2b17fa0796ea4d39fd9555b563c484248d 01-May-2014 Matthew Williams <mjwilliams@google.com> First implementation of the TaskManager internals.

Sketching out the TaskManagerService, and provide an implementation
of the Connectivity & Time controllers to use as a basis for how the
IdleMode controller will function.

Change-Id: I9163b8b9df1f8a027354720b469a0fb4c8e37194
ava/com/android/server/task/StateChangedListener.java
ava/com/android/server/task/TaskList.java
ava/com/android/server/task/TaskManagerService.java
ava/com/android/server/task/TaskServiceContext.java
ava/com/android/server/task/controllers/ConnectivityController.java
ava/com/android/server/task/controllers/StateController.java
ava/com/android/server/task/controllers/TaskStatus.java
ava/com/android/server/task/controllers/TimeController.java
ccd230712d8ec4c017f8ab9b24ee53b4e5dfc19b 12-May-2014 bulic <bulic@google.com> Prevent home task from being set as ontopofhome

If the front activity of a task that is on top of home finishes, the oldest task in
other stacks will be set as ontopofhome (which in this case meant the
home task was set to ontopofhome). The solution is to ensure we
only set a task to ontopofhome if the finishing activity is in the same
stack.

Change-Id: Idd8f9af4d3d9bd2de3c519d3dcc60f479695ae0c
ava/com/android/server/am/ActivityStack.java
0e8a427ab802d07aea4a7d6584cacf4a64b93de9 12-May-2014 Ruchi Kandoi <kandoiruchi@google.com> Merge "PowerManager: Minor Coding style issues."
f33e99828f32bdbcf8e2590c9475f4cd840f189d 12-May-2014 RoboErik <epastern@google.com> Merge "Make sessions aware of user id"
15aedf5bfceb7267f0c79e0d29e149f193b15b0a 10-May-2014 Ruchi Kandoi <kandoiruchi@google.com> PowerManager: Minor Coding style issues.

Corrects coding style errors caused by
Ibed319e734340dfd5348dbeb8fe20c01b1adaac5

Change-Id: I81eb0a2bcc4fb45804a1f47aef76d94142f6aba7
ava/com/android/server/power/PowerManagerService.java
9bbc0ca0ab5e381be8a05ee457f2b93a3f0d63bc 12-May-2014 Chris Wren <cwren@android.com> Merge "notification ranking infrastructure"
728614e42e70bec63f7e95ab4f97a4aa2518e234 12-May-2014 Simon Wilson <simonwilson@google.com> am c5df4d0e: Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG" into klp-modular-dev

* commit 'c5df4d0e7d43d39072dfbab5f37d8b170de4617b':
BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG
83520b95124e0fcaaf3154a7a267f6be0205bc74 09-May-2014 Jason Monk <jmonk@google.com> Switch PacUrl storage from String to Uri

Since the interface for creating/accessing PAC URLs through a
ProxyInfo is Uri based, so should the internal storage and
references.

Change-Id: Ibf15c350f4cc526f81aba3ec463070f26af8f535
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/connectivity/PacManager.java
82f421ad83cea68df9803d5cd85ed7b190497d5d 12-May-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "First pass on multinetwork framework"
9ba9c58e4a249456794fbfb9989f27bd846d067e 20-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> First pass on multinetwork framework

Starting to switch netd to use NetId.
Adding the Network identifying class

bug:13550136
Change-Id: Ie0db4fb17c9300bfafb63329adfa02339911b33d
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
e4f1960652a50b99100f7ff68ed461524ca2b9f1 12-May-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Turn down the logging."
7f44ff8d6b4d115420e7bd5f08f12825738afd54 08-May-2014 Robert Greenwalt <rgreenwalt@google.com> Turn down the logging.

Cut per-msg logging by 1/3 in NDC so we see that much more.

Change-Id: I406297d98f2649a88b16c7be3cf90757d009c762
ava/com/android/server/NativeDaemonConnector.java
a9c47626975181261a409d029d24d9c893bc4717 12-May-2014 Jeff Davidson <jpd@google.com> Merge "Flush dump output before calling score cache dump() methods."
195111641cf09731167d7353c72925a6533b3282 10-May-2014 Ruchi Kandoi <kandoiruchi@google.com> Merge "Vibrator: Minor coding style changes."
664703d6be542d6feb64bca9ca5b2a7dbb8abd84 10-May-2014 Ruchi Kandoi <kandoiruchi@google.com> Vibrator: Minor coding style changes.

Corrects the coding style errors caused by
I762be1d51eedbf3184d80ed51dc93a0d113a6d5d

Change-Id: I5adb713611f5479b21dd32ed8d8d51cb1910bca9
ava/com/android/server/VibratorService.java
68c46fd8dd88b906cf064f0d8d0408d4f60e2a4d 10-May-2014 Jeff Davidson <jpd@google.com> Flush dump output before calling score cache dump() methods.

Change-Id: I2a28bd90583e34710c2d0ac8b31f16b8a22c165d
ava/com/android/server/NetworkScoreService.java
aa943d1b2de4a1be0cb00b13acf1a4bbf6932e2c 18-Apr-2014 Colin Cross <ccross@android.com> BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG

Instead of requiring the kernel to join last_kmsg and the reboot
reason together, allow both to be passed to userspace and have
userspace combine them the way the log parsers want them.

Existing devices with no ro.boot.bootreason property and kernel
support for putting the reason in last_kmsg will continue to
use the kernel's formatting.

Bug: 13813279
Change-Id: I079b0107feb1533c6a54044ca6a114741127dfbc
(cherry picked from commit 431614cb6b2170fc715757dc6f964fdbb140ee7d)
ava/com/android/server/BootReceiver.java
e92895731649b502c9ae3c013568f861e21fa0b2 10-May-2014 Kenny Root <kroot@google.com> Merge "WindowManagerService: add some defensive checks"
f974cc870635227ae13201480fb2f019d153af22 01-May-2014 Ruchi Kandoi <kandoiruchi@google.com> Display: Brightness: Low power mode scales the brightness to 50 percent.

When the device is in low power mode all changes to brightness will be
scaled to half of the brightness that would be normally set when not in
low power mode.

Change-Id: I03be820ef64c1d5631ded35f7dfc2799e807226b
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/power/PowerManagerService.java
f953664dc17dca23bd724bd64f89189c16c83263 17-Apr-2014 Chris Wren <cwren@android.com> notification ranking infrastructure

Added an ordered list of notifications (n.b. a complete ordering).
Added a mechanism for ranking to be updated asynchronously
Added onNotificationRankingUpdate to NotificationListeners
Added an opaque order update object and a convenience comparator that
uses it to sort notifications for listeners

Repurpose scorers to be ranking preprocessors. The preprocessors will
perform heavy-weight validation of the notification object and memoize
the results to improve efficiency of the ranking comparator.

Current internal comparator implements status quo ordering, except
that notes with a valid contact sort to the top of their priority
bucket.

Change-Id: I7244c65944a9657df41fb313b3cb5a52e149709d
ava/com/android/server/notification/NotificationComparator.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationSignalExtractor.java
ava/com/android/server/notification/RankingFuture.java
ava/com/android/server/notification/ValidateNotificationPeople.java
d7d2d43b4967bb907b61180aa9d12ca51aaa15e2 09-May-2014 Kenny Root <kroot@google.com> WindowManagerService: add some defensive checks

Add checks before posting a message to the handler thread where
exceptions will crash the service.

Also make KeyguardLock fields final.

Bug: 14564617
Change-Id: I147d579d942f5fa555714d204cde52e2cd5f6154
ava/com/android/server/wm/WindowManagerService.java
809146690d03b3ec3404c37c1fb467f7b7234692 09-May-2014 Brian Carlstrom <bdc@google.com> am 09d11896: am edc31509: am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"

* commit '09d1189668a74b2cd4a6af124e95c9e6786499f2':
If PackageUsage information is missing, treat as first boot and compile everything
d9ddf2e9d04f8a53d7445a96aa3e192fa86f08d6 09-May-2014 Craig Mautner <cmautner@google.com> Merge "Introduce persistent forms of Activity lifecycle calls."
09d1189668a74b2cd4a6af124e95c9e6786499f2 09-May-2014 Brian Carlstrom <bdc@google.com> am edc31509: am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"

* commit 'edc31509c2ff8cba86f30c836934d32a3e249dec':
If PackageUsage information is missing, treat as first boot and compile everything
c241db85c937102714e4cb125c97c79f80bebbec 09-May-2014 Jason Monk <jmonk@google.com> Merge "Fix badness from proxy refactoring."
a002604af0c9b1204556610537b85685d7055996 23-Apr-2014 Craig Mautner <cmautner@google.com> Introduce persistent forms of Activity lifecycle calls.

When an Activity is created with R.attr.persistable true different
forms of activity lifecycle methods including PersistableBundle will
be used.

Fixes bug 13736007.

Change-Id: I7e92917b300b76964257cfcc26c24e76aa19bd16
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
2509be2bb7f00d615e7e8770c713a36fcf8b9ee1 09-May-2014 Christoph Studer <chstuder@google.com> Merge "Preserve notification stats on update"
5df281a570555ee132a12a4aac9aec96e8618270 09-May-2014 Jason Monk <jmonk@google.com> Fix badness from proxy refactoring.

When no PAC file getPacFileUrl() can return null now, which you
cannot call toString() on.

Change-Id: Ife00f641c2c17fbc1bde17017d9af59d23cb9182
ava/com/android/server/am/ActivityManagerService.java
061dee22df6af640db6f236d0929d6ccf9b455af 09-May-2014 Christoph Studer <chstuder@google.com> Preserve notification stats on update

Change-Id: I519b31e83c32ac00e7c5838abbc5e3127430106b
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationUsageStats.java
a8c5f577d0dfa23fb955faed4966e65dd8323bc6 09-May-2014 Jessica Hummel <jhummel@google.com> Merge "Add api for getting the parent of a profile."
82af2b9e51aac359b4b251cc622659a1a5537e35 09-May-2014 Eric Laurent <elaurent@google.com> Merge "AudioService/WireAccessoryManager: change boot completion detection method"
6e058419503910e0d5f67f9b51b84ad636ffa01f 09-May-2014 Winson Chung <winsonc@google.com> Merge "Removing the old tasks on launching recents task if they trigger a new task."
13b03aff2993653ef8bde8bedb1bbcc0fe09ba94 08-May-2014 Ruchi Kandoi <kandoiruchi@google.com> Vibrator: Low Power Mode: Vibrator is turned off when the device is in
Low Power Mode

Vibrator is disabled for all touching and typing inputs during low power mode.

Change-Id: I762be1d51eedbf3184d80ed51dc93a0d113a6d5d
ava/com/android/server/VibratorService.java
5393dff555641f5666573952498e27c90fd3edca 08-May-2014 Winson Chung <winsonc@google.com> Removing the old tasks on launching recents task if they trigger a new task.

- Only kill processes when removing tasks that are not started as documents
- Tweaking thumbnail animation
ava/com/android/server/wm/AppTransition.java
a5b02329209be355eafadbdf9ee685ffa58d3148 08-May-2014 RoboErik <epastern@google.com> Make sessions aware of user id

This tags all sessions with the user id that they were created for. It
also adds API for creating and querying sessions for a specific user.

This does not wrap providers per user yet which will be done in a
separate CL.

Change-Id: Icdaf701b0614a95301657998602c45208d548c27
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
be81c800ae6216e30b6008b4c73172b36531c405 22-Apr-2014 Jessica Hummel <jhummel@google.com> Add api for getting the parent of a profile.

Change-Id: Ife59665cdf6531a118d74def864c8cfc92c92a42
ava/com/android/server/pm/UserManagerService.java
e22b3b143240f0f18e3d6d3c06686ad3c23b131b 08-May-2014 Dianne Hackborn <hackbod@google.com> Usage stats!

Start reworking the usage stats service to be able
to have an API we can publish.

The basic information it keeps is still the same, though
that will be changing in the future. The one big addition
here is that we are also now collecting configuration usage
stats.

Also introduce the start of an access model for usage stats,
using app ops. There is an new app op that gives an application
access to usage stats even if it normally wouldn't have it,
disabled by default.

Change-Id: I6ead28e18a7f08eafd057d6ff37dd9cb216358f4
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/UsageStatsService.java
86e80290792b3a259dc6db7958a2f7ace7f9c6e4 08-May-2014 Emily Bernier <ember@google.com> Merge "New user restrictions for EDU"
8f17b5758279e287e2622a226f74e17c205f88dc 08-May-2014 Winson Chung <winsonc@google.com> Merge "Listening for system changes to active recent tasks. (Bug 14260718)"
ca0c0ba76488ad287e83228ba78d4e46524564aa 08-May-2014 Jose Lima <joselima@google.com> Merge "Remove unecessary code from ActivityStack"
56cf1ab4105cffd5afb3abd1411fd38d98002853 28-Apr-2014 Jason Monk <jmonk@google.com> Fix Global Proxy when used with PAC

Since PAC needs to relay the local proxy port back to the
ConnectivityService it ends up calling handleApplyDefaultProxy...
This works fine for PAC on WiFi, but when tested on global proxy
(not currently used anywhere), it sets the mDefaultProxy. This
mDefaultProxy does not get cleared when the global proxy is cleared
and requires a reboot to get things cleared out.

This CL adds a check to overwrite mGlobalProxy rather than
mDefaultProxy in this use case.

Change-Id: I92782d11e213b91f8ddda2faaf996a7252273fc3
ava/com/android/server/ConnectivityService.java
729cb2391f8eedbab9af1d0ef62febb0b56292cc 06-May-2014 Jose Lima <joselima@google.com> Remove unecessary code from ActivityStack

- Due to a previous CL to allow activities to be visible under
the Home stack, some code un ActivityStack became unecessary.
- This CL removes the uused code and changes the interface of
ensureActivitiesVisibleLocked, since we no longer need to
special case visibility for the Home stack.

Change-Id: I5cffe903bc82041fe79bfc63107df71ddf01232c
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
da1350f28011ef7ed6b02d514c3a86a8cc8007de 08-May-2014 Sander Alewijnse <salewijnse@google.com> AccountManager cannot modify accounts according to device policy.

Change-Id: Ied03b16c31312f7a4a934616c3c25b2481de818e
ava/com/android/server/accounts/AccountManagerService.java
26ecbefea064af5ae616b135aa56fec1009296e7 08-May-2014 Kenny Guy <kennyguy@google.com> Merge "Limit package launcher apps callback to enabled users."
63812fd9f20d2a0f96ef0fac69497d3334ae6d97 08-May-2014 Amith Yamasani <yamasani@google.com> Merge "Send boot_completed for users started in the background"
b325c80d3da0c14107597a4c5423dba938e1a633 08-May-2014 Dan Sandler <dsandler@android.com> Merge "Quantum notification improvements."
1c3f81fde944d615d566db6fbc493b25e6d2f472 16-Apr-2014 Christoph Studer <chstuder@google.com> Record notification events to a local SQLite DB

Bug: 13672846
Change-Id: I911573ba943487b3f4f18349d318215bd183d991
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationUsageStats.java
26e81cf14bf32585742cbb75ac14045acaab2692 06-May-2014 Dan Sandler <dsandler@android.com> Quantum notification improvements.

New API introduced here: Notification.color (and
Builder.setColor()), allowing apps to specify an accent
color to be used by the template. The Quantum templates
(which are now the only kind we support) use this when
creating a circular background to draw behind the smallIcon
in the expanded form.

Additionally, the quantum and legacy templates are no longer
in superposition; all apps using Builder will get quantum.

Change-Id: Iac5e2645cc5c2346ed458763f2280ae9c6368b62
ava/com/android/server/notification/NotificationManagerService.java
221b336cc17b4a98bc752722932727d42ffb3f13 08-May-2014 Craig Mautner <cmautner@google.com> Merge "Account for windows on non-app display."
9f49df933f01a32d04bdf92d53c943065aa8ddf7 08-May-2014 Winson Chung <winsonc@google.com> Listening for system changes to active recent tasks. (Bug 14260718)
ava/com/android/server/am/ActivityManagerService.java
f12fca4ba56e2df5692836b1a100dde2488f0442 08-May-2014 Craig Mautner <cmautner@google.com> Merge "Use new doccentric flags and attributes in Sharing"
41db4a77fa4659d60ad055ec1819a410ce35bf28 08-May-2014 Craig Mautner <cmautner@google.com> Use new doccentric flags and attributes in Sharing

Put the new doccentric flags and attributes into use. And make their
first application the Share widget. Sharing now creates a new task
which is destroyed once the share action has completed.

Fixes bug 14463859.

Change-Id: I34c4c79775ef44d65e1967be5601997a2d46b210
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskRecord.java
531fecca1c55d2f60977a57f5eb546d4d202fb97 08-May-2014 Florin Malita <fmalita@google.com> Merge "Encapsulate Canvas.mNativeCanvas"
dfad99ad9fd5953b9d726715c40197a3e70e7dd0 08-May-2014 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of 0b5598c9 to master

Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
6422abef786632e53337c6c298ffa64f7ddf4d90 07-May-2014 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of 3bbef521 to master

Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
1a7eaaa50e7f1a021129ebbe2f6ae1ac469b8812 07-May-2014 Amith Yamasani <yamasani@google.com> Send boot_completed for users started in the background

Bug: 14587584

Change-Id: I7abfad0a7102376e1665b528f3fd110a4b6ed164
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
394a6cdd987fed79bd040f39e2d3e47d4484bab4 07-May-2014 Emily Bernier <ember@google.com> New user restrictions for EDU

New user restrictions will allow schools to prevent students from 1) using
device microphones, 2) adjusting device volume, and 3) mounting physical
external media.

Change-Id: Ib2fcb7ce8fbc489a25d2c97a122b2124012a9e3c
ava/com/android/server/pm/UserManagerService.java
0b5598c924fc140db5cfee08c17fd91e630b1c9e 07-May-2014 Brian Carlstrom <bdc@google.com> am 691079dd: am a21ba5be: Merge "Add BackgroundDexOptService"

* commit '691079ddc0055fac9b82dccaf35b4591978b2a55':
Add BackgroundDexOptService
3bbef521d4b07f86010ba0729a36ff8b73bcb0ac 07-May-2014 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp

Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
f2e074604b1ee7e47bcbf82bb9d612b64bbcee93 07-May-2014 Jason Monk <jmonk@google.com> Fix Build

Change-Id: I0035256b41199041bc1bc7d625f2c8f5a6a23e43
ava/com/android/server/am/ActivityManagerService.java
9d75ccb6a1b3b300c33ce3ceab5eaece0ad55d42 07-May-2014 Jason Monk <jmonk@google.com> Merge "Make proxy API public"
207900c23b26d0df9ab28c709db4a1007d7d7904 25-Apr-2014 Jason Monk <jmonk@google.com> Make proxy API public

Also exposed proxy-related functions that were on the
ConnectivityManager.

Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
ava/com/android/server/ConnectivityService.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/connectivity/PacManager.java
2871654830e94445842d6a67d775d7c317a7f2c0 07-May-2014 Kenny Guy <kennyguy@google.com> Limit package launcher apps callback to enabled users.

Change-Id: I8e42756647025677203a7dfb1dd2d040ac6e32db
ava/com/android/server/pm/LauncherAppsService.java
19ab828aa581e398e50c6f42ff4863c6ee522203 07-May-2014 Craig Mautner <cmautner@google.com> Account for windows on non-app display.

When an app launches a window on a different display than the one
the app is on, make sure and return the window's display, not the
app's display.

Fixes bug 12906650.

Change-Id: Ie418db023672f7944729fc60d457c4c1d850dc1f
ava/com/android/server/wm/WindowState.java
153187d05bb82aec54967ece1917db325b70d7ad 07-May-2014 RoboErik <epastern@google.com> Merge "Add a class for managing Session priority"
780bee263359b1462156f543a04fab98dd541845 07-May-2014 RoboErik <epastern@google.com> Merge "Add APIs for creating a system priority session and getting controllers"
010cfd458121034075c7439020ffef4eedbcc0fc 16-Apr-2014 Adam Connors <adamconnors@google.com> Add enableSystemApp methods to DevicePolicyManager

These methods allow profile or device owners to enable
systems apps pre-installed in the primary user in the
managed profile. Apps can be specified by either package
name or intent.

Bug: 13587051

Change-Id: Ifcbc68c139308506b6c18cf3c0ea62b8026ff75f
ava/com/android/server/pm/PackageManagerService.java
10a38c06df42f0231a71a78ec341609648035b9d 07-May-2014 Jason Monk <jmonk@google.com> Merge "Only show IME in navigation bar when it should"
b605fecd9e4282823af754b3968b21205d64554a 02-May-2014 Jason Monk <jmonk@google.com> Only show IME in navigation bar when it should

Add a flag to indicate that the IME should be shown. This follows
the continuous ime notification boolean, and if there are multiple
input methods to choose from enabled. This way the notification
and navigation button show up under the same circumstances (but
not on the same devices).

Change-Id: Ia6a2253061f1876f4bcc511de48c1078e9d96be5
ava/com/android/server/InputMethodManagerService.java
ava/com/android/server/statusbar/StatusBarManagerService.java
d46d0f9dcd72dfaa93a57d07d896def6ce53bbae 23-Apr-2014 Julia Reynolds <juliacr@google.com> Add new EDU user restrictions.

Change-Id: I6aad10466d99cda6be378c72025df686fe665071
ava/com/android/server/pm/UserManagerService.java
90372e1f1ce072651d8be15db27d87fe54ec93e6 07-May-2014 Heather Lee Wilson <hwilson@google.com> am 6827949f: am d237cbac: Merge "Prevent crashing when disabling MCU during dream wakeup" into klp-modular-dev

* commit '6827949fc63699106b7fdc0c399b3fad8e015a79':
Prevent crashing when disabling MCU during dream wakeup
c677675e9c465dc1de21ecf2e0421835c7eb55b4 07-May-2014 Florin Malita <fmalita@google.com> Encapsulate Canvas.mNativeCanvas

Currently, the native canvas is accessed/manipulated from several
unrelated classes.

In order to facilitate SaveFlags emulation, this CL encapsulates
the field and refactors its external users.

Two main changes:

* new getNativeCanvas() getter for use in Java-level clients.
* JNI canvas swappers (GraphicsBuffers, Surface, TextureView &
AssetAtlasService) are refactored based on the exising/equivalent
safeCanvasSwap() Canvas method.

Change-Id: I966bd4898f0838fb3699e226d3d3d51e0224ea97
ni/com_android_server_AssetAtlasService.cpp
a9095ba488ea18aeafaf9c3a8258bf9f459bda71 02-May-2014 Jungshik Jang <jayjang@google.com> Implement more native api for Hdmi cec.

HAL interface for CEC has more apis that haven't
connected with HdmiCecController.
Here is a list of apis.

1. addLogicalAddress
2. clearLogicalAddress
3. getPhysicalAddress
4. getVersion
5. getVendorId

Verified that it does not affect to other components in nakasi

Change-Id: I535bde47c43dd25bbede002c0a2aefbe86779076
ava/com/android/server/hdmi/HdmiCecController.java
ni/com_android_server_hdmi_HdmiCecController.cpp
6827949fc63699106b7fdc0c399b3fad8e015a79 07-May-2014 Heather Lee Wilson <hwilson@google.com> am d237cbac: Merge "Prevent crashing when disabling MCU during dream wakeup" into klp-modular-dev

* commit 'd237cbac122cdb48e5b73db5a9c5f8d85ceebe55':
Prevent crashing when disabling MCU during dream wakeup
a8f951462791a16f47e8c07e552232f31dcefac5 05-May-2014 RoboErik <epastern@google.com> Add a class for managing Session priority

Priority is given first to the system priorty session, then to
active local sessions, then to active remote sessions, then to
the rest of the sessions. Ordering within categories is by whoever
last performed an action we associate with the user.

The stack has methods for getting filtered sets of this priority.

This also:
-Changes publish to setActive(boolean)
-Adds a flag for handling media buttons.
-Adds a flag for transport controls instead of enabling once.
-Unhides the setFlags API.
-Updates the legacy helper to use the flags.

Change-Id: I6ebeb27410de1b24149fd6e1785613ac444f0774
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/MediaSessionStack.java
5269a01c6d47b3a37736d9b30f24e091710ff064 07-May-2014 Winson Chung <winsonc@google.com> Merge "Fixing regression in calculating which activities to apply recents values to."
3aeaebb6fc2093069a138d0c8562020dfc76ad43 07-May-2014 Winson Chung <winsonc@google.com> Fixing regression in calculating which activities to apply recents values to.
ava/com/android/server/am/ActivityManagerService.java
9da8301e0abbc940b28a524e36e83f04884ce4cb 05-May-2014 Heather Lee Wilson <hwilson@google.com> Prevent crashing when disabling MCU during dream wakeup

AmbientMode attempting to send message to DozeHardware no longer results in an
uncaught IllegalStateException. The exception was crashing Android Wear when
DozeHardware had already been released by PowerManagementService at time of
AmbientMode's message.

Change-Id: I5956a453802b5b764e88638f6b6d899cbc94cc8d
ava/com/android/server/dreams/DreamManagerService.java
9bd01ef0c6ba09ca626f49bd162ce9aede41b027 06-May-2014 Dan Stoza <stoza@google.com> Merge "Enable changing display configuration"
e7880d8eb1903d42e4e2a90c99b58e2240e01e82 30-Apr-2014 RoboErik <epastern@google.com> Add APIs for creating a system priority session and getting controllers

This adds a hidden call to set flags and a flag for making a session an
exclusive high priority session. This will cause all media button events
to be sent to that session as long as it is stillr egistered. This
requires the MODIFY_PHONE_STATE permission like the old forCalls API.

This also adds a way to get controllers for all the ongoing sessions.
This is protected by the MEDIA_CONTENT_CONTROL permission like the
old RemoteController APIs.

Change-Id: I51540e8dcf3a7dbe02a0f8ee003821e40af653a3
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
a93369a819c9d4cfd4fe7ce3dd519f1c974bce4d 06-May-2014 Jeff Brown <jeffbrown@google.com> am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev

* commit '84aaf124b762b9eeb0957aaea9df8424a429b148':
Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
996e269d93d09615e242edcbd7a6218e065aeb7b 06-May-2014 Jeff Brown <jeffbrown@google.com> Merge "Plumb display state and interactive information to BatteryStats."
84aaf124b762b9eeb0957aaea9df8424a429b148 06-May-2014 Jeff Brown <jeffbrown@google.com> Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
e95c3cd89591ba586aa8a0f7a17660c6fb8770bc 03-May-2014 Jeff Brown <jeffbrown@google.com> Plumb display state and interactive information to BatteryStats.

Fixes an issue where dozing was treated the same as the screen
being fully on. Now dozing is treated the same as the screen
being fully off which is slightly better. The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/power/Notifier.java
01ee6f6cf7de9fb98fc3a88509b43416caa71040 03-May-2014 Jeff Brown <jeffbrown@google.com> Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)

Fixes an issue where dozing was treated the same as the screen
being fully on. Now dozing is treated the same as the screen
being fully off which is slightly better. The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/power/Notifier.java
00101052b5bf99a29acea3525864ed64b709c16c 03-May-2014 Dan Stoza <stoza@google.com> Enable changing display configuration

This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.

Bug: 14320401
Change-Id: Ie4363bc8353d95428f1114ea48e5b1c8976e1730
ava/com/android/server/display/LocalDisplayAdapter.java
4a5eeb9c727d77bb57fef87a70c8c9cc23dbfee3 06-May-2014 Eric Laurent <elaurent@google.com> AudioService/WireAccessoryManager: change boot completion detection method

BOOT_COMPLETED intent is not a reliable way for system services
to detect boot completion. The intent broadcast can be significantly
delayed and there is no guaranty that system services
receive it before apps.

Use a systemReady() method called by SystemServer instead.

Bug: 14323903.
Change-Id: I781596a3545e7a1e719799982347cbcd9a4c9009
ava/com/android/server/WiredAccessoryManager.java
ava/com/android/server/input/InputManagerService.java
c79586ede6dcd6a167bc8360f058cb5cc655b33d 06-May-2014 Nicolas Prevot <nprevot@google.com> Cleaning code related to the forwarding intent filters.

Checking for INTERACT_ACROSS_USERS_FULL
Adding equivalent methods in the PackageManager

Change-Id: Iaa1328fa666613a78e67ca669ea045144275e895
ava/com/android/server/pm/PackageManagerService.java
6fee7d4cf991a8d39bdefb782937250c87f60f25 01-May-2014 Nicolas Prevot <nprevot@google.com> Introducing removable and non-removable ForwardingIntentFilters.

clearForwardingIntentFilters removes only non-removable IntentFilters.
The ForwardingIntentFilters set by the profile owner are always removable.

Change-Id: If950ccd7e69261b86360ea647fdb501c92f5440b
ava/com/android/server/pm/ForwardingIntentFilter.java
ava/com/android/server/pm/PackageManagerService.java
a767d762d8f70fbce0d8bb8d2bacde55de2504b5 06-May-2014 Jesse Hall <jessehall@google.com> VirtualDisplayAdapter: Set the transaction surface even if NULL

Bug: 14299872
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6
ava/com/android/server/display/VirtualDisplayAdapter.java
6856ef87a579fd20ec4a14d7ebf7c2cb352d958e 05-May-2014 Craig Mautner <cmautner@google.com> am 9bb4df3a: am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev

* commit '9bb4df3a7d9ed479f8ef10b08bbc3354a1984aab':
Pause and resume ActivityView when visibility changes
9bb4df3a7d9ed479f8ef10b08bbc3354a1984aab 05-May-2014 Craig Mautner <cmautner@google.com> am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev

* commit 'e88097bd00d5710bbfb6c24a934743c8d6cac9cf':
Pause and resume ActivityView when visibility changes
b12646210f15b7f1b7cf0b1cbc56f5cb4bbfe02d 05-May-2014 Craig Mautner <cmautner@google.com> am 6dffeb9e: am 8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev

* commit '6dffeb9eeba785dcf738bfabfec334a6c188d104':
Add null check to embeddedAllowed check
6dffeb9eeba785dcf738bfabfec334a6c188d104 05-May-2014 Craig Mautner <cmautner@google.com> am 8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev

* commit '8890013ae0473663a6b9591db6230e9038ba6711':
Add null check to embeddedAllowed check
e88097bd00d5710bbfb6c24a934743c8d6cac9cf 05-May-2014 Craig Mautner <cmautner@google.com> Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev
05678d5a3136a747a2e7eaccca0ad148c52a2d00 05-May-2014 Craig Mautner <cmautner@google.com> Add null check to embeddedAllowed check

If the component being checked has been removed an NPE will be
thrown. This checks for that situation and handles it.

Fixes bug 14562234.

Change-Id: Ica5713378f356ac8441862d455b7d284ea111212
ava/com/android/server/am/ActivityStackSupervisor.java
d13a5583971a5905ac2ec240282383bde96fc25e 05-May-2014 Craig Mautner <cmautner@google.com> Pause and resume ActivityView when visibility changes

Once a Surface has been established the activity in an ActivityView
must be paused and resumed as the view goes in and out of visibility
= View.GONE.

Fixes bug 14034658.

Change-Id: Icab43678053c225db70f051dceacd4d024df2153
ava/com/android/server/am/ActivityStackSupervisor.java
983ce97a5dd82688966e783a2c26f34550cfafa5 05-May-2014 Christoph Studer <chstuder@google.com> Merge changes Iffd15e95,Id2db95ec

* changes:
Log notification clicks
Add userId to StatusBarNotification key
2059bce9d6ce3848b23f3c41aa4feb63fbfc2e6c 05-May-2014 Dianne Hackborn <hackbod@google.com> Merge "Further work on voice interaction services."
c03c9167c2d9a1e22fb2b176b00a0524177fb037 02-May-2014 Dianne Hackborn <hackbod@google.com> Further work on voice interaction services.

This makes VoiceInteractionSession a more first-class
concept. Now the flow is that a VoiceInteractionService
calls startSession() when it wants to begin a session.
This will result in a new VoiceInteractionSession via the
VoiceInteractionSessionService containing it, and the
session at that point an decide what to do. It can now
show UI, and it is what has access to the startVoiceActivity
API.

Change-Id: Ie2b85b3020ef1206d3f44b335b128d064e8f9935
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
db6d7a59718eec9b782cf08bbb95d9b19b51daf2 05-May-2014 Jason Monk <jmonk@google.com> Merge "Don't show IME Switcher not. if nav bar exists"
c8d7ab9ff9f1ca0790d6fd9b9a2076c3eb63a795 05-May-2014 John Spurlock <jspurlock@google.com> Log all notification interceptions.

Change-Id: I036a4b5eb7c5a3ce2addb0a16d9d6806e3952929
ava/com/android/server/notification/NotificationManagerService.java
043aa252cf67ebe5ef9abe34e8922098a995272c 04-May-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Define Feature action for obtaining info on a new CEC device"
3e586e4621bfa69fb5c7db862ee0cf560574284a 03-May-2014 Winson Chung <winsonc@google.com> Merge "Refactoring activity method to update recents values."
be2ba85c4f84463e6ff1747132f021769811f14b 03-May-2014 Jose Lima <joselima@google.com> Merge "Allow activities to be visible behind the Home Stack"
03a9baedc9b933bb6a550c0cb84649b1b45b872c 02-May-2014 Winson Chung <winsonc@google.com> Refactoring activity method to update recents values.

Change-Id: Ic525be207714d34abe0c2d26091c3e46abcd9bad
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/TaskRecord.java
93be005f4343c413da1a3bd33b914df5c6b9324b 03-May-2014 Dianne Hackborn <hackbod@google.com> Merge "Bump up priority of system receiving BOOT_COMPLETED."
d83a096f299abd9c7fe5e441ef1bb169c314b575 03-May-2014 Dianne Hackborn <hackbod@google.com> Bump up priority of system receiving BOOT_COMPLETED.

Change-Id: I5166f88f11f781914312e867cb653c8ecbefa705
ava/com/android/server/BluetoothManagerService.java
ava/com/android/server/RecognitionManagerService.java
ava/com/android/server/WiredAccessoryManager.java
ava/com/android/server/content/SyncManager.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/search/SearchManagerService.java
d23eb5ceb672f137235a94a036bf70eab19340dc 02-May-2014 Amith Yamasani <yamasani@google.com> Merge "Send ACTION_MANAGED_PROFILE_REMOVED broadcast."
7b66ed588525d2d79ef0df8b3024bae138d8681d 14-Apr-2014 Adam Connors <adamconnors@google.com> Send ACTION_MANAGED_PROFILE_REMOVED broadcast.

When the managed profile is removed, this new intent
is used to inform the rest of the system.

Change-Id: I1748bed0a7ee0122f69d5c78235a79f8e205efec
ava/com/android/server/pm/UserManagerService.java
5d84bce12204072bc7ab296ce0cdea7efb5cf17c 02-May-2014 Dianne Hackborn <hackbod@google.com> Fix issue #14492403: Oom scores appear to be incorrect...

...and causing runtime restarts

Got a little too aggressive with the delete key. *blush*

Change-Id: Icd4637827424211abc2347f7f9407c2d4c95cfad
ava/com/android/server/am/ActivityManagerService.java
5b8b92002230525317d5832a84d7813467594967 02-May-2014 Dianne Hackborn <hackbod@google.com> Merge "Make GET_TASKS signature|system."
4f854e0d0b619596752b1874492efe2dabcc092b 02-May-2014 RoboErik <epastern@google.com> Merge "Add playback state and metadata to dump"
09233289624a85093b1d99e4a6a149bf09059d8d 30-Apr-2014 Dianne Hackborn <hackbod@google.com> Make GET_TASKS signature|system.

Normal apps can't hold it now. If they try to use
getRecentTasks() or getRunningTasks() without the permission,
they will only see their own tasks and home in the list.

Also took this opportunity to eradicate all of the old pending
thumbnail stuff.

Change-Id: I6dc52a06221c78097162e4a8b482027b798bf3ee
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/PendingThumbnailsRecord.java
ava/com/android/server/am/TaskRecord.java
e463c745ef6901121837e88ca8597d062843b9dd 02-May-2014 Jason Monk <jmonk@google.com> Don't show IME Switcher not. if nav bar exists

Since the navigation bar now has IME switcher icon no need for a
notification about it when it is present.

Bug: 14257632
Change-Id: I5511fee0dee45475d5b7949f63696b1d29acf9cc
ava/com/android/server/InputMethodManagerService.java
4cd4110f20c2fcf8feaf04414e60b15f5801af4f 02-May-2014 Jeff Davidson <jpd@google.com> Merge "API for network cache subsystems."
97babdc92be8c81325f3a9f4f520a8c20bed177d 02-May-2014 Jungshik Jang <jayjang@google.com> Fix unmatched jni method name.

It breaks systemserver

Change-Id: Iecc5600d64a273c4bbf51bd8fd779a79a3dab107
ni/com_android_server_hdmi_HdmiCecController.cpp
3f74ab0ee0ec27a6be31cdb5a4258f4f25909ba8 30-Apr-2014 Jungshik Jang <jayjang@google.com> Implement logical address allocation logic for HDMI CEC.

Logical address in CEC is to distinguish each logical device from others.
In order to allocate logical address for new device, CEC sends
<Polling Message> to CEC bus. <Polling Message> is a CEC message
which has the same address for both source and destination without
body frame. (10bits).
CEC allows one and more logical address for a device type.
For example, there are 3 logical address defined for recorder device(1, 2, 9).
Among logical address candidates for the given device type, CEC scans
first the previous logical address (preferred logical address) of device.
If a device has not been allocated any logical address, preferred address
will be 15 (Unregistered), which means scan address from the minimum address
number of type. For example for recorder device, it starts from 1.
If no devices acks to the <Polling Message> during scan, it will be the
logical address of the device.
Since logical address is determined by a series of sending <Polling Message>
it happens in IO thread with separate allocate logical address message
instead of individual sendCommand message.

Along with this, updated ADDR_FREE_USE(14) to ADDR_SPECIFIC_USE(14)
which is revised name on HDMI 1.4.

Change-Id: Ic96dcdbe4aaa3789cfed0352a88ca75369335a98
ava/com/android/server/hdmi/HdmiCecController.java
8822d4befdb30452ad4276b42d89062938b51a1f 02-May-2014 Jeff Brown <jeffbrown@google.com> Merge "resolved conflicts for merge of 4f8cd188 to master"
fb0448ab4b42c1b390cd75c3660ec0de511b7b3b 02-May-2014 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 4f8cd188 to master

Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3
7d9a843af83dbc75b1d170c743603198ede5a10f 29-Apr-2014 Jungshik Jang <jayjang@google.com> Implement add/remove device info api for Hdmi Cec device.

In order to manage info of all cec devices connected hdmi bus,
HdmiCecController should have data structure for them.
This change includes two major pieces.

1. HdmiCecDeviceInfo
It's data structure containing basic device information such as
logical address, physicall address, device type and vendor id.
It will not be available to thirdparty but some system component
like TIF needs this to update device information connected to
its hdmi ports.

2. Managing device list in HdmiCecController.
HdmiCecController is a host to manage all CEC device.
and we need to have logic add or remove as well as get it.
All cec devices are managed as sparsearray which uses logical address as key.

This change introduces internal api and the later change will have logic
to call these apis.

Change-Id: Idc2f189ac0bffe904e011ced0ac991f16da07db1
ava/com/android/server/hdmi/HdmiCecController.java
7ba7125af1962b322d48ac5a49f698565da2b84c 30-Apr-2014 Jose Lima <joselima@google.com> Allow activities to be visible behind the Home Stack

- Only hide/stop activities behind the Home stack if the Home
stack contains a full-screen/opaque activity.

Change-Id: I69f951b91753f48d0344a9d534569cfb8de1d57f
ava/com/android/server/am/ActivityStack.java
615d1337fcb4b7e16706e615b19305eea7b689bb 02-May-2014 Jungshik Jang <jayjang@google.com> Merge "Implement native send and receive logic for HdmiCecController."
4f8cd18880f1a63d2db376c3bfbfe11c55e6f1ee 02-May-2014 Jeff Brown <jeffbrown@google.com> am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev

* commit '7f6ab17d414726868563105cd995b37dd519320b':
Clean up some terminology related to interactive state.
55db646c4e43fd24386bf522aef13c0b3075593c 02-May-2014 Natalie Silvanovich <natashenka@google.com> Null checks in register/unregister BT Adapters

Prevents system crash

Bug: 13743852
Change-Id: I05bcb31fc8377866b93899a01c004d15e041f21f
ava/com/android/server/BluetoothManagerService.java
66dea73906f24226a6f699759e79040726bde8b5 02-May-2014 RoboErik <epastern@google.com> Add playback state and metadata to dump

Change-Id: I813ff23c496f75776c8bd63f78bbe87683b19bc0
ava/com/android/server/media/MediaSessionRecord.java
c70d2295dd3fb87ce8c81c704688d1ad05043b4d 30-Apr-2014 Jinsuk Kim <jinsukkim@google.com> Define Feature action for obtaining info on a new CEC device

Feature action (or action) is a unit of CEC command flow that accomplish
a certain feature. This CL introduces an abstract class FeatureAction,
and a concrete one NewDeviceAction that is used to obtain detailed
information on a new logical device on the CEC bus.

Change-Id: I94a7e75fbb76fe547f07f9588a93c7ea5a85d856
ava/com/android/server/hdmi/FeatureAction.java
ava/com/android/server/hdmi/HdmiControlService.java
ava/com/android/server/hdmi/NewDeviceAction.java
140ffc783c50bbe3b62e817c117a31b93e7f627e 02-May-2014 Jeff Brown <jeffbrown@google.com> Clean up some terminology related to interactive state.

Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
ava/com/android/server/power/Notifier.java
edfb6b6b747e09334c102bff7cb2c4f8a8c86129 01-May-2014 Brian Carlstrom <bdc@google.com> am 2de2e225: am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"

* commit '2de2e22540441fd02e03abae5bcae8feb873b929':
Minor cleanup of UsageStatsService
2de2e22540441fd02e03abae5bcae8feb873b929 01-May-2014 Brian Carlstrom <bdc@google.com> am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"

* commit 'e3cceef7ececdac1c6df65d3f7a1557ac3ce5e3c':
Minor cleanup of UsageStatsService
334f959bf5cdc97738c54447a25842aa78b99fa9 01-May-2014 Amith Yamasani <yamasani@google.com> Merge "Deliver package broadcasts only to related profiles."
932249db930d78131c4314ff46ec5fca76cb46cd 01-May-2014 Amith Yamasani <yamasani@google.com> Deliver package broadcasts only to related profiles.

Store the listener's userhandle in a cookie and compare profile
relationships before delivering package broadcasts to a listener.

Basically, don't leave TODOs around, they'll result in bugs :)

Bug: 14436558
Change-Id: I57a21719caab6cf54b78de7be2eca3e398dc6288
ava/com/android/server/pm/LauncherAppsService.java
3a8557dc22a7190b975302c1720fa1eb98e57a71 01-May-2014 John Spurlock <jspurlock@google.com> Merge "Implement long-term condition subscriptions."
3b98b3f1f85aff0c84ebef4dd497c146d1b4d248 01-May-2014 John Spurlock <jspurlock@google.com> Implement long-term condition subscriptions.

Bind long-term conditions (like "in a meeting") to enter/exit
zen mode automatically.

Persist automatic condition subscriptions to maintain them across
reboots.

Normalize condition state binding: true => enter zen, false => exit.

Change-Id: Icba2b8b25c0a352ae8215f4c0a324e4f966c0165
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/ManagedServices.java
ava/com/android/server/notification/NotificationManagerService.java
6e6a6e863df6cc5e7b930b1197b1f6743ba31d8e 01-May-2014 RoboErik <epastern@google.com> Merge "Add Session API calls to RCC and AudioManager"
f1372428f2df781c71c71caa2f6a4db6f847cf10 23-Apr-2014 RoboErik <epastern@google.com> Add Session API calls to RCC and AudioManager

This makes RCC and MediaButtonReceiver (via AudioManager) also use the new Session APIs in parallel to their existing code. This will allow us to bring up the Session compatibility pieces without disrupting the old behavior and then switch everything over to just using the new APIs when ready.

Change-Id: I33ce0a044dea3ec763f2302b91a5e415be27d4a4
ava/com/android/server/media/MediaSessionRecord.java
67e2196d07dd4dc1f3ce82fdaaa34cdbce89e1ce 01-May-2014 RoboErik <epastern@google.com> Merge "Add dump to MediaSessionService"
531381056fac077cffcd509b1e89d9b41f400fca 01-May-2014 Narayan Kamath <narayan@google.com> am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."

* commit '5dca099df7100c531e111b50435605c318f1e6d4':
Don't adjust ABI if PackageSetting#pkg is null.
d6809b35aff02fdccf7ac433005aba2d06bbc3ff 01-May-2014 Narayan Kamath <narayan@google.com> am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic."

* commit 'c1f81f9086037dde6e082b8a80c84277cb727726':
Fix dex file pruning logic.
fbd80b58db2aa8f650acf26305e8cbed24a5755b 01-May-2014 Narayan Kamath <narayan@google.com> am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps."

* commit '51f4367cac606580a5ca10ec1cf2dcab3982aebc':
Adjust instruction sets for shared UID apps.
3a951e52d93697b7e232501b78f9ffb0ec605516 01-May-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp

Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a
d2ec8724d2a3407e28161299d44e2e113fe437ec 01-May-2014 Narayan Kamath <narayan@google.com> am d85ded89: am 645a920f: Merge "Fix OEM native library path bug."

* commit 'd85ded890d86d454a0571c63911ff911633e3a95':
Fix OEM native library path bug.
f5c6a1b3eb10f0374fcbab55853f400778f0f8e7 01-May-2014 Narayan Kamath <narayan@google.com> am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"

* commit 'eb5734989b3ef5455359f8807684a860ad04c134':
Fix native-lib dir assignment & updating
0338af46f968e2e1c2fd8c62e9387546fa9ed86b 01-May-2014 Narayan Kamath <narayan@google.com> am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"

* commit '99253c2da945cbd4725efced6cac2dc40c858d6c':
Handle /oem and /vendor as well
5bc12a1b5dadfd504fb03875fad97cda8d39cf25 01-May-2014 Narayan Kamath <narayan@google.com> am a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps"

* commit 'a7b465efc4eede46b8dfc8932c6c30346e8e79de':
Support per-package lib dirs for bundled apps
3c4d9c56db5b24699956de0a5a841196185363cc 01-May-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"
df35d570ed25257c6782e632ab1bae5e1603855a 09-Apr-2014 Alexandra Gherghina <alexgherghina@google.com> Adds an enabled state in UserInfo instead of DevicePolicyManager

Bug: 14377459
Change-Id: Ib4ec43d87da96c3dddaf9b7ae1796f261863a182
ava/com/android/server/pm/UserManagerService.java
ff2e05e1f69eb0cbe9ba68cb1adbd2b2922eeeb7 01-May-2014 Nicolas Prevot <nprevot@google.com> Merge "Introduce forwarding intents across profiles."
14f1ec05b2add5ee051c0d2e7c7c3b36a6e77b92 29-Apr-2014 Jeff Davidson <jpd@google.com> API for network cache subsystems.

A network subsystem (e.g. Wi-Fi) will be responsible for implementing
INetworkScoreCache. NetworkScoreService will load caches for each
configured network subsystem. When it receives a call to update
scores, it will separate the networks by type and call updateScores on
the appropriate INetworkScoreCache.

Each subsystem will also be responsible for requesting scores for new
networks by calling NetworkScoreManager#requestScores.

Bug: 14408144
Bug: 14137255
Change-Id: I76e5e5205bc359c39d6b9c1782126fb7f465cd96
ava/com/android/server/NetworkScoreService.java
cfbdcd259497ec5800028074ae487e5d4f112e5c 30-Apr-2014 destradaa <destradaa@google.com> Make sure the FlpHardwareProvider is only advertised to GmsCore if the platform supports it.
b/14117917

Change-Id: Id6c2444893bcf192049e3233d1296eac16fcf826
ava/com/android/server/LocationManagerService.java
ava/com/android/server/location/FlpHardwareProvider.java
10fa67c77e11699391e27975fc2d276a0b8c7cbb 24-Mar-2014 Nicolas Prevot <nprevot@google.com> Introduce forwarding intents across profiles.

The package manager service maintains, for some user ids, a list of forwarding intent filters.
A forwarding intent filter is an intent filter with a destination (a user id).
If an intent matches the forwarding intent filter, then activities in the destination can also respond to the intent.

When the package manager service is asked for components that resolve an intent:
If the intent matches the forwarding intent filter, and at least one activity in the destination user can respond to the intent:
The package manager service also returns the IntentForwarderActivity.
This activity will forward the intent to the destination.

Change-Id: Id8957de3e4a4fdbc1e0dea073eadb45e04ef985a
ava/com/android/server/pm/ForwardingIntentFilter.java
ava/com/android/server/pm/ForwardingIntentResolver.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
08d4a0ab48d3c2d6f6b70bbabcd599055365a657 30-Apr-2014 Adrian Roos <roosa@google.com> Merge "Fix broken trust agent reloading v2"
7e5264ced758107d83da88d6e476d16028b3cc71 30-Apr-2014 Kenny Guy <kennyguy@google.com> Merge "Extend LauncherApps service to expose enabled state."
406c51b360cb224e2cb4773eabd04d05d29793f8 30-Apr-2014 Dianne Hackborn <hackbod@google.com> Merge "Switch IProcessObserver to report process state"
a5956424b817fbe3d20a22b994a693f0011cc632 30-Apr-2014 Adrian Roos <roosa@google.com> Fix broken trust agent reloading v2

Bug: 13723878
Change-Id: I61f313bfc7ff0dc502551b54d580a7ce8694f04d
ava/com/android/server/trust/TrustManagerService.java
03b87a2f40c26948b7b0c9409c33ad44857218cf 30-Apr-2014 Christoph Studer <chstuder@google.com> Log notification clicks

Emit notification_clicked log events when a notification
is clicked from SystemUI.

Also refactor the onNotificationClicked method to work with
a key instead of individual notification params.

Change-Id: Iffd15e95d46371b2ae7bfd00b2c348d9f4cf5d14
ava/com/android/server/EventLogTags.logtags
ava/com/android/server/notification/NotificationDelegate.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerService.java
81e046645def5ded2cc72740b251df0ebe40334c 30-Apr-2014 Adrian Roos <roosa@google.com> Fix broken trust agent reloading

Bug: 13723878
Change-Id: I2f7f3fad5685e5e57dcddf2f2c3494bb95e38b15
ava/com/android/server/trust/TrustManagerService.java
ab45d1d6d296f4f61632a472cf7bd8626c8d5a06 30-Apr-2014 Narayan Kamath <narayan@google.com> Don't adjust ABI if PackageSetting#pkg is null.

If means the package hasn't been scanned yet, and we
will adjust the ABI during the scan of the last package
in the shared user group.

NOTE: This needs some more cleaning up, which will be
done along with the remaining TODO in this function.

Change-Id: Ie332806b64e22ab4a4856e1ccd064ff6a01616bf
ava/com/android/server/pm/PackageManagerService.java
36c492cf1af25f23719d2f5738a366db6ce1d362 30-Apr-2014 Youngsang Cho <youngsang@google.com> Merge "Explictly release the surface in TV input framework"
f836206818ce338db83a3c23c486fb8cab29cb6d 30-Apr-2014 Youngsang Cho <youngsang@google.com> Explictly release the surface in TV input framework

Change-Id: Id178e8959f9c25d1d5f1ab85d5e8455577570d11
ava/com/android/server/tv/TvInputManagerService.java
f6b635e4f00cd40d4c46730f7d23df6cc8bf4aa4 29-Apr-2014 Narayan Kamath <narayan@google.com> Fix dex file pruning logic.

We should now prune all normal files from /data/dalvik-cache
in addition to looking for dex files in all subdirectories of
/data/dalvik-cache.

Change-Id: I4abb2b01b359bbb1b8ece2c9025541a5d5e335f5
ava/com/android/server/pm/PackageManagerService.java
df6d6dc2aac2912e98de3fe37869d2b179eb23db 28-Apr-2014 Narayan Kamath <narayan@google.com> Adjust instruction sets for shared UID apps.

Since shared UID apps are run in the same process,
we'll need to make sure they're compiled for the same
instruction set.

This change implements the recompilation of apps that
don't have any ABI constraints.

Apps that *do* have ABI constraints are harder to deal
with, since we'll need to rescan them to figure out the
full list of ABIs they support and then re-extract the
native libraries from these apps once we find an ABI we
can use throughout.

Change-Id: I365c6b0b18187df814d4736da61b199dd4494e3c
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
0f206a149d27385ef092a34e0009a8607d663659 12-Apr-2014 Narayan Kamath <narayan@google.com> Package manager changes for dual zygote stack.

- Pass down the app's instruction set to dexopt so that
it can compile the dex file for the right architecture.

- Also pass down the app's instruction set to rmdex, movedex
and getSize so that they can construct the cache file
location properly.

- Temporarily compile "system" jars such as am,wm etc. for
both architectures. A follow up change will ensure that
they're compiled only for one architecture (the same
arch. as the system server).

- Java "shared" libraries are now compiled for the right
architecture when an app requires them.

- Improve the app native library ABI detection to account
for system apps installed in /system/lib{64}/<packagename>
and also handle sdcard and forward locked apps correctly.

Change-Id: I4f380b146137803e51d56fdf355c3bdfc92c409d
ava/com/android/server/pm/Installer.java
ava/com/android/server/pm/PackageManagerService.java
e9c77c88ea34a66f83a94f960547275c0ff6bd07 24-Apr-2014 Jungshik Jang <jayjang@google.com> Implement native send and receive logic for HdmiCecController.

This change includes native jni implementation for
incoming and outgoing message of CEC.
For incoming message, native layer converts it into three
pieces, source address (initiator), destination address (follower)
and data body which includes opcode. In Java layer, it is delegated to
main io thread. For now all messages are rejected by sending <Feature Abort>
to initiator.
For outoging message, all messages are sent to io thread and it delegates
it into native layer. Native logic converts it into cec_message and
pass it to HAL so that HAL performs sending message.
In order to handle <Feature Abort> message, added [Abort reason] which is
defined in hdmi_cec.h.

Change-Id: If9fd74745f476105e5cfae964e39c78bae69d3e2
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
ni/com_android_server_hdmi_HdmiCecController.cpp
aa2112f671e4f14555e25a6d765ce4bad454a43f 30-Apr-2014 John Spurlock <jspurlock@google.com> Merge "Zen mode tweaks."
e86de4c0670550a29edae77ebb9f5c8ba5631231 30-Apr-2014 John Spurlock <jspurlock@google.com> Zen mode tweaks.

- Fix regression with alarms.
- Run all condition provider callbacks on the main thread.
- Exit zen mode if the current condition is disabled / uninstalled.

Bug:14402762
Change-Id: I0746670c1910047a9dc9b7e29aa1a6c3899fd9fe
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/ZenModeHelper.java
684bf34ee8acc41931fac23762b13e14a22011db 30-Apr-2014 Dianne Hackborn <hackbod@google.com> Switch IProcessObserver to report process state

When IProcessObserver was created, the only information
we had for the state of a process was its "importance".
Now we have the process state, which is much more useful.
Switch to reporting that.

Change-Id: Icdb3eea8cf96f4eff7ed3d584f940a1bd9cc3884
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BroadcastQueue.java
ava/com/android/server/am/ProcessRecord.java
ava/com/android/server/net/NetworkPolicyManagerService.java
15c32f2699f03ba2065e663b3beb2c8d328f42ef 30-Apr-2014 Michael Wright <michaelwr@google.com> Merge "Move key attribute information into KeyEvent."
3e77bb8331244cc643753d7ac0259cc511b70c1d 29-Apr-2014 Dianne Hackborn <hackbod@google.com> Merge "Add IBatteryStats API to retrieve current charge times."
ab5c0ea43cf457b20ab4267a14b224f39e0511bf 29-Apr-2014 Dianne Hackborn <hackbod@google.com> Add IBatteryStats API to retrieve current charge times.

Also include charge/discharge information in dumpsys.

Change-Id: Ica1b333ad334dc698d4a67da391b378757662f41
ava/com/android/server/am/BatteryStatsService.java
c79224e4b70c27293a6744f29d73653a3c5ee018 29-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am 60037302: am 8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev

* commit '60037302208be033442cc3f3c50a25c7064ebbd1':
Move logical address allocation logic into native service from HAL
60037302208be033442cc3f3c50a25c7064ebbd1 29-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am 8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev

* commit '8fe27e881851921a90882f7d4da142bf936c5549':
Move logical address allocation logic into native service from HAL
8fe27e881851921a90882f7d4da142bf936c5549 29-Apr-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev
53fa4ec7f466e70fe3e33d15c4abfc9bb557eb10 29-Apr-2014 Kenny Guy <kennyguy@google.com> Extend LauncherApps service to expose enabled state.

Provide methods for checking if a package or activity
is enabled for a given profile.

Change-Id: If9cb15dc9398a709e60e7b689b664c24c49fcc16
ava/com/android/server/pm/LauncherAppsService.java
a278ea7cecb59a73586e5dd74ec05e85caa370c5 24-Apr-2014 RoboErik <epastern@google.com> Add dump to MediaSessionService

Adds a dump implementation for debugging MediaSessionService. Also
fixes some synchronize calls that weren't using the same lock object.

Change-Id: I14343f853398749c8ce7ebf91f72729abc9132d9
ava/com/android/server/media/MediaRouteProviderProxy.java
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/RouteConnectionRecord.java
a8e65fd82a323e6065ae9ae6cc8eaa130d3c1efd 24-Apr-2014 Kenny Root <kroot@google.com> Only remember the signer certificates for Signatures

Previously we would use the JarEntry#getCertificates API which would
return a flattened array of all the signers and their certificate chain.
Since this isn't what was intended, switch to reading the certificate
chains and only paying attention to the signer certificate.

In order to migrate during upgrades of the platform, we'll scan on boot
with a compatibility mode which will check the stores signatures in the
old format by flattening the chains of the scanned packages then
comparing the two sets.

Bug: 13678484
Change-Id: I02a5c53121d8d6f70a51d7e3b98168a41e11482e
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
19db0f036aa889ff05220b630262461e333faa85 29-Apr-2014 Jae Seo <jaeseo@google.com> Merge "Dispatch input events to the TV input"
6a6059a29edf31e65541b3d8927a46f5846fb0a2 18-Apr-2014 Jae Seo <jaeseo@google.com> Dispatch input events to the TV input

TvInputManagerService now creates an InputChannel pair and passes one
end to the app and the other end to the service. Then the TvInputManager
in the app creates an InputEventSender around one end of the channel to
send events and the service creates an InputEventReceiver around the
other end of the channel to receive events.
Most of the newly added code here was borrowed heavily from the IME.

Change-Id: I0bd83847cba0033ccb6f4b6dad267ebeaf5e9c7c
ava/com/android/server/tv/TvInputManagerService.java
648c83b4ee5fe825aa4032e0bb32c1d6269b02ad 29-Apr-2014 Winson Chung <winsonc@google.com> Fixing NPE. (Bug 14385152)

Change-Id: Ie6d1e7c3e5dcf721e945c4933c077fa6abb10067
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
337d9d2edc262141f9b8f684e53aae5e47f0ae13 23-Apr-2014 Michael Wright <michaelwr@google.com> Move key attribute information into KeyEvent.

This consolidates all of the information that was in the native
KeyEvent and the KeyLayout files into the managed KeyEvent class.

It also moves the definition for all of the key names to the native
side, rather than having them in both places.

Change-Id: I172e3b554e7eb52c79ae2ec406ef4332e8b25ffa
ni/com_android_server_input_InputManagerService.cpp
10596fbcce710a76ffc7e917400df13af5c2ebcb 28-Apr-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of 3ce4f3d0 to master

Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
6d50c3ff8815e6fedd1f80ba7afb8f1d22ea45b7 28-Apr-2014 Christopher Lane <lanechr@google.com> Merge "Fix incorrect "listener no longer active" errors"
3ce4f3d0af8b20f915631ab927aafa76a6105135 28-Apr-2014 Elliott Hughes <enh@google.com> am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."

* commit '685a0a72d445515167a2071330679cdf9b53a62d':
Track libcore.os' move to android.system.
33417df78aea04a9afe6fe73958d2dac73338666 24-Apr-2014 Jeff Sharkey <jsharkey@android.com> Fix OEM native library path bug.

Bug: 13340779
Change-Id: I3d69b3453d3d284295bbfa771e6fb4a36bca05c5
ava/com/android/server/pm/PackageManagerService.java
28f0877073e0ebc59f1eeeb6e0d54b614b9d3fa5 16-Apr-2014 Jeff Sharkey <jsharkey@android.com> Allow custom wallpaper and boot animation.

Add new "ro.config.wallpaper" and "ro.config.wallpaper_component"
properties which may be defined outside of the bundled framework
resources. Falls back to bundled resources when properties are
undefined.

Also look for boot animation under OEM partition.

Bug: 13340779
Change-Id: Ibdc9935dbdaae3319bf63b40573de0503d82ae67
ava/com/android/server/wallpaper/WallpaperManagerService.java
1c923a386ee4d8c31cc289f8628b8fc46bf08e86 27-Apr-2014 John Spurlock <jspurlock@google.com> Force condition provider unsubscribe when exiting zen mode.

Bug:13743109
Change-Id: I3c205067498a86e2862a0c545bc38e41682693d5
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenModeHelper.java
e77bb36d48b6b8b5c3bb6a1195aca469bb237919 26-Apr-2014 John Spurlock <jspurlock@google.com> Wire up condition providers to zen mode exit triggers.

Bug:13743109
Change-Id: I4e45d7050d1f9aaa379f46379a3203e61e216a3d
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/ManagedServices.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenModeHelper.java
31dc634be3610b062fbcc4afa02607ce8f4125f5 16-Apr-2014 Jae Seo <jaeseo@google.com> Log watched TV programs

Change-Id: Id6ee87dffcf90f10f1619e849126c66ad27464e2
ava/com/android/server/tv/TvInputManagerService.java
5a577903d366ff07b3c4ec6359e4757154f49790 26-Apr-2014 Christopher Lane <lanechr@google.com> Fix incorrect "listener no longer active" errors

Was incorrectly using .indexOfValue to search for Integer objects in the
client map.

Change-Id: I54e2e1725e0fff0a7d35a22376714cc8266a9eee
ava/com/android/server/NsdService.java
e361268e6efd48d815e85ce32a357f1346ac892f 26-Apr-2014 Craig Mautner <cmautner@google.com> am cb48b962: am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev

* commit 'cb48b96223071dc9d8633aab8f6cd9a91b3676bf':
Throw exception from startActivity if not allowed.
a466b101be24c1e0df098856fe0989749afe49ce 26-Apr-2014 Kenny Root <kroot@google.com> Merge "PackageManager: add versioning to packages.xml file"
08f15963fee9b81d46df1e68310f0ab9df72f81a 25-Apr-2014 destradaa <destradaa@google.com> Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906"
4553b2d7c881aebb9dfe10407f33bd8d1e9e27d4 25-Apr-2014 Winson Chung <winsonc@google.com> Merge "Updating recent tasks list in response to package events. (Bug 14260718)"
cb48b96223071dc9d8633aab8f6cd9a91b3676bf 25-Apr-2014 Craig Mautner <cmautner@google.com> am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev

* commit '1a7e9e66a6de039da8f567a2087d9bce34820746':
Throw exception from startActivity if not allowed.
cc972725af35284c0b571aaa0dc6873e69b15119 25-Apr-2014 destradaa <destradaa@google.com> Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.
b/14118906

Change-Id: I4723a3b9cad99aacc70bd3b7b5b5e034aa6c033d
ava/com/android/server/location/FlpHardwareProvider.java
250bb6e3e045a88022db526b074e7ab38c47d93c 25-Apr-2014 Amith Yamasani <yamasani@google.com> Merge "Allow profile owners to set user restrictions"
247ab65a4985470feff9cb5b5d40d2b8c64f5ada 25-Apr-2014 Craig Mautner <cmautner@google.com> Throw exception from startActivity if not allowed.

The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
ava/com/android/server/am/ActivityStackSupervisor.java
b22aabbbd2801db0be526a64badf2efa208f19f1 25-Apr-2014 John Spurlock <jspurlock@google.com> Merge "Introduce condition provider services."
8faa342c8a544229b9fc05378a6b33d18d0f8d6b 24-Apr-2014 Winson Chung <winsonc@google.com> Updating recent tasks list in response to package events. (Bug 14260718)

Change-Id: I7e887256b2d504aebfaedcfebb5ee8a40b05fe24
ava/com/android/server/am/ActivityManagerService.java
522ff52f88a0ddac3221fc32defd2f6cccaf04c4 25-Apr-2014 Dianne Hackborn <hackbod@google.com> Merge "Initial implementation of new voice interaction API."
7340fc8665ae3f9f1978f42aa0e5e1da85036158 25-Apr-2014 John Spurlock <jspurlock@google.com> Introduce condition provider services.

Add the condition provider interface, base class, and associated
system metadata.

Pull out common service management code into a reusable helper,
used by notification listeners and condition providers. The
helper, ManagedServices, is now completely self-contained - it
has no dependencies on NoMan or NoMan abstractions.

Bug:13743109
Change-Id: I6856d40f0a2ead78ac9b5707568559a57e7eb009
ava/com/android/server/notification/ConditionProviders.java
ava/com/android/server/notification/ManagedServices.java
ava/com/android/server/notification/NotificationListeners.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationUtil.java
ava/com/android/server/notification/ZenModeHelper.java
c1c0d3c4f461be5649a64920cad7b58dd4162680 24-Apr-2014 Kenny Root <kroot@google.com> PackageManager: add versioning to packages.xml file

During development, a new feature might be added that requires the
packages.xml format be updated. To that end, add a database version
attribute that allows this to happen.

Change-Id: I3340a0bd55017acd625c3cba523cec10a18a4805
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
a77f358eed8e75a8240ab41d637509e006ea6e27 25-Apr-2014 Jungshik Jang <jayjang@google.com> Merge "Implement skeleton of new HDMI Control Service."
3ce4bd3e715bd10e35bbc88204653c19b3b91f44 25-Apr-2014 Craig Mautner <cmautner@google.com> am e5889679: am 3a656ea3: Merge "Too soon." into klp-modular-dev

* commit 'e5889679f69c93f85bca9e94710d5e60a0b1a629':
Too soon.
e5889679f69c93f85bca9e94710d5e60a0b1a629 25-Apr-2014 Craig Mautner <cmautner@google.com> am 3a656ea3: Merge "Too soon." into klp-modular-dev

* commit '3a656ea32e6d6489f4bc45884e5acede9fe2de51':
Too soon.
3a656ea32e6d6489f4bc45884e5acede9fe2de51 25-Apr-2014 Craig Mautner <cmautner@google.com> Merge "Too soon." into klp-modular-dev
2e46e65e9dafe1f6a911efa213fcb0d105394b09 25-Apr-2014 Craig Mautner <cmautner@google.com> Too soon.

Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
ava/com/android/server/am/ActivityStackSupervisor.java
91097de49b0f683b00e26a75dbc0ac6082344137 05-Apr-2014 Dianne Hackborn <hackbod@google.com> Initial implementation of new voice interaction API.

This gives a basic working implementation of a persist
running service that can start a voice interaction when
it wants, with the target activity(s) able to go through
the protocol to interact with it. It may even work when
the screen is off by putting the activity manager in the
correct state to act like the screen is on.

Includes a sample app that is a voice interation service
and also has an activity it can launch.

Now that I have this initial implementation, I think I
want to rework some aspects of the API.

Change-Id: I7646d0af8fb4ac768c63a18fe3de43f8091f60e9
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/pm/PackageManagerService.java
400988b69c2ee1e9e9502f12cbb407f1cc867da6 25-Apr-2014 Craig Mautner <cmautner@google.com> am fbb0796e: am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev

* commit 'fbb0796eb3bbbdfeb3218b9495a0f36f4cf4ed19':
Add test for attribute android:allowEmbedded
fbb0796eb3bbbdfeb3218b9495a0f36f4cf4ed19 25-Apr-2014 Craig Mautner <cmautner@google.com> am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev

* commit '3359bbe02ca645bae2f495df51e7b4001de6c2b1':
Add test for attribute android:allowEmbedded
3359bbe02ca645bae2f495df51e7b4001de6c2b1 25-Apr-2014 Craig Mautner <cmautner@google.com> Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3 25-Apr-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of 02e85744 to master

Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
02e857441fcc27134f335aee659d553641a2b2ab 25-Apr-2014 Elliott Hughes <enh@google.com> am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os."

* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
Use the suggested public API instead of libcore.os.
898be168bda75b204611e8e24439d33213ecab5f 25-Apr-2014 Dianne Hackborn <hackbod@google.com> Merge "Add support for muliple active development codenames."
0792d37385e60aa8d73f8df174d0a32f4f618bc4 23-Apr-2014 Jungshik Jang <jayjang@google.com> Implement skeleton of new HDMI Control Service.

HdmiCecService is a system service handling HDMI-CEC features
and command. Recently we found out that industry has more
requirements to support HDMI-CEC. Also, MHL is another
standard should be in our pocket. Basically, MHL is
a standard to support communication between mobile device
and TV or Av device. As CEC is a control standard over HDMI
cable, MHL has control channel for peer device.
There behavior is very similiar. Both have commands that
can change Tv's current input and can send/receive key
to other device to control other deivce or TV.

In order to cover both CEC and MHL, current HdmiCecService
implementation has limitation. We had several
session of discussion and decided to refactor
HdmiCecService into HdmiControlService.
For each standard it will have separate controller instance
like HdmiCecController and HdmiMhlController.

In this change I didn't touch original HdmiCecService
because some component, like cast receiver, uses HdmiCecService.
For a while we will keep HdmiCecService until HdmiControlService
accomodates all features of HdmiCecService.

Change-Id: I5485280ab803dbf071d898bfbe34be0b11ce7958
ava/com/android/server/hdmi/HdmiCecController.java
ava/com/android/server/hdmi/HdmiControlService.java
ni/Android.mk
ni/com_android_server_hdmi_HdmiCecController.cpp
ni/onload.cpp
12e75126909152c448f70c48f3d2f2884cb359bd 25-Apr-2014 Christopher Tate <ctate@google.com> Merge "Fix native-lib dir assignment & updating"
67b082e02cbfb7bafe046a619e686e9a5c1abc05 25-Apr-2014 Winson Chung <winsonc@google.com> Merge "Enabling doc centric recents on phones."
be46532c9fbebf3ab6498c1b78013a33f620cd31 24-Apr-2014 Amith Yamasani <yamasani@google.com> Allow profile owners to set user restrictions

Pass the setting along to UserManager.

Fixes a security exception when fetching the profile's enabled state.

Change-Id: If71698cf32c52cce1158cf2027443a339bc58488
ava/com/android/server/pm/UserManagerService.java
ffcda1086185f217ebfbac0735f92fcc8a9196c8 24-Apr-2014 Dianne Hackborn <hackbod@google.com> Add support for muliple active development codenames.

The resource API level is also bumped by the number of
active codenames there are.

Change-Id: Ic1bac452d5c13dc3f48040ffa47f54b28abe2ccc
ava/com/android/server/pm/PackageManagerService.java
353e39a973dbbadce82fee2f83ad194e04a47449 24-Apr-2014 Christopher Tate <ctate@google.com> Fix native-lib dir assignment & updating

The per-package /system/lib/* feature introduced bugs in the
native library path handling during app upgrade installs. The
crux of the fix is that when recalulating the desired native
library directory, the basis for the calculation needs to be
the scanned APK's location rather than the extant package
settings entry -- because that entry refers to the pre-upgrade
state of the application, not the new state.

Bug 14233983

Change-Id: I76c3249c72ecc055115d430529d386599e52ae42
ava/com/android/server/pm/PackageManagerService.java
97efc15b32b61a5deb1f54c6c08844b788785c39 24-Apr-2014 Kenny Root <kroot@google.com> Merge "PackageManager: remove GET_CERTIFICATES boolean"
07c79fcc7f2538e849a3f9961abb81df72b8d0a4 24-Apr-2014 Kenny Root <kroot@google.com> PackageManager: remove GET_CERTIFICATES boolean

This is a really old debugging flag that is not useful and also
dangerous.

Change-Id: I3badb5e361a8fe8458a355bf7d9ab055cb1b57d5
ava/com/android/server/pm/PackageManagerService.java
806047caca937d8e3d067b5fb6d5264fd3731904 24-Apr-2014 Dianne Hackborn <hackbod@google.com> Merge "Start collecting mobile radio activity from the radio."
2ffa11e4b71c545e34533ef827bdc1a07fbe8246 22-Apr-2014 Dianne Hackborn <hackbod@google.com> Start collecting mobile radio activity from the radio.

Hook in to the new radio API to find out when the radio
is active and use that to track its state in batter stats.
We also still have the data being tracked from the kernel's
emulation, and continue to use that if we don't get data from
the radio.

Currently this monitoring is turned off until some issues
in the radio can be fixed that are providing bad data.

Also add a new API to get estimated drain and charge times.

Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
ava/com/android/server/NativeDaemonConnector.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/TelephonyRegistry.java
ava/com/android/server/am/BatteryStatsService.java
5e6e27edb7d59255d07e2f74dac74e5898cf949b 24-Apr-2014 Craig Mautner <cmautner@google.com> Merge "Take screenshots of pausing activity"
f6ead5d62e62ff9a466bd4cbbea77390ce00605b 24-Apr-2014 Craig Mautner <cmautner@google.com> Take screenshots of pausing activity

Previous CL to optimize out excessive screenshots (ag/379669) was too
effective and didn't take screenshots when going into an activity
that had attribute Window_windowNoDisplay. Adding in the test for
ActivityRecord.noDisplay allows screenshots for this situation.

Fixes bug 13410507.

Change-Id: Ieafebf44b7d1a3ba18115e762fba113f8d1c0252
ava/com/android/server/am/ActivityStack.java
83474f5b4d870c12d39cef5ae28b7e3fb6d6a765 24-Apr-2014 Michael Kolb <kolby@google.com> am 0fc5f869: am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev

* commit '0fc5f86950f6089eb8b4cbc0bf9684b8be090fa3':
Use rotation to position circular display mask
0fc5f86950f6089eb8b4cbc0bf9684b8be090fa3 24-Apr-2014 Michael Kolb <kolby@google.com> am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev

* commit 'e597d5f9310f760843272c728d6fb1917abf241a':
Use rotation to position circular display mask
e597d5f9310f760843272c728d6fb1917abf241a 24-Apr-2014 Michael Kolb <kolby@google.com> Merge "Use rotation to position circular display mask" into klp-modular-dev
8b275ca9d34792ba525771e0c1865b3262e569c9 24-Apr-2014 Michael Kolb <kolby@google.com> Use rotation to position circular display mask

Bug: 14231785

Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc
ava/com/android/server/wm/CircularDisplayMask.java
ava/com/android/server/wm/WindowManagerService.java
1c299031982b6145e372aa43a3b8a5c683fad3da 24-Apr-2014 Kenny Guy <kennyguy@google.com> Merge "Fix bug with getLauncherActivities ignoring packageName."
6c66d1fd79968ad286d3cb6477e762d7e8bdc5ec 24-Apr-2014 Craig Mautner <cmautner@google.com> am 7e28afd9: am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev

* commit '7e28afd9568c590c7110f83b252dbb77f165fcb3':
Force ActivityView activities to start in new task
75731016e9231cc867e99a3d9269fc16c8f3f606 24-Apr-2014 Craig Mautner <cmautner@google.com> Add test for attribute android:allowEmbedded

Throw a SecurityException if it is not true for an activity launched
using ActivityContainer.startActivity().

Change-Id: Id1d70e630195a49a3eccdc64a0beccc420400332
ava/com/android/server/am/ActivityStackSupervisor.java
e255d7399f46de4b4e3d94b95b26df3408274394 24-Apr-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Modify getUserProfiles to return only enabled profiles:"
10459a541171357a18ee897ffcfed0150600fb16 24-Apr-2014 John Spurlock <jspurlock@google.com> Merge "Move notification listener management into helper."
1a4e0b998030bb86196559947f417ee6fe117644 23-Apr-2014 Kenny Guy <kennyguy@google.com> Fix bug with getLauncherActivities ignoring packageName.

Change-Id: Ica5817378a24cb4b68e2c99e37cd214d3fde8ba4
ava/com/android/server/pm/LauncherAppsService.java
7e28afd9568c590c7110f83b252dbb77f165fcb3 24-Apr-2014 Craig Mautner <cmautner@google.com> am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev

* commit '7d2d2272f1dc91f27983797349f8253bfa25e8b4':
Force ActivityView activities to start in new task
385124d8cee38dee00d4fac31e8fbe46fb30565b 03-Apr-2014 Alexandra Gherghina <alexgherghina@google.com> Modify getUserProfiles to return only enabled profiles:

Add a new enabled state for a managed profile.
Expose that as a new API on DevicePolicyManager.
Set the new state when enabling the profile.
Return only enabled profiles from the user manager.

Bug: 13755441
Bug: 13755091
Change-Id: I2907b182e19b3562592da688b3f68ef5f4088557
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/pm/UserManagerService.java
b408e8ecd22853faa70e97d0596aac9e7dcf5596 24-Apr-2014 John Spurlock <jspurlock@google.com> Move notification listener management into helper.

Part of a larger effort to reuse service management code. This is
mostly algebraic, simply move code related to listener management
into a new helper, and cut the backreference to NoMan. Put
user-profile code into reusable inner helper, and common uid-checking
code into a new static util helper.

Resist the urge to rewrite / reformat, but replace HashSet with
ArraySet.

Bug:13743109
Change-Id: I59e0131f632c3bbf555b5276dc5092422113cdc3
ava/com/android/server/notification/NotificationListeners.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationUtil.java
1b244f44a796484866f13e0639420477c3191695 23-Apr-2014 Winson Chung <winsonc@google.com> Merge "Piping through ability for an Activity to remove its own task. (Bug 13735914)"
3b3f464445d1d369c8e87f526deba606ca62f76c 22-Apr-2014 Winson Chung <winsonc@google.com> Piping through ability for an Activity to remove its own task. (Bug 13735914)

Change-Id: Iefcd4fbe68748195de8ee37ee2b6edef55276603
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/TaskRecord.java
7f7bdb2712d4988efa5e914c0b54271752b49407 23-Apr-2014 Craig Mautner <cmautner@google.com> Force ActivityView activities to start in new task

Activities were associating with existing tasks when their
components matched. This was causing them to be launched
into existing stacks rather than into their ActivityView. Adding
these flags forces the launches to be in unique tasks on their
ActivityView.

Fixes bug 14252286.

Change-Id: I9ba65a4a2da198435748c0a17396d3f7f8c75f5e
ava/com/android/server/am/ActivityStackSupervisor.java
8a0fa6e823ddbdfd17869d52f838b1cc0a46bd2b 23-Apr-2014 Emily Bernier <ember@google.com> Merge "Allow device or profile owner app to modify user restrictions."
7a2b4d11c741de8b78570c0e11f49deb165e35da 23-Apr-2014 Emily Bernier <ember@google.com> Allow device or profile owner app to modify user restrictions.

Currently this is gated on being a system or root app with the
MANAGE_USERS permission; third-party MDM apps set as device or profile
owner should have this ability as well.

Bug: 13585295

Change-Id: I61d21b13b9ec66fc0cb497ec2007ee732461d448
ava/com/android/server/pm/UserManagerService.java
ceb5d17f6a2f5c144948ada1d59ec4f12da64799 23-Apr-2014 Neil Fuller <nfuller@google.com> am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"

* commit 'd720ef541d06be87de3b3e03c1e7fb349299a21f':
Changes to support asynchronous close interruption
d720ef541d06be87de3b3e03c1e7fb349299a21f 23-Apr-2014 Neil Fuller <nfuller@google.com> am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"

* commit 'caf6497b9a0347da7d5acbe678adc2c8187176c0':
Changes to support asynchronous close interruption
21de56a94668e0fda1b8bb4ee4f99a09b40d28fd 06-Apr-2014 Jeff Sharkey <jsharkey@android.com> Add directory selection to DocumentsProvider.

Introduce new ACTION_PICK_DIRECTORY that allows users to grant access
to an entire document subtree. Instead of requiring grants for each
individual document, this leverages new prefix URI permission grants
by defining new "via"-style URIs:

content://com.example/via/12/document/24/

This references document 24 by using a prefix grant given for
document 12. Internally, we use isChildDocument() to enforce that
24 is actually a descendant (child, grandchild, etc) of 12. Since
this is an optional API, providers indicate support with
Root.FLAG_SUPPORTS_DIR_SELECTION.

Extend DocumentsUI to support picking directories. Expose
createDocument() API to work with returned directories.

Offer to canonicalize via-style URIs into direct URIs, generating
exact permission grants along the way. Override openAssetFile()
to pass through CancellationSignal. Move testing code into ApiDemos.

Bug: 10607375
Change-Id: Ifffc1cff878870f8152eb6ca0199c5d014b9cb07
ava/com/android/server/am/ActivityManagerService.java
846318a3250fa95f47a9decfbffb05a31dbd0006 04-Apr-2014 Jeff Sharkey <jsharkey@android.com> Allow prefix-based Uri permission grants.

Define new FLAG_GRANT_PREFIX_URI_PERMISSION which indicates that a
Uri permission grant should also apply to any other Uris that have
matching scheme, authority, and path segments. For example, a prefix
grant for /foo/ would allow /foo/bar/ but not /foo2/.

Allow persistable and prefix grants to be issued directly through
grantUriPermission(). Relaxing persistable is fine, since it still
requires the receiver to actively take the permission.

Since exact- and prefix-match grants for the same Uri can coexist,
we track them separately using a new UriGrant key. (Consider the
case where an app separately extends READ|PREFIX and WRITE for
the same Uri: we can't let that become READ|WRITE|PREFIX.)

Fix revoke to always take away persisted permissions. Move prefix
matching logic to Uri and add tests. Add new flags to "am" tool, and
various internal uses around Intent and Context. Switch some lagging
users to ArraySet.

Bug: 10607375
Change-Id: Ia8ce2b88421ff9f2fe5a979a27a026fc445d46f1
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ServiceRecord.java
ava/com/android/server/am/UriPermission.java
ava/com/android/server/am/UriPermissionOwner.java
caeaa375946f251bea59f79f3ba73104e3f4634d 23-Apr-2014 Jeff Brown <jeffbrown@google.com> am 62271b95: am 3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev

* commit '62271b95222c5d67868ac1b3bbd8851d4fa18454':
Fix HDMI hotplug display blanking behavior.
62271b95222c5d67868ac1b3bbd8851d4fa18454 23-Apr-2014 Jeff Brown <jeffbrown@google.com> am 3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev

* commit '3af392674969b17cd3719f49ae597c7dc6ee6614':
Fix HDMI hotplug display blanking behavior.
3af392674969b17cd3719f49ae597c7dc6ee6614 23-Apr-2014 Jeff Brown <jeffbrown@google.com> Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
44b1f76474218349c9327da9fe482e19aad98795 23-Apr-2014 Jeff Brown <jeffbrown@google.com> Fix HDMI hotplug display blanking behavior.

Bug: 14109146
Change-Id: Ie7de4fb05da210e8c74c795f7896cf9951701aeb
ava/com/android/server/display/LocalDisplayAdapter.java
96997a6148161e525a91f9d04f6468fbe01c2d69 23-Apr-2014 Ying Wang <wangying@google.com> am d12bf275: am d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev

* commit 'd12bf27575bc2df114abc0aadd1a62ff476b5a42':
Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
d12bf27575bc2df114abc0aadd1a62ff476b5a42 23-Apr-2014 Ying Wang <wangying@google.com> am d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev

* commit 'd0dc898119fc43de89ff41e39d37961dacab4eaa':
Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
b081a59a0fdec88dd9b0f68b45c2f625f751d625 23-Apr-2014 Ying Wang <wangying@google.com> Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name

It looks like a Javac bug.

Bug: 14255510
Change-Id: Id3899994226049ff77854fd2a13a6d1b687a0392
ava/com/android/server/am/ActivityStackSupervisor.java
9a492393dfb69050b2a4a8b5205e8d2fc24fcd43 22-Apr-2014 Nick Kralevich <nnk@google.com> am 5246f459: am d267c1a0: Merge "remove unneeded import statements."

* commit '5246f4599a0c9978012ffb1049307704b5027a0b':
remove unneeded import statements.
d236d625b4a4e938629fbcc55687ca7bebaab6e8 22-Apr-2014 Nick Kralevich <nnk@google.com> am 3ab7882a: am a67d4a6e: Merge "remove unused import."

* commit '3ab7882a57d3c7a0e13f58837cd02138df43f301':
remove unused import.
62b8a49856cc0822905dcb7a213f082b92fa69e3 18-Apr-2014 Ruchi Kandoi <kandoiruchi@google.com> Adds Content Observer for the Low power mode in developer options.

Change-Id: Ibed319e734340dfd5348dbeb8fe20c01b1adaac5
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
ava/com/android/server/power/PowerManagerService.java
87e7ba4f45d633e4ce7ac91539534bb8f6d5247f 22-Apr-2014 Ji-Hwan Lee <jihwan@google.com> Merge "Add config resource to add inital mock location providers"
860107a2cced79f4a19542bfd19676367951ee49 22-Apr-2014 John Spurlock <jspurlock@google.com> Merge "Do not disturb: persist user config."
056c519df1dfb8fdc57daddfdf09bc0e1ffddac4 21-Apr-2014 John Spurlock <jspurlock@google.com> Do not disturb: persist user config.

Load and store user configuration for do not disturb. Separate
out service-related aspects into new helper. Make config availble
over NoMan for settings.

Implement phone + message based filtering (package whitelist for now).

Implement automatic enter/exit zen mode overnight scheduler.

Bug:14211946
Change-Id: Ib28aab0e4c5c9a5fd0b950b2884b1ab618fdfeca
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/ZenModeHelper.java
6c83b77b87a1f8b247874c9544d4975d13da7d23 22-Apr-2014 Craig Mautner <cmautner@google.com> am 43c6a98f: am 6985badc: Fix black ActivityView

* commit '43c6a98f0ffe079429735a485acaa81841740fac':
Fix black ActivityView
7ad27288f1b66733a4fcb2bdcb17dd5db6c6423d 22-Apr-2014 Craig Mautner <cmautner@google.com> am c00c89b1: am f4c909bc: Fix ActivityView lifecycle

* commit 'c00c89b1add5bcbf6a76287c9a3384877449c746':
Fix ActivityView lifecycle
43c6a98f0ffe079429735a485acaa81841740fac 22-Apr-2014 Craig Mautner <cmautner@google.com> am 6985badc: Fix black ActivityView

* commit '6985badc632f2ff8425aa86423577a96eafc49e9':
Fix black ActivityView
c00c89b1add5bcbf6a76287c9a3384877449c746 22-Apr-2014 Craig Mautner <cmautner@google.com> am f4c909bc: Fix ActivityView lifecycle

* commit 'f4c909bcb87d6f103c9f9e8255fa61bd86f4de67':
Fix ActivityView lifecycle
6b2c07cb3655b0f98990961e15c2b6077aaad5ca 22-Apr-2014 Youngsang Cho <youngsang@google.com> Merge "Add overlay view in Tv Input Framework"
2ca3962bc0168d360cf9567a313608347da51944 22-Apr-2014 Jeff Davidson <jpd@google.com> Merge "Initial implementation of NetworkScoreManager's backing service."
6a4b220f1263d95fdefe6361c2bc87bbb04bbed0 17-Apr-2014 Jeff Davidson <jpd@google.com> Initial implementation of NetworkScoreManager's backing service.

This service will ultimately be responsible for propagating scores
down to lower-level network subsystems. For now, it just keeps scores
in memory and exposes these for debugging purposes via "adb shell
dumpsys network_score".

This change also adds provisioning of a default scorer. When
NetworkScoreService is first initialized, it checks to see if it has
ever set a default scorer; if not, it reads a package name from a
build config property and attempts to set it as the default.

Also add autogenerated equals/hashCode methods to all parcelables.

Bug: 14111427
Bug: 13786258
Change-Id: I02271171653d42e12acd240b73b9e23950744f6b
ava/com/android/server/NetworkScoreService.java
6985badc632f2ff8425aa86423577a96eafc49e9 22-Apr-2014 Craig Mautner <cmautner@google.com> Fix black ActivityView

Don't add the surface to the VirtualDisplay until the activity
has drawn. That will keep the TextureView from turning black.

Fixes bug 12821632.

Change-Id: Ia06e9f91be3e14ad724f735ae4e201ac798863a2
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
f4c909bcb87d6f103c9f9e8255fa61bd86f4de67 18-Apr-2014 Craig Mautner <cmautner@google.com> Fix ActivityView lifecycle

Major changes to maintain the VirtualDisplay across repeated
attach/detach cycles of an ActivityView. This keeps the activities
and VirtualDisplays in the ActivityView from getting into bad states.

Fixes bug 14107002.

Change-Id: Idc2aaf85ac496eab0eeb436736cb10a2020040e8
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
3a025393b50658b988411fbbb7435f8f87a4e16e 22-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Make sure events handled on same looper"
2c9f5475beabcc1c71d88b7c88d6029c3245be65 21-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Make sure events handled on same looper

Two handlers are used to call a function, but the init was not forcing them on the
same looper/thread, so we could get synchronization problems as a result.

Moved to a single looper.

Also added finally clauses to clean up if a broadcast throws an uncaught exception.

bug:13399768
Change-Id: I0044e2442335ee45a15588f910064e848cf6ac55
ava/com/android/server/NetworkManagementService.java
f9f2314aa444e32b93caecd06cb4f10a71a2df39 21-Apr-2014 Winson Chung <winsonc@google.com> Enabling doc centric recents on phones.

Change-Id: If853cdcbf3fc75001060e522bce2e0d49d2ddea3
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/wm/AppTransition.java
ava/com/android/server/wm/WindowManagerService.java
95c950825f02e937711fbcbff63f614a91cb1443 21-Apr-2014 Colin Cross <ccross@android.com> Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG"
26bdb8fb6c006ba06bcf8c9f06d56d8894cc9783 21-Apr-2014 Ji-Hwan Lee <jihwan@google.com> Add config resource to add inital mock location providers

So that we can provide mock location providers, e.g., in emulator build.

Change-Id: Ia8fe0925abc2faa4999ef17e386d7f3f8b13a0dc
ava/com/android/server/LocationManagerService.java
cbafd1b3ead132f4b17d367ed8cdae7c16edc2e7 20-Apr-2014 Jinsuk Kim <jinsukkim@google.com> Move logical address allocation logic into native service from HAL

Logical address logic is independent from hardware, and the algorithm is
standardized in the spec. Moved the logic to service so that all HAL
implementations doesn't have to duplicated logic inside.

Related change in HAL definition is in:
https://googleplex-android-review.git.corp.google.com/#/c/447951/

Change-Id: I9699309719f3214fc2dbdf219faad484c0c1c5bf
ni/com_android_server_hdmi_HdmiCecService.cpp
740888f62eae158d5775be716620f0d56d87f587 18-Apr-2014 Christopher Tate <ctate@google.com> Handle /oem and /vendor as well

Bug 13170859

Change-Id: I95dec4cd68e3d64517d08b3f08eefb849ce37b86
ava/com/android/server/pm/PackageManagerService.java
431614cb6b2170fc715757dc6f964fdbb140ee7d 18-Apr-2014 Colin Cross <ccross@android.com> BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG

Instead of requiring the kernel to join last_kmsg and the reboot
reason together, allow both to be passed to userspace and have
userspace combine them the way the log parsers want them.

Existing devices with no ro.boot.bootreason property and kernel
support for putting the reason in last_kmsg will continue to
use the kernel's formatting.

Bug: 13813279
Change-Id: I079b0107feb1533c6a54044ca6a114741127dfbc
ava/com/android/server/BootReceiver.java
9a22f0f0a631849d9c622c642d3ab0395f77584b 09-Apr-2014 Youngsang Cho <youngsang@google.com> Add overlay view in Tv Input Framework

A TvInputService app developers sometimes want to draw UI above a surface
playing TV. For this purpose, we add a window in TIS and allow developers to
attach their customized view on the TV surface.

Change-Id: I65c3dffa17580b8d4c42fac58bbfc8dad338c185
ava/com/android/server/tv/TvInputManagerService.java
0153487d01e4921a7e3dc42c2fd68642622dd6f6 18-Apr-2014 Christopher Tate <ctate@google.com> Merge "Support per-package lib dirs for bundled apps"
addfbdc09ccf258395db8bfc510989a4c583f7ab 11-Apr-2014 Christopher Tate <ctate@google.com> Support per-package lib dirs for bundled apps

Bundled apps can now use /system/lib/apkname or /system/lib64/apkname
in addition to the (globally shared) /system/lib and /system/lib64
directories. Note that when an app is updated post hoc the update APK
will look to its normal library install directory in
/data/data/[packagename]/lib, so such updates must include *all*
needed libraries -- the private /system/lib/apkname dir will not be in
the path following such an update.

"apkname" here is the base name of the physical APK that holds the
package's code. For example, if a 32-bit package is resident on disk
as /system/priv-app/SettingsProvider.apk then its app-specific lib
directory will be /system/lib/SettingsProvider

Bug 13170859

Change-Id: Ic44cc75312f33d2f5d402a1c261b2eca3fe8badc
ava/com/android/server/pm/PackageManagerService.java
aaea4d3a4822a380831084a779f52a8e767ce402 18-Apr-2014 Jeff Brown <jeffbrown@google.com> am 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev

* commit '18a69b936afa6bdb8c65b6b582989c4dcdac45ee':
Add support for dynamically setting the virtual display surface.
0a57a1112ff45507ef6361aabf42c97460405f47 18-Apr-2014 RoboErik <epastern@google.com> Merge "Add RouteProviders to the new Media APIs"
07c7077c54717dbbf2c401ea32d00fa6df6d77c6 20-Mar-2014 RoboErik <epastern@google.com> Add RouteProviders to the new Media APIs

Compiles and works with OneMedia. This currently is a rough test of
the system for finding, connecting to, and sending messages to routes.
This will just connect to the first route it finds when a request to
open the route picker is made (and disconnect when another request is
made).

Change-Id: I5de5521a079471b9e02664be4654c0591dfd9a6d
ava/com/android/server/media/MediaRouteProviderProxy.java
ava/com/android/server/media/MediaRouteProviderWatcher.java
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
ava/com/android/server/media/RouteConnectionRecord.java
18a69b936afa6bdb8c65b6b582989c4dcdac45ee 17-Apr-2014 Jeff Brown <jeffbrown@google.com> am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev

* commit '8e1e40066bae030d6a6e8f3f3f8f69ccd6ec1848':
Add support for dynamically setting the virtual display surface.
e8ee7835410f531808d5e60eeacf922ae41aa0d9 17-Apr-2014 Ji-Hwan Lee <jihwan@google.com> Merge "Minor fix to remove verbose logcat output in SyncStorageEngine"
66e5d96cf9e689148b202787bdc269519c4b6f8f 09-Apr-2014 Robin Lee <rgl@google.com> Allow ProfileOwner apps to manage app restrictions

Simple wrapper around the UserManager.{get|set}ApplicationRestrictions
APIs. Also added a new Intent to signal to running apps that the set
of restrictions has changed since startup.

Change-Id: Ifd108108a73f87325b499d9de2e1b2aacc59b264
ava/com/android/server/pm/UserManagerService.java
886113dfca52d5ee92376fc50eaaee9d0bab3b09 17-Apr-2014 Ji-Hwan Lee <jihwan@google.com> Minor fix to remove verbose logcat output in SyncStorageEngine

Change-Id: I93b936202a99338329e73a41d4c1651369ecb70f
ava/com/android/server/content/SyncStorageEngine.java
33ac0dfc9f9480b71aa45436807682219e3e160b 17-Apr-2014 Sungsoo Lim <sungsoo@google.com> Merge "Replace sessionStateMap with sessionTokens."
7de5e234715a3baa8905afa3dd0c5009af64541f 12-Apr-2014 Sungsoo Lim <sungsoo@google.com> Replace sessionStateMap with sessionTokens.

Change-Id: I6ec3390ca31cd17da35f0b0b83b1b09600d7d6d1
ava/com/android/server/tv/TvInputManagerService.java
92207df753c27b094e9e0ca80d41bc0d54dc6bd5 16-Apr-2014 Jeff Brown <jeffbrown@google.com> Add support for dynamically setting the virtual display surface.

Previously, the surface that backs a virtual display had to be set
at the time when the display was created. This change now makes
it possible to set or remove the surface later. The virtual display
is treated as if it were "off" while no surface is attached to it.

Change-Id: Ib4fdbbb8b4ee79f0fb9ceb648f9bda4a8fa6a2ca
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/VirtualDisplayAdapter.java
934ef05799532b75d349338c4300671cec1ab162 16-Apr-2014 Craig Mautner <cmautner@google.com> am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev

* commit '4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675':
Fix ActivityContainer callback parcelling.
4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675 16-Apr-2014 Craig Mautner <cmautner@google.com> am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev

* commit '2fd3cb9544df1e09caa725a8d542cf2fe1df0c75':
Fix ActivityContainer callback parcelling.
e3a00d745fad479f560e96cec23e957f37d1c043 16-Apr-2014 Craig Mautner <cmautner@google.com> Fix ActivityContainer callback parcelling.

The Binder interface for passing a callback was not implemented
properly. Also the callback for ActivityContainer now has a new
API.

Change-Id: I6b719be0cb57542f022a3cc14e8f4efde60b1a50
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
8d966e4243f7729d76f298ad1e06ef40ec4ee40f 16-Apr-2014 Wink Saville <wink@google.com> Merge "Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event"
d67d073b9fd110e6b9dfa6af11e8655dcc69f6ef 16-Apr-2014 Christoph Studer <chstuder@google.com> Merge "Rename basePkg to opPkg"
fe08369d8cd575f1f1db38f57be4c2a960f4a856 16-Apr-2014 Winson Chung <winsonc@google.com> Merge "Fixing the alternate recents transition on landscape views."
2820c4523cd37b4a9c5d33e558d39b798830e7e5 16-Apr-2014 Winson Chung <winsonc@google.com> Fixing the alternate recents transition on landscape views.

- This still assumes that we are taking square thumbnails.

Change-Id: I42a3d1b0505db57f815edf52cd176a3f651d5b37
ava/com/android/server/wm/AppTransition.java
ava/com/android/server/wm/WindowManagerService.java
8fd7f1ed7c11d35b3f2a97878e68ee38a551dd15 11-Apr-2014 Christoph Studer <chstuder@google.com> Rename basePkg to opPkg

...and actually populate the field correctly.

Change-Id: I3ce52efedb919d6af75dc9c3532e47764c467cac
ava/com/android/server/VibratorService.java
ava/com/android/server/notification/NotificationManagerService.java
92b389da2a60ac51e804031494fea177fc1c47be 01-Apr-2014 Christoph Studer <chstuder@google.com> Write eventlog entries for notification visibility

Keep track of notifications shown in the notification panel
and log them via eventlog.

Added the following eventlog tag:
* notification_visibility_changed

Bug: 13442201
Change-Id: Ifb74ec2492967dc787b4de86db7d7f00be6c7f74
ava/com/android/server/EventLogTags.logtags
ava/com/android/server/notification/NotificationDelegate.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerService.java
fd5b72f1ed2ee74a4204eef65f560fc82f0b62fe 15-Apr-2014 Dongwon Kang <dwkang@google.com> Handle the failure of session creation request in TvInputManagerService.

Bug: 14073508
Change-Id: Idc9da323bb0000300faf662c7db031214ae6136c
ava/com/android/server/tv/TvInputManagerService.java
070e061a289d771e62b58379eaed153fd285b04f 16-Apr-2014 Wink Saville <wink@google.com> Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event

Also added DataConnectionRealTimeInfo structure which passed as a
parameter to onDataConnectionRealTimeInfoChanged.

Change-Id: Iadcbf9765af57c125bcdf74e3fc652ed6c8f7d42
ava/com/android/server/TelephonyRegistry.java
771cd657acc37b50bafe18bf5f649d3c1d85b3d8 15-Apr-2014 Christopher Lane <lanechr@google.com> Fix build

Change-Id: I20168fb1c29ba6eb695f0d24c6ca512420b2b319
ava/com/android/server/NsdService.java
111db01a2668b7a1ec256a4166c322db061d1ddd 15-Apr-2014 Christopher Lane <lanechr@google.com> resolved conflicts for merge of 381ac080 to master

Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21
381ac080547ef8294edd871c5bb0b29d15f7158b 14-Apr-2014 Christopher Lane <lanechr@google.com> am 62538940: Merge "Add support for custom TXT records in NSD" into klp-modular-dev

* commit '62538940de1755c71c56b0e5d81e12397e5de58a':
Add support for custom TXT records in NSD
b72d8b4091ab31948c91b0382a9b46afdc7ef7da 18-Mar-2014 Christopher Lane <lanechr@google.com> Add support for custom TXT records in NSD

Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
ava/com/android/server/NsdService.java
352e108259bcb3305f034cfb042287d43a5e8f80 14-Apr-2014 Dan Sandler <dsandler@android.com> Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"
15b0bef9250e084bfbceb388716d28ed62ca018f 12-Apr-2014 Jeff Brown <jeffbrown@google.com> am 9e2fde9c: am d912e1f6: Use the display\'s actual state in the view hierarchy.

* commit '9e2fde9c8a3557d6e8d1f3971a421ecdf5c2ce07':
Use the display's actual state in the view hierarchy.
9e2fde9c8a3557d6e8d1f3971a421ecdf5c2ce07 12-Apr-2014 Jeff Brown <jeffbrown@google.com> am d912e1f6: Use the display\'s actual state in the view hierarchy.

* commit 'd912e1f6a111fb33118d116bd72da1a328041bca':
Use the display's actual state in the view hierarchy.
d912e1f6a111fb33118d116bd72da1a328041bca 12-Apr-2014 Jeff Brown <jeffbrown@google.com> Use the display's actual state in the view hierarchy.

Previously, the view hierarchy would suppress drawing whenever the
PowerManager.isScreenOn() method returned false. However, this method
really describes the interactive state of the device rather than the
actual display state. This is especially a problem when there are
multiple displays but it also breaks drawing while in doze mode.

This change makes the view hierarchy consider the actual state of the
display instead on an individual basis.

Bug: 13133142
Change-Id: I69870b6b14a3504607a30562aa48c3452f777c1f
ava/com/android/server/wm/WindowManagerService.java
aa77b11bdbf4b86b9ed27c6c36c997fe26639f87 11-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am 4bdcd299: am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev

* commit '4bdcd299da48f9abe5f9c67abed0dbe79080445d':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
4bdcd299da48f9abe5f9c67abed0dbe79080445d 11-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev

* commit '55dab4dd3b5b56ade91c012d688b581b6cbdebdf':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
55dab4dd3b5b56ade91c012d688b581b6cbdebdf 11-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev

* commit 'b11f250e09195d1ab250c93bfed0b31ed3a40f3d':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
b11f250e09195d1ab250c93bfed0b31ed3a40f3d 11-Apr-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
61791075f4422cfef00fda325d6ae07293dd262f 07-Apr-2014 Jinsuk Kim <jinsukkim@google.com> Delegate HdmiCecService method impl to HdmiCecDevice subclass

Most of the methods in the interface IHdmiCecService should be implemented
based on the device type. This CL makes a change such that the HdmiCecDevice
just has stub methods that should be overriden by subclasses.

Other changes:
- Fixed a bug of <Inactive Source> not sending its physical address
in its message body. Also the command should have been sent to TV
only rather than broadcast.

- Put back sendGiveDevicePowerStatus interface method. It allows the client
to keep track of the other device(like TV) power status more closely.
Devices goes through the status from standby -> transient to on -> on
but the CEC spec doesn't require that they broacast it actively.

The restored method can be used to let the playback device to get
up-to-date power status of TV/display when it is booting up.

This method should work the same across all the device types. So it was
implemented in the service, not delegated to HdmiCecDevice.

- Send <Report Physical Address> when a new logical device is registered,
which is required by CEC spec: "it should report the association between
its logical and physical address by broadcasting <Report Physical
Address>

Change-Id: Iac1d2cf5783d947f2dcd6965a54670fbdb8e6a63
ava/com/android/server/hdmi/HdmiCecDevice.java
ava/com/android/server/hdmi/HdmiCecDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecService.java
ni/com_android_server_hdmi_HdmiCecService.cpp
861aa0073ae3adc76ef0c313f39e9a0ff6b63197 11-Apr-2014 Jeff Brown <jeffbrown@google.com> am 26c6a50f: Rename isScreenOn() to isInteractive().

* commit '26c6a50f037c6af9c41b3f96269fe194748605ce':
Rename isScreenOn() to isInteractive().
26c6a50f037c6af9c41b3f96269fe194748605ce 11-Apr-2014 Jeff Brown <jeffbrown@google.com> Rename isScreenOn() to isInteractive().

Fix build break due to an earlier merge.

Change-Id: I6e6583b251da9e027a4ade45cb4bb77e9d4ee624
ava/com/android/server/display/DisplayPowerController.java
858737d08d9a2db7ef230a17975cd4ded709c3c5 11-Apr-2014 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 4e5c089e to master-lockscreen-dev

Change-Id: I456ff6be1e39b65f3e0efeb7fb1924e71d11f6b1
4e5c089ef3e62e7f658e71c0be262d09bd3e399b 11-Apr-2014 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 337e764d to master

Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
337e764debde56b1462fb5f2794b3e917d8a42e2 11-Apr-2014 Jeff Brown <jeffbrown@google.com> am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev

* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
Plumb display power state through display manager.
f24687e2731811fd0e3803b691fd47a659f89329 11-Apr-2014 Jeff Brown <jeffbrown@google.com> Merge "Plumb display power state through display manager." into klp-modular-dev
037c33eae74bee2774897d969d48947f9abe254f 09-Apr-2014 Jeff Brown <jeffbrown@google.com> Plumb display power state through display manager.

Declare a new method, Display.getState() to retrieve the actual
power state of a display.

Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.

Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.

Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.

Eliminated the bright here and woke here policy flags since they
were unused. Simplified the input dispatch policy somewhat.

Ensure that screen wake locks are respected up until the point
when dozing really begins.

Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.

Bug: 13133142
Bug: 13472578
Bug: 13929355
Bug: 13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
ava/com/android/server/display/DisplayBlanker.java
ava/com/android/server/display/DisplayDevice.java
ava/com/android/server/display/DisplayDeviceInfo.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/display/DisplayPowerState.java
ava/com/android/server/display/ElectronBeam.java
ava/com/android/server/display/LocalDisplayAdapter.java
ava/com/android/server/display/LogicalDisplay.java
ava/com/android/server/display/OverlayDisplayAdapter.java
ava/com/android/server/display/OverlayDisplayWindow.java
ava/com/android/server/input/InputManagerService.java
ava/com/android/server/net/NetworkPolicyManagerService.java
ava/com/android/server/power/Notifier.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/wm/InputMonitor.java
ni/com_android_server_input_InputManagerService.cpp
ni/com_android_server_power_PowerManagerService.cpp
ni/com_android_server_power_PowerManagerService.h
dd137a85d3e0295989b5b9d1f67ff32027be867d 10-Apr-2014 Svetoslav <svetoslavganov@google.com> resolved conflicts for merge of 6be2f952 to master-lockscreen-dev

Conflicts:
core/java/android/view/IWindowManager.aidl
tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
6be2f95202237b7284542e692273d13a5bd26913 10-Apr-2014 Svetoslav <svetoslavganov@google.com> Merge "Adding render stats APIs to UiAutomation (framework)."
17f2fdd018ba8bae9b8df37e742f98fde25b5103 10-Apr-2014 Paul Lawrence <paullawrence@google.com> am 9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection"

* commit '9502f990899ef576879048ec5147d403158ad89d':
Allow encryption when keyguard is set to pattern or no protection
9502f990899ef576879048ec5147d403158ad89d 10-Apr-2014 Paul Lawrence <paullawrence@google.com> Merge "Allow encryption when keyguard is set to pattern or no protection"
2a6599d33568def4828252d1b35d98d12e2d2b87 10-Apr-2014 Narayan Kamath <narayan@google.com> am f148f36d: am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"

* commit 'f148f36d140e995ec8f755e60bbb0b37f33c3da7':
System services detect and register app CPU ABIs
954a4666abc4758fd17af09f20e9795683fc6598 10-Apr-2014 Narayan Kamath <narayan@google.com> am d11f223c: resolved conflicts for merge of 286a247e to master

* commit 'd11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4':
Re-implement native library search and copies.
f148f36d140e995ec8f755e60bbb0b37f33c3da7 10-Apr-2014 Narayan Kamath <narayan@google.com> am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"

* commit '9e289d70a8baaed0030413b5991653792e2a816d':
System services detect and register app CPU ABIs
d11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4 10-Apr-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 286a247e to master

Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
9e289d70a8baaed0030413b5991653792e2a816d 10-Apr-2014 Narayan Kamath <narayan@google.com> am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"

* commit '1d26a3f1efd0d965e8751e8515608c31789bdbe2':
System services detect and register app CPU ABIs
286a247e4c8fcecb59636f668678d24e33142744 10-Apr-2014 Narayan Kamath <narayan@google.com> am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies."

* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
Re-implement native library search and copies.
6fdb5e6df178b3b1062ac67b505b288aa609a66b 10-Apr-2014 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp

Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded
2d55c116ee01d6b05bb046f56cd81c81f096f294 09-Apr-2014 Jae Seo <jaeseo@google.com> am b06cb887: Skip cleaning up TV service/session when the user state is not found

* commit 'b06cb8870f0407f18bb1225065a93aba2a5de2bf':
Skip cleaning up TV service/session when the user state is not found
b06cb8870f0407f18bb1225065a93aba2a5de2bf 09-Apr-2014 Jae Seo <jaeseo@google.com> Skip cleaning up TV service/session when the user state is not found

Bug: 13930813
Change-Id: I64285edaca0bd06d6f6efaeb6b5c30c2ef762902
ava/com/android/server/tv/TvInputManagerService.java
8d31358fb4f0f948fcfd07399d4247375dc5eea9 09-Apr-2014 Jesse Gunsch <gunsch@google.com> Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
a00ed7f7255b7bd9ac897166bcce03da2f05c4a7 09-Apr-2014 Narayan Kamath <narayan@google.com> am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp

* commit 'a981e3b01ae6af2b67e582f0d1cbb95560d05626':
Move certain internal activity manager methods to new class.
a981e3b01ae6af2b67e582f0d1cbb95560d05626 09-Apr-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp

Change-Id: I788ca17503e2fd225e205a76d3e7062f71d58316
5b25236a87f7c96df9feed340701092cbb92fcc2 09-Apr-2014 Sander Alewijnse <salewijnse@google.com> am c03dea76: Merge "Changed tag name and error strings for PersistentPreferredActivity storage."

* commit 'c03dea76307163b95a313ba3e887aa94ed01dc2c':
Changed tag name and error strings for PersistentPreferredActivity storage.
c03dea76307163b95a313ba3e887aa94ed01dc2c 09-Apr-2014 Sander Alewijnse <salewijnse@google.com> Merge "Changed tag name and error strings for PersistentPreferredActivity storage."
7f9599d63c892934c7f8a2e46d1e518ddb0d43df 09-Apr-2014 Jeff Brown <jeffbrown@google.com> am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev

* commit 'ea72cdf22f8efde4d3b872a60587e4b26bc93e43':
Move display power controller to display manager service. (DO NOT MERGE)
4cf85c740d6762d423b07c5e6ce4fd1cf8b04be1 09-Apr-2014 Jeff Brown <jeffbrown@google.com> am 1b03d160: Merge "Move display power controller to display manager service."

* commit '1b03d160114b1ea553f322e99ca168965daffea8':
Move display power controller to display manager service.
131206b8a9d07400d7c98aea50cc45c38769448f 09-Apr-2014 Jeff Brown <jeffbrown@google.com> Move display power controller to display manager service.

This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes. Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: I159a060088344d8e6fcdf9208a1f242960f7ab90
ava/com/android/server/display/AutomaticBrightnessController.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/display/DisplayPowerState.java
ava/com/android/server/display/ElectronBeam.java
ava/com/android/server/display/RampAnimator.java
ava/com/android/server/power/AutomaticBrightnessController.java
ava/com/android/server/power/DisplayBlanker.java
ava/com/android/server/power/DisplayPowerController.java
ava/com/android/server/power/DisplayPowerRequest.java
ava/com/android/server/power/DisplayPowerState.java
ava/com/android/server/power/ElectronBeam.java
ava/com/android/server/power/Notifier.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/power/RampAnimator.java
13014b5fe5967b3c7e232ffaf81581ed178e6df6 08-Apr-2014 Jeff Brown <jeffbrown@google.com> Move certain internal activity manager methods to new class.

This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.

Deleted the startRunning method since it is no longer useful.

Bug: 13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/power/Notifier.java
ad9ef191f50767d8d5b6f0fbd4b59bb1400dcd25 09-Apr-2014 Jeff Brown <jeffbrown@google.com> Move display power controller to display manager service. (DO NOT MERGE)

This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes. Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/DisplayPowerController.java
ava/com/android/server/display/DisplayPowerState.java
ava/com/android/server/display/ElectronBeam.java
ava/com/android/server/display/RampAnimator.java
ava/com/android/server/power/DisplayBlanker.java
ava/com/android/server/power/DisplayPowerController.java
ava/com/android/server/power/DisplayPowerRequest.java
ava/com/android/server/power/DisplayPowerState.java
ava/com/android/server/power/ElectronBeam.java
ava/com/android/server/power/Notifier.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/power/RampAnimator.java
a7d72d34afed68c9433eb7f9464c0670e5dd6c62 09-Apr-2014 Amith Yamasani <yamasani@google.com> am 5784b398: Merge "Launcher APIs and broadcasts for managed profiles"

* commit '5784b39843bd3d6112352ff3b736a6498107911c':
Launcher APIs and broadcasts for managed profiles
8e5df442cd8059e56195e23edffdfd6102a944e3 14-Mar-2014 Dave Platt <dplatt@google.com> Merge "NsdService does not clean up after exiting clients"
ava/com/android/server/NsdService.java
5784b39843bd3d6112352ff3b736a6498107911c 09-Apr-2014 Amith Yamasani <yamasani@google.com> Merge "Launcher APIs and broadcasts for managed profiles"
e0925b6c471755386f59605cd037968715d3ee1f 08-Apr-2014 Jae Seo <jaeseo@google.com> am 3957091b: Initial round of Television Input Framework

* commit '3957091ba8f08c02b5e781098cb955a5f697a1ff':
Initial round of Television Input Framework
3957091ba8f08c02b5e781098cb955a5f697a1ff 21-Feb-2014 Jae Seo <jaeseo@google.com> Initial round of Television Input Framework

This provides APIs to control and create individual television inputs on
the system which will later be hosted by television applications.

Change-Id: I6866d28e78175a1bff2c32a85c5d77e94d0cd60c
ava/com/android/server/tv/TvInputManagerService.java
af6f402d3784f5349f1b96dd48fb55a44e19924c 08-Apr-2014 Kenny Guy <kennyguy@google.com> am cfd3cd6d: Merge "Pipe notifications from related users to listeners."

* commit 'cfd3cd6df375793d714fe3b6570791e377cab1e5':
Pipe notifications from related users to listeners.
cfd3cd6df375793d714fe3b6570791e377cab1e5 08-Apr-2014 Kenny Guy <kennyguy@google.com> Merge "Pipe notifications from related users to listeners."
4f58263d02f296430a9653126d28501e95c7bb6c 19-Feb-2014 Amith Yamasani <yamasani@google.com> Launcher APIs and broadcasts for managed profiles

UserManager
- Corp badging
- Querying list of managed profiles

Launcher API
- LauncherApps and Service to proxy changes in managed profile
to the launcher in the primary profile
- Querying and launching launchable apps across profiles

Change-Id: Id8f7b4201afdfb5f414d04156d7b81300119289e
ava/com/android/server/pm/LauncherAppsService.java
ava/com/android/server/pm/UserManagerService.java
a263e4e438746f91fb78857bd569ba4f796a346d 03-Mar-2014 Kenny Guy <kennyguy@google.com> Pipe notifications from related users to listeners.

For Listeners built against L or greater
Send notifications from related users to listeners.
Return notifications from related users getAllActiveNotifications
Cancel notifications from related users in cancelAllNotifications
Deprecate StatusBarNotification.getUserId() and expose getUser()
as APIs should use UserHandles.
Deprecate cancelNotification that takes package, id and tag
in favour of one that takes key.

Fix bug that notifications from related users didn't
trigger sounds.

Change-Id: I1b1c20c9f305b8f3c4047bc5720d8e99cdedfe70
ava/com/android/server/notification/NotificationManagerService.java
cf1b3b4791aac33c5184d8998252041a08e324bc 08-Apr-2014 Yohei Yukawa <yukawa@google.com> am 59fee2d5: Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"

* commit '59fee2d5534965f0986e68e0c3562da5e65e6c45':
Allow IMEs to start/stop receiving onUpdateCursor callback
59fee2d5534965f0986e68e0c3562da5e65e6c45 08-Apr-2014 Yohei Yukawa <yukawa@google.com> Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"
1376d600d8e0eefdbc0aa11d398cf7517fc77129 13-Mar-2014 Svetoslav <svetoslavganov@google.com> Adding render stats APIs to UiAutomation (framework).

bug:12927198

Change-Id: Iae21481c75ae58dcdab3731bf5f1e2844e29d434
ava/com/android/server/wm/WindowManagerService.java
fa3653eafc8e8fb11aba2a16977610e84480a260 08-Apr-2014 George Mount <mount@google.com> am f7fbe099: Merge "Allow opaque windows to become translucent."

* commit 'f7fbe099a80a6955f7c910dbae3c6fecfc0b151a':
Allow opaque windows to become translucent.
f7fbe099a80a6955f7c910dbae3c6fecfc0b151a 08-Apr-2014 George Mount <mount@google.com> Merge "Allow opaque windows to become translucent."
89cca659f9a3ab41548afa9552c4645a44b092dc 08-Apr-2014 Craig Mautner <cmautner@google.com> am 8ea553d0: am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."

* commit '8ea553d03a84e2fc3ded507dd978fca0dee22e77':
[ActivityManager] Reduce report ANR on wrong activity.
8ea553d03a84e2fc3ded507dd978fca0dee22e77 08-Apr-2014 Craig Mautner <cmautner@google.com> am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."

* commit '8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a':
[ActivityManager] Reduce report ANR on wrong activity.
8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a 08-Apr-2014 Craig Mautner <cmautner@google.com> am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."

* commit '228cefa83dd7b95e5581f619bb597808af726f80':
[ActivityManager] Reduce report ANR on wrong activity.
9a762b3eee71882e1aa54bc9b993371d25d63f41 07-Apr-2014 Christoph Studer <chstuder@google.com> am d624a443: Merge "Write eventlog entries for notification panel visibility"

* commit 'd624a443ec5662d2bf812b6992e783bea225d36d':
Write eventlog entries for notification panel visibility
d624a443ec5662d2bf812b6992e783bea225d36d 07-Apr-2014 Christoph Studer <chstuder@google.com> Merge "Write eventlog entries for notification panel visibility"
23c6e078a5d67fd998354405752d778aee5a8673 07-Apr-2014 Christoph Studer <chstuder@google.com> am eceec528: Merge "NoManService: More efficient notification update"

* commit 'eceec52894f5713b6f772a92fedd0182eab5c6dc':
NoManService: More efficient notification update
760ea554d0022fd88bbe13e3ef7c75cbe8613af6 21-Mar-2014 Christoph Studer <chstuder@google.com> Write eventlog entries for notification panel visibility

Change-Id: Ie7e15ed15739cb5f057c900e1cadf90824b2b4ef
ava/com/android/server/EventLogTags.logtags
ava/com/android/server/notification/NotificationDelegate.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerService.java
d89188d68e678f1f7bcfdae9a9a9fa5b946bfc32 03-Apr-2014 Christoph Studer <chstuder@google.com> NoManService: More efficient notification update

Instead of removing the old notification and inserting the
updated notification afterwards, replace the old notification
in-place.

Change-Id: I88962fd2452de191c1d63c142719194282568dcc
ava/com/android/server/notification/NotificationManagerService.java
adde87a6458110b9dcb9c8b6ff681aa9e7ef0de2 05-Apr-2014 Michael Wright <michaelwr@google.com> am 118d1134: Merge "Fix size_t format specifier"

* commit '118d113478a2c58e7997f926a8dd1bc5ca5f5dc8':
Fix size_t format specifier
118d113478a2c58e7997f926a8dd1bc5ca5f5dc8 05-Apr-2014 Michael Wright <michaelwr@google.com> Merge "Fix size_t format specifier"
38915a1c4c4377ee99ff1fb25995a0c5f7bd614f 05-Apr-2014 Ruchi Kandoi <kandoiruchi@google.com> am 654d75fe: PowerManager: Fix build

* commit '654d75fec9e04306a3e08e4ef0c3aa0ec9ef96ea':
PowerManager: Fix build
654d75fec9e04306a3e08e4ef0c3aa0ec9ef96ea 05-Apr-2014 Ruchi Kandoi <kandoiruchi@google.com> PowerManager: Fix build

fix build breaks by commit 667372e39bfe01bd15f0803d51ef0e9816f18808

Change-Id: I9e6e0f9146f860d27337cef0551c686ba2d60e23
ni/com_android_server_power_PowerManagerService.cpp
9ecba5269b1e114439f4515a433d73d450f04769 05-Apr-2014 Michael Wright <michaelwr@google.com> Fix size_t format specifier

Change-Id: I7d4ce5e0c7bb4d9e0cc19edf68f30f6b2b054bc7
ni/com_android_server_input_InputManagerService.cpp
c1b717fbb48bce9f99555784d09bf3b3126f156d 04-Apr-2014 Leon Scroggins <scroggo@google.com> am 7716b7d8: Merge "Update to call new Skia APIs."

* commit '7716b7d8ef9addb913bbc4bdd3153fa36bd1aa87':
Update to call new Skia APIs.
7716b7d8ef9addb913bbc4bdd3153fa36bd1aa87 04-Apr-2014 Leon Scroggins <scroggo@google.com> Merge "Update to call new Skia APIs."
b0c8593d97cf1df546dd3aab797bbed9d8ae367e 04-Apr-2014 Ruchi Kandoi <kandoiruchi@google.com> am f20a5eb2: PowerManager: add powerHint method

* commit 'f20a5eb279035d462e1f5d9895f4eb66cc152215':
PowerManager: add powerHint method
f20a5eb279035d462e1f5d9895f4eb66cc152215 02-Apr-2014 Ruchi Kandoi <kandoiruchi@google.com> PowerManager: add powerHint method

Add powerHint method to IPowerManager for passing power hints from other
processes.

Change-Id: Ic596ace2ed1796a6da4cddb2163dcc4536115e55
ava/com/android/server/power/PowerManagerService.java
ni/com_android_server_power_PowerManagerService.cpp
83398922bac21b64ef26ac641b8e099ce77b5524 04-Apr-2014 John Spurlock <jspurlock@google.com> am 0a0454fd: am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

* commit '0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec':
Introduce new UI_MODE_TYPE_WATCH and qualifier.
0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec 04-Apr-2014 John Spurlock <jspurlock@google.com> am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

* commit '642421aa7f284817cc1a972a7f9c7a64696a0116':
Introduce new UI_MODE_TYPE_WATCH and qualifier.
642421aa7f284817cc1a972a7f9c7a64696a0116 04-Apr-2014 John Spurlock <jspurlock@google.com> am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
Introduce new UI_MODE_TYPE_WATCH and qualifier.
6c191299a73388cd593809c0b66bafbd08fd2982 03-Apr-2014 John Spurlock <jspurlock@google.com> Introduce new UI_MODE_TYPE_WATCH and qualifier.

Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
ava/com/android/server/UiModeManagerService.java
cc11f15f76a62ded3e403cb2bc818c6aa5bf261c 31-Mar-2014 Leon Scroggins <scroggo@google.com> Update to call new Skia APIs.

I816129d49c0118453222916f3c818eccac33663d merges a new version of
Skia that updates various APIs. Call the new ones.

SkBitmap::copyTo now takes an SkColorType instead of an
SkBitmap::Config, so do the conversion with
SkBitmapConfigToColorType or use the enum when it makes sense.

Call SkImageDecoder::decodeSubset instead of (deprecated)
SkImageDecoder::decodeRegion.

Override SkCanvas::ClipVisitor::clipRRect in ClipCopier.

In Canvas::clip calls, call SkCanvas::isClipEmpty(), which was
previously called inside the clip call, to determine the return value.

For various SkPaint effects, call the new factories (as the constructors
have been made protected).

Implement SkJavaOutputStream::bytesWritten(), overriding a new pure
virtual function on SkWStream.

Update Matrix calls to always return true (since SkMatrix calls no
longer return a value).

Depends on I816129d49c0118453222916f3c818eccac33663d (skia).

Change-Id: I5cdcea827ebff587df0bbddc0965e3e0fbf48002
ni/com_android_server_input_InputManagerService.cpp
4a3285de79e44b5f8b8062da49f326203bdfe832 04-Apr-2014 Paul Lawrence <paullawrence@google.com> am f17f0e0e: Merge "Save OwnerInfo so CryptKeeper can display at boot time"

* commit 'f17f0e0eb0eef424401caa122e51a648f5ef3801':
Save OwnerInfo so CryptKeeper can display at boot time
f17f0e0eb0eef424401caa122e51a648f5ef3801 04-Apr-2014 Paul Lawrence <paullawrence@google.com> Merge "Save OwnerInfo so CryptKeeper can display at boot time"
2d79bb230017360688a3048cf77b2d4fea8ed50d 04-Apr-2014 Christopher Tate <ctate@google.com> am ed3db02c: Significant preconditions are significant

* commit 'ed3db02c051f52f9ad3770e3c6b5b90c71a04fb1':
Significant preconditions are significant
ed3db02c051f52f9ad3770e3c6b5b90c71a04fb1 04-Apr-2014 Christopher Tate <ctate@google.com> Significant preconditions are significant

If you are going to check whether we've failed yet, make sure that
the default state to test against has been established properly.

Bug 13790971

Change-Id: I7fc6ff1bbbd9e569df59dcb65cc30f120c128efa
ava/com/android/server/pm/PackageManagerService.java
d21310ae0f363c5137c1e5367d3edcb08e3d36c3 03-Apr-2014 Dianne Hackborn <hackbod@google.com> am 5d5902d1: Merge "Don\'t allow -1 uids for wake locks."

* commit '5d5902d140040936fa6aa7e443220140af0e9843':
Don't allow -1 uids for wake locks.
5d5902d140040936fa6aa7e443220140af0e9843 03-Apr-2014 Dianne Hackborn <hackbod@google.com> Merge "Don't allow -1 uids for wake locks."
a6066bb7a42e53a3b6ff772eb9e07cfb3835012b 03-Apr-2014 Craig Mautner <cmautner@google.com> am 35fc6a02: Merge "Implement setActivityLabelAndIcon()."

* commit '35fc6a02aeded9578375af5828e14043164028d5':
Implement setActivityLabelAndIcon().
35fc6a02aeded9578375af5828e14043164028d5 03-Apr-2014 Craig Mautner <cmautner@google.com> Merge "Implement setActivityLabelAndIcon()."
46791e752ca1eca35e6a882c47d7de7f4f66687c 03-Apr-2014 Paul Lawrence <paullawrence@google.com> Allow encryption when keyguard is set to pattern or no protection

Add type parameter to encryptStorage so we can set type when we encrypt

Depends on
https://googleplex-android-review.git.corp.google.com/#/c/444056/

Circular dependency on:
https://googleplex-android-review.git.corp.google.com/#/c/444201/

Bug: 13749169
Change-Id: I52034ec25de35f12f1bbfdd1b0f8584923a0be2e
ava/com/android/server/MountService.java
b7b7907fb5e4b2252b3c594a6bc4402217fe662a 25-Mar-2014 Yohei Yukawa <yukawa@google.com> Allow IMEs to start/stop receiving onUpdateCursor callback

This CL introduces an API which allows IMEs to start/stop
receiving onUpdateCursor callback upon their request.

BUG: 13388665
Change-Id: I987326872def181dda5d9d701b762f088e0d9c39
ava/com/android/server/InputMethodManagerService.java
ef640cdfb29caf9d0abf4aba020afbc3eb3e0443 25-Mar-2014 Dianne Hackborn <hackbod@google.com> Don't allow -1 uids for wake locks.

Change-Id: Ia1b412a166f69247be3b047138349e7b4031bd7d
ava/com/android/server/power/PowerManagerService.java
53c4d55897a875d05069c65ad0e4607db275f5b4 03-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am f6028359: am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev

* commit 'f60283598751cbbdb65b2a59d2294e23bb4dfb99':
Use build property for CEC device OSD name
f60283598751cbbdb65b2a59d2294e23bb4dfb99 03-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev

* commit 'f2fe3505dac16dfa990fbab56713abab6ba0bc54':
Use build property for CEC device OSD name
64b1ad5a39c63a432c3638834e70de9282483ccc 03-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am c9cb9138: am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev

* commit 'c9cb91388b268608c8b7f588dca8417f2661f0ed':
Maintain display power status for playback device
4a7000924a4b5ef6b917844dae986ca611748dce 03-Apr-2014 Christopher Tate <ctate@google.com> am a7d9b937: Merge "Refuse update of a system app if it changes its shared uid"

* commit 'a7d9b93756c8b1e61a721fe14d941ee7ab975513':
Refuse update of a system app if it changes its shared uid
c9cb91388b268608c8b7f588dca8417f2661f0ed 03-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev

* commit '4c963841db60ed59fd59a6fba79f8e3e6ec7f349':
Maintain display power status for playback device
a7d9b93756c8b1e61a721fe14d941ee7ab975513 03-Apr-2014 Christopher Tate <ctate@google.com> Merge "Refuse update of a system app if it changes its shared uid"
f2fe3505dac16dfa990fbab56713abab6ba0bc54 03-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev

* commit '31518f745ffa5e832274c332ac957a065948fdaf':
Use build property for CEC device OSD name
c935d1f11144443a91b3c03d7da82314db6e049b 31-Mar-2014 Christopher Tate <ctate@google.com> Refuse update of a system app if it changes its shared uid

Bug 13657183

Change-Id: I6d8fb9c8810ca896d2d10e5a80a3c4a50c9e4fed
ava/com/android/server/pm/PackageManagerService.java
60b17cc0944a855d6a867d7674c9c33b1251a3f7 28-Mar-2014 Jinsuk Kim <jinsukkim@google.com> Use build property for CEC device OSD name

Previously OSD name was based on device type. This CL makes it
independent of device type. CEC spec says "A device that implements
more than one type of CEC functionality should respond with the same
OSD name for each logical address. It is recommended that the name
refers to the complete physical product rather than the individual
CEC functionality".

Now the default name comes from system build property. I removed
setOsdName() from aidl for now since it won't be in use.

Change-Id: I3c9fb877fad4bc5efef56268d155a3f37a865fc2
ava/com/android/server/hdmi/HdmiCecDevice.java
ava/com/android/server/hdmi/HdmiCecService.java
ni/com_android_server_hdmi_HdmiCecService.cpp
4c963841db60ed59fd59a6fba79f8e3e6ec7f349 03-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev

* commit 'b1dca1624dc8d853a52d1918c7672173e9b79836':
Maintain display power status for playback device
b1dca1624dc8d853a52d1918c7672173e9b79836 03-Apr-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Maintain display power status for playback device" into klp-modular-dev
ae6ffcc3c74d12ebf59a26cce24d04fdd2b56f4e 02-Apr-2014 Jorim Jaggi <jjaggi@google.com> Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev
506fbbfa4c912a1c3d6e40c0adbc22256b603cfd 02-Apr-2014 Chris Wren <cwren@android.com> am af31a7d1: Merge "add variance to notification usage stats"

* commit 'af31a7d1cc26733f138119c43385aa86d0a3c04f':
add variance to notification usage stats
af31a7d1cc26733f138119c43385aa86d0a3c04f 02-Apr-2014 Chris Wren <cwren@android.com> Merge "add variance to notification usage stats"
511039748872e1cc469d20c3db52bec4e0d66d46 01-Apr-2014 Chris Wren <cwren@android.com> add variance to notification usage stats

Change-Id: I9b6abd08cf01a1d80c8e5dd581c8e82e019542fc
ava/com/android/server/notification/NotificationUsageStats.java
cff0acb6b1eea23c3f44a078a0a5e81c11faea35 31-Mar-2014 Jorim Jaggi <jjaggi@google.com> Wait for Keyguard to be drawn after boot.

The old logic with waiting for the Keyguard to be drawn assumed that
it is in an own window, and just checked for the visibility. This is
no longer possible as the Keyguard is in the status bar, and the status
bar might have been drawn without the Keyguard. So we have to wait
explicitely until Keyguard told PhoneWindowManager that it has now been
drawn and we can turn on the screen.

In addition, the starting logic of SystemUI is moved into
SystemUIApplication such the we can make sure that the status bar
already exists when the callbacks from PhoneWindowManager reach
KeyguardService. This simplifies the logic a lot.

Bug: 13635952
Change-Id: Ifd6ba795647edcf3501641e39052e4d04bc826fb
ava/com/android/server/wm/WindowManagerService.java
501f2c2cf009efee9a88ad964704e7fd4710e9c6 02-Apr-2014 Kenny Guy <kennyguy@google.com> am f4824a06: Fix issue with not allowing activities for current user.

* commit 'f4824a06884e096beef921646cba4be29d7f36fc':
Fix issue with not allowing activities for current user.
f4824a06884e096beef921646cba4be29d7f36fc 02-Apr-2014 Kenny Guy <kennyguy@google.com> Fix issue with not allowing activities for current user.

Change-Id: Ic2e30c3f4990a03aac9801ee9bf5f270a5e90ef8
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/wm/WindowManagerService.java
e51dcf98a4ddb1340cffba88059ad89f0b90909a 18-Mar-2014 Paul Lawrence <paullawrence@google.com> Save OwnerInfo so CryptKeeper can display at boot time

Requires vold change from
https://googleplex-android-review.git.corp.google.com/#/c/435164/

Bug: 13526708
Change-Id: I33153df9961832f72c3b8103bd5e1d3a17e77df3
ava/com/android/server/MountService.java
ffa80df57848a41aeba692d177c701676c58c65f 02-Apr-2014 Kenny Guy <kennyguy@google.com> am 1ccace91: Merge "Rename related users to profiles."

* commit '1ccace916c8fdc61f1a8db6677aed518d31647e6':
Rename related users to profiles.
1ccace916c8fdc61f1a8db6677aed518d31647e6 02-Apr-2014 Kenny Guy <kennyguy@google.com> Merge "Rename related users to profiles."
2a764949c943681a4d25a17a0b203a0127a4a486 02-Apr-2014 Kenny Guy <kennyguy@google.com> Rename related users to profiles.

Rename the related user concept as profiles.
When returning profiles of a user include the
user as a profile of itself.

Change-Id: Id5d4f29017b7ca6844632ce643f10331ad733e1d
ava/com/android/server/InputMethodManagerService.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/pm/UserManagerService.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
b07178467f604057d4e931df32f2f7f0e53d542a 02-Apr-2014 Narayan Kamath <narayan@google.com> am b69bb445: resolved conflicts for merge of 71ab4f4f to master

* commit 'b69bb445585a083b8e4ff8a13a1a1a63e9c22a6a':
Move zygote startup logic to the frameworks.
b69bb445585a083b8e4ff8a13a1a1a63e9c22a6a 02-Apr-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 71ab4f4f to master

Change-Id: I888c231f7579523e12fbd68f820f0775019e51e0
71ab4f4f48a9b8b485d80adf18d568ef6265b1e8 02-Apr-2014 Narayan Kamath <narayan@google.com> am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."

* commit 'ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
Move zygote startup logic to the frameworks.
4e90fcd1907e0c1f1fa1dc991fbd7fda5e49a482 24-Mar-2014 Jinsuk Kim <jinsukkim@google.com> Maintain display power status for playback device

With this CL, the power status of TV/display is keep tracked of
by hdmi cec server part, specfically HdmiCecDevicePlayback.
Turned the HdmiCecDevice to abstract class from which classes of
concrete device type(HdmiCecDevicePlayback, HdmiCecDeviceTV) are
inherited. The display power status code is put in HdmiCecDevicePlayback
only. HdmiCecDeviceTv will have its own logic that manages power status of
devices connected to it. For now it only has a bare minimum code.
Will be worked on in follow up CLs.

Other changes:

- Replaced sendGiveDevicePowerStatus() with isTvOn() so that the status
can be queried by clients.

- Defensively check the availability of HdmiCecService so that
HdmiCecManager.getClient() returns null in case the service couldn't
be initialized. This ensures clients of the service gets the nulled-out
HdmiCecClient when called in the state/configuration where the service
is not available, thus proceed accordingly.

Change-Id: Idaf69e73cfbd639c0b40b1bd4b6146f011246180
ava/com/android/server/hdmi/HdmiCecDevice.java
ava/com/android/server/hdmi/HdmiCecDevicePlayback.java
ava/com/android/server/hdmi/HdmiCecDeviceTv.java
ava/com/android/server/hdmi/HdmiCecService.java
5e9abc9507e9d2ff7e701a762c1bdbd1cdbb0971 02-Apr-2014 Michael Kolb <kolby@google.com> am 118d252e: am 4a812147: am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev

* commit '118d252e7541bfe2c0453814acc3bee0b6312de1':
Add circular anti-aliasing mask to circular display
118d252e7541bfe2c0453814acc3bee0b6312de1 02-Apr-2014 Michael Kolb <kolby@google.com> am 4a812147: am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev

* commit '4a8121478e5027bf61b5c711d6b1a748004edea2':
Add circular anti-aliasing mask to circular display
4a8121478e5027bf61b5c711d6b1a748004edea2 02-Apr-2014 Michael Kolb <kolby@google.com> am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev

* commit '875eff832f9f496740ceba2f12de6f5423225274':
Add circular anti-aliasing mask to circular display
39a6db7cd5199dbe83da388404be3fc8f386281e 27-Mar-2014 Michael Kolb <kolby@google.com> Add circular anti-aliasing mask to circular display

Bug: 13635645

Add a 2 px wide anti-aliased circle as a Layer to WindowManagerService

Change-Id: Ic8d319ca43c222f5b2e69af896749b8f2018ce3e
ava/com/android/server/wm/CircularDisplayMask.java
ava/com/android/server/wm/WindowManagerService.java
9d51192e569e49f7fbc61cc12c075e853866f900 01-Apr-2014 Christopher Tate <ctate@google.com> am f74aa094: Handle bad package name arguments sensically

* commit 'f74aa094b413f113f7dd8cef0ce28fb933a27a5d':
Handle bad package name arguments sensically
f74aa094b413f113f7dd8cef0ce28fb933a27a5d 01-Apr-2014 Christopher Tate <ctate@google.com> Handle bad package name arguments sensically

Don't blithly go ahead and assume package name arguments are non-null,
and don't continue to do a bunch of work after an early failure on
invalid non-null package names.

Bug 13745101

Change-Id: I12ccae343066b39162dedeb46dc58869f55be0ba
ava/com/android/server/pm/PackageManagerService.java
d2cf756996be2cbc915227f1f384704427ab88e6 01-Apr-2014 Paul Lawrence <paullawrence@google.com> am df42723d: Merge "Don\'t double prompt on booting encrypted device"

* commit 'df42723d6b717fd2882c98c930a0f93c75af2474':
Don't double prompt on booting encrypted device
df42723d6b717fd2882c98c930a0f93c75af2474 01-Apr-2014 Paul Lawrence <paullawrence@google.com> Merge "Don't double prompt on booting encrypted device"
688b5105d665a56e6f2f040f3ca89ca3006801df 28-Mar-2014 Craig Mautner <cmautner@google.com> Implement setActivityLabelAndIcon().

Replaces Activity.setRecentsLabel and Activity.setRecentsIcon.
Simple top-down traversal to find the highest activity with a
specified label and icon. Adds the Intent of that activity to
RecentTaskInfo as well so that Recents can get the launcher
icon if UX desires it.

Fixes bug 13675322.

Change-Id: I62d7d8f4df4dc81012f451e0cdea8a2943aedeec
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
b4b159d2552dc4eeffda896d7f8ce536bf9a7132 31-Mar-2014 Nick Kralevich <nnk@google.com> am 0e290b77: am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."

* commit '0e290b7708e2ac59e645f499d8348a3a087a9568':
Change when the SELinux relabel of /data/data occurs.
0e290b7708e2ac59e645f499d8348a3a087a9568 31-Mar-2014 Nick Kralevich <nnk@google.com> am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."

* commit 'ce30fca85deec8e268009a2acaefe85541ab1e58':
Change when the SELinux relabel of /data/data occurs.
ce30fca85deec8e268009a2acaefe85541ab1e58 31-Mar-2014 Nick Kralevich <nnk@google.com> am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."

* commit 'e531e2ec6b311c35b077cc228e832b3f1530dffa':
Change when the SELinux relabel of /data/data occurs.
e6978cda7110823f70cc74319c37bd512866c6f1 31-Mar-2014 Adrian Roos <roosa@google.com> am 53ab5174: Merge "Define trust agent framework components"

* commit '53ab5174d5009786dc58da3011181b77e325c130':
Define trust agent framework components
82142c21dd333307682d5f4bb09de3ab3ccfa06c 27-Mar-2014 Adrian Roos <roosa@google.com> Define trust agent framework components

Adds the TrustManager system service that allows
registering for changes to the trust status and
reporting events that are important to trust agents.

Bug: 13723878
Change-Id: I7d0d2ea86fd755702d31aa5d49cac038a6cd4301
ava/com/android/server/trust/TrustAgentWrapper.java
ava/com/android/server/trust/TrustManagerService.java
e402774407c9bcb52d87fc7b558142b76ea51305 31-Mar-2014 Narayan Kamath <narayan@google.com> am 439cf5b4: am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp

* commit '439cf5b433123970a94388cf9309d9ea4d31b3cb':
Don't make isSafeMode a field on the Zygote class.
439cf5b433123970a94388cf9309d9ea4d31b3cb 31-Mar-2014 Narayan Kamath <narayan@google.com> am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp

* commit '56a8f8b48ff1d0855209307b9076d6e9b348b59b':
Don't make isSafeMode a field on the Zygote class.
56a8f8b48ff1d0855209307b9076d6e9b348b59b 31-Mar-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp

This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.

Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
085226c40f21a4467f047b901c7640e2215828d8 31-Mar-2014 Christoph Studer <chstuder@google.com> am 546bec8e: Notification usage stats

* commit '546bec8ebf2cf865e88d02cc8cb29563ad224967':
Notification usage stats
bd490ad59ffbc7890adec4e53c72afae4d81087b 31-Mar-2014 Jorim Jaggi <jjaggi@google.com> Merge "Make Keyguard a library and make StatusBar the new Keyguard." into master-lockscreen-dev
546bec8ebf2cf865e88d02cc8cb29563ad224967 14-Mar-2014 Christoph Studer <chstuder@google.com> Notification usage stats

First cut of gathering implicit notification signals and computing
running stats.

Tracks:
1. Post, update, remove by apps
2. Click, dismissal by users

Stats are aggregated on user, user+pkg, and getKey() levels.

Current stats are printed as part of 'dumpsys notification'.

Change-Id: I06ecbf76e517509895f2f9eea5b9d19bf9a34975
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/notification/NotificationUsageStats.java
00bc2834537dec9e407da5cf4573048189f45289 31-Mar-2014 Jinsuk Kim <jinsukkim@google.com> am 2e59bd78: am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev

* commit '2e59bd788546e29e48b85bda72da6af61704113d':
Replace individual methods with a consolidated CEC nativeSendmessage
2e59bd788546e29e48b85bda72da6af61704113d 31-Mar-2014 Jinsuk Kim <jinsukkim@google.com> am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev

* commit '41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
Replace individual methods with a consolidated CEC nativeSendmessage
41eaa32c100d8a903daa7b7d09d34887a3e45ffd 31-Mar-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
71888f54cb256f0d5527e2dd66f95e83992d795f 29-Mar-2014 Craig Mautner <cmautner@google.com> am 1872ce3e: am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."

* commit '1872ce3e7af0e2130a9e8f9f52983cd234f6ead0':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
6f9bddc846e2915d1b1db2310a785be8ab7c91a6 29-Mar-2014 Adam Hampson <ahampson@google.com> am e8609de4: am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev

* commit 'e8609de4fb3635ab7182283e94ac56b48c07463a':
hdmi: cec: add permission name to dump permission denial message
1872ce3e7af0e2130a9e8f9f52983cd234f6ead0 29-Mar-2014 Craig Mautner <cmautner@google.com> am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."

* commit '155e3133407e590f18e7e16eddc6fc743f35b0fd':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
e8609de4fb3635ab7182283e94ac56b48c07463a 29-Mar-2014 Adam Hampson <ahampson@google.com> am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev

* commit '594c73fc57c99a0bceaa84ccd7524e5038a17ad8':
hdmi: cec: add permission name to dump permission denial message
594c73fc57c99a0bceaa84ccd7524e5038a17ad8 28-Mar-2014 Adam Hampson <ahampson@google.com> Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev
380ecb81db52a9d0197ca969951d07b91c20d2b9 14-Mar-2014 Jorim Jaggi <jjaggi@google.com> Make Keyguard a library and make StatusBar the new Keyguard.

This change achieves a couple of things:
- Let Keyguard be a library, so we can use it in SystemUI.
- Introduce FLAG_KEYGUARD for windows and deprecate TYPE_KEYGUARD. Make
all the TYPE_KEYGUARD behaviour dependant on the flag.
- Implement a new KeyguardService in SystemUI, and bind that service
from PhoneWindowManager.
- Introduce BaseStatusBar.setKeyguardState and inflate
KeyguardSimpleHostView there and use FLAG_KEYGUARD for the window, such
that the status bar window essentially gets the Keyguard.

Bug: 13635952
Change-Id: I059d80d8b9b9818a778ab685f4672ea2694def63
ava/com/android/server/wm/InputMonitor.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
ec27a7caf3c26506013c49ce1bbe78559bc73b4a 28-Mar-2014 John Spurlock <jspurlock@google.com> am 5579ec33: DO NOT MERGE Enhance the NotificationListenerService api.

* commit '5579ec33eb317a19ad80929169b2b329b147d98b':
DO NOT MERGE Enhance the NotificationListenerService api.
945490c12e32b1c13b9097c00702558260b2011f 27-Mar-2014 Paul Lawrence <paullawrence@google.com> Don't double prompt on booting encrypted device

vold will store password securely until KeyGuard requests it
and hands it on to KeyStore.

This is a revision of

https://googleplex-android-review.git.corp.google.com/#/c/418123/

which was reverted. It had two bugs in LockSettingsService.checkVoldPassword.
1) We were not checking password for null, which caused an exception
2) checkPattern/checkPassword return true if there is no saved pattern or password.
This leads to situations where we get true returned even when the password
doesn't match. Call the correct one based on what is there, not what vold
thinks ought to be there.

Bug: 12990752
Change-Id: I05315753387b1e508de5aa79b5a68ad7315791d4
ava/com/android/server/LockSettingsService.java
ava/com/android/server/MountService.java
5579ec33eb317a19ad80929169b2b329b147d98b 28-Mar-2014 John Spurlock <jspurlock@google.com> DO NOT MERGE Enhance the NotificationListenerService api.

Add to NotificationListenerService:
- getActiveNotificationKeys() : String[]
- getActiveNotifications(String[] keys) : StatusBarNotification[]
- cancelNotifications(String[] keys) : void
- onListenerConnected(String[] keys) : void

Add to StatusBarNotification:
- getKey() : String

Bug:13562828
Change-Id: I9da222cb4af22864bc0ecdecc3f121bced0723d6
ava/com/android/server/notification/NotificationManagerService.java
a4294297d46cc0b9f45897bc688c267502cce3ef 24-Mar-2014 John Spurlock <jspurlock@google.com> Enhance the NotificationListenerService api.

Add to NotificationListenerService:
- getActiveNotificationKeys() : String[]
- getActiveNotifications(String[] keys) : StatusBarNotification[]
- cancelNotifications(String[] keys) : void
- onListenerConnected(String[] keys) : void

Add to StatusBarNotification:
- getKey() : String

Bug:13562828
Change-Id: Idd9605dad8f942d68b4b32ab9625faf6c8642db9
ava/com/android/server/notification/NotificationManagerService.java
25b32c65e7048b8655ce3fab0720fc7c7a95c226 27-Mar-2014 Adam Hampson <ahampson@google.com> hdmi: cec: add permission name to dump permission denial message

The android.security.cts.ServicePermissionsTest--testDumpProtected test was
failing on this service because it is looking for the permission name in the
denial message.

Change-Id: I4b4d38cd27b782470d1f21e36104164d2c8962a3
Signed-off-by: Adam Hampson <ahampson@google.com>
ava/com/android/server/hdmi/HdmiCecService.java
a79501cd3843149f0759bd53d310cf97d4ee1c8d 27-Mar-2014 Craig Mautner <cmautner@google.com> am af89d7e2: am bffd4d43: Merge "Check return values for null." into klp-modular-dev

* commit 'af89d7e21f5d7cbe74ff4ce014d8ab2db1a6fc27':
Check return values for null.
af89d7e21f5d7cbe74ff4ce014d8ab2db1a6fc27 27-Mar-2014 Craig Mautner <cmautner@google.com> am bffd4d43: Merge "Check return values for null." into klp-modular-dev

* commit 'bffd4d437d133164877c6a194d6a533299072fae':
Check return values for null.
bffd4d437d133164877c6a194d6a533299072fae 27-Mar-2014 Craig Mautner <cmautner@google.com> Merge "Check return values for null." into klp-modular-dev
9410f5983b2fab4bac220dab0fab7cde10e6d34a 27-Mar-2014 Craig Mautner <cmautner@google.com> am 723f7bbc: am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity"

* commit '723f7bbcf34168b216421eee4b7d86199f90de1f':
Do not show Home behind full screen activity
d3849f54158bf1a370b9462b30ee36c15e7b02ea 27-Mar-2014 Craig Mautner <cmautner@google.com> Check return values for null.

When a Display has been removed there is a delay until all of its
windows have been removed. Therefore there is a possibility that
WindowState.getDisplayContent() returns null. Guard against that
possibility.

Fixes bug 13616765.

Change-Id: Ia2074d293b0e1bd4ca2cd14aeb4a2cc09ed9f41e
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
723f7bbcf34168b216421eee4b7d86199f90de1f 27-Mar-2014 Craig Mautner <cmautner@google.com> am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity"

* commit '7f7ce0f71b5f1b5274b0cda190401823508cda1f':
Do not show Home behind full screen activity
f1977b4500e82b72ea6aa5c46d97406a20017caf 25-Mar-2014 Christopher Tate <ctate@google.com> Expand install observer semantics

...and now fail conservatively when two apps both attempt to define
the same permission. Apps signed with the same certificate are
permitted to redefine permissions.

We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.

Bug 13551375

Change-Id: Ifa4e59154dcccbb286ee46a35a6f25e4ad0f0f01
ava/com/android/server/pm/PackageManagerService.java
350159c65a52092db04f1b8efce6943f61e50e73 27-Mar-2014 Adam Lesinski <adamlesinski@google.com> resolved conflicts for merge of 6984e4f9 to master

Conflicts:
services/core/java/com/android/server/notification/NotificationManagerService.java

Change-Id: Ief1bf339cf7d75094c9a169264c015b1f286ed63
6984e4f9bbeb48fb7437183ed2aeb06661bbc228 27-Mar-2014 Adam Lesinski <adamlesinski@google.com> am fc680b89: Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev

* commit 'fc680b89184fb60cf9a58e81d7f890002310702d':
Fix a race in NotificationManager with Listeners
ecd072161ec57ba8dfb26659511c0f6605601560 27-Mar-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 22d07464 to master

Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d
22d074643ed0d010ebfdb0fca685d65eb2632e58 27-Mar-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp

Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
e824026554f1e2a8df8d27f703bf8e6a2d6dad19 27-Mar-2014 Adam Lesinski <adamlesinski@google.com> Fix a race in NotificationManager with Listeners

After being bound to, a NotificationListenerService could
make a call into NotificationManagerService before having been
added to the list of active services.

Bug: 13644375
Change-Id: I4ed920d165f46d009f91e28ca13c3926563cd110
ava/com/android/server/notification/NotificationManagerService.java
40a00a341b72490c6291b3aac65bc7a10b3e10ad 24-Mar-2014 Jinsuk Kim <jinsukkim@google.com> Replace individual methods with a consolidated CEC nativeSendmessage

It saves us from having to add numerous native methods to HdmiCecService.
A new native method that reports physical address was added in consequence
to be able to build the message in Java side.

Other changes:
- Substituted more concrete type (cec_device_type_t) to int.
- Fixed the issue about byte endianness in handling physical
address/vendor id. The bytes of variable mPhysicalAddress in native
service were being reversed previously but still worked because they
were reversed again when copied out to outgoing messages. Vendor id
had a bug of bytes being reversed. In order to fix the issue, the way
they are copied to byte array was changed so that it becomes
independent to byte endianness.
- CL's for header/HAL implementation changes are:
https://googleplex-android-review.git.corp.google.com/#/c/437667
https://googleplex-android-review.git.corp.google.com/#/c/437668

Change-Id: Id1ac683fe54597a2c707f30492c7f86e5392504d
ava/com/android/server/hdmi/HdmiCecService.java
ni/com_android_server_hdmi_HdmiCecService.cpp
6ee7d25010d4f23b44a151f3953225ba253de8af 26-Mar-2014 Paul Lawrence <paullawrence@google.com> Revert "Don't prompt at boot if we already did that when decrypting"

This reverts commit 493e3e7e6523fd94cc1acae3e45935a1227d58c3.

Should fixes

Bug: 13611885
Bug: 13656830
Change-Id: I117c988bb6679f44f8add4fcc18f45cb8238dfb4
ava/com/android/server/LockSettingsService.java
ava/com/android/server/MountService.java
1ee4eb074c2d85148658e93e865a18834bdced72 26-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Revert "Expand install observer semantics""
7629a18a3f190368e6268d3f2827824905683268 26-Mar-2014 Glenn Kasten <gkasten@google.com> Revert "Expand install observer semantics"

This reverts commit ab8a501f255b272af887acb0e66eb71cdf24c755.

Change-Id: I4ab4ae1a96efa2adf9d5a513793d8b84eef38b4e
ava/com/android/server/pm/PackageManagerService.java
9067dc03ffc76c5210d26d5a53a211eff046d412 26-Mar-2014 Christopher Tate <ctate@google.com> Merge "Expand install observer semantics"
eeb397b77f249045b02fe3014479a9c1bf001d0d 25-Mar-2014 John Spurlock <jspurlock@google.com> Zen mode updates.

- Now only two modes, no more ZEN_MODE_FULL.
- Alarms are allowed by default.
- Interstitial dialog cleanup to follow current UX.

Change-Id: I8e4c8f64854dabfef69ad33b3eb35bee07e55ef7
ava/com/android/server/notification/NotificationManagerService.java
c76275377cbc807b3bbc2fc1662ff18c59043e5b 26-Mar-2014 Nick Kralevich <nnk@google.com> am 32cc40a9: am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes."

* commit '32cc40a9b57750451a6489e01526dc6a14d72bff':
Note libselinux dependency on packages.list format changes.
32cc40a9b57750451a6489e01526dc6a14d72bff 26-Mar-2014 Nick Kralevich <nnk@google.com> am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes."

* commit 'fdd6351067740f80148ff03c43d2ebc91f1d9656':
Note libselinux dependency on packages.list format changes.
ab8a501f255b272af887acb0e66eb71cdf24c755 25-Mar-2014 Christopher Tate <ctate@google.com> Expand install observer semantics

...and now fail conservatively when two apps both attempt to define
the same permission.

We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.

Bug 13551375

Change-Id: I3a286d024a30e812ee4b098f345401df3c00e178
ava/com/android/server/pm/PackageManagerService.java
59f0258a27ebaf8468919a9d2855c41f0429238d 21-Mar-2014 Dan Sandler <dsandler@android.com> Categorize some system notifications.

Change-Id: Ia343bc276f50f488e2165056cff249a02f01d45a
ava/com/android/server/connectivity/Tethering.java
ava/com/android/server/storage/DeviceStorageMonitorService.java
16744ac3f7b030f1192d298132256ac06eaff205 26-Mar-2014 Craig Mautner <cmautner@google.com> am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev

* commit 'd1e32cd3207215e8bb63f18c6a5a4880b5344ef8':
Defer removal of activity until animation complete.
79e6578b6c7e8352f86942b99de4513133a1acdb 18-Mar-2014 Craig Mautner <cmautner@google.com> Defer removal of activity until animation complete.

Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.

Fixes the ugly output associated with bug 13440426.

Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
ava/com/android/server/wm/WindowManagerService.java
2471abec78a29b5a7b9b9e3e6c061f4be0964e9a 25-Mar-2014 Adam Lesinski <adamlesinski@google.com> am e77786d5: am 99d60784: am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev

* commit 'e77786d51f574ca7bbb45df136f92fc7c7d06ffe':
Fix issue with early service start
d7bf82d6a422a8b10e2a9bea7f4e3fcdc804d19b 25-Mar-2014 Craig Mautner <cmautner@google.com> am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev

* commit 'f32b22e9c78cbc0109adbad67e9ff3d7045bd954':
Move task to top in window manager.
f32b22e9c78cbc0109adbad67e9ff3d7045bd954 25-Mar-2014 Craig Mautner <cmautner@google.com> resolved conflicts for merge of ca903d38 to klp-modular-dev

Change-Id: I44b8cbeb9ae9f6e5c8b2fe1363127d6eccfdf041
99d607844da2b100afe3d134c1c006f4cc5b35b1 25-Mar-2014 Adam Lesinski <adamlesinski@google.com> am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev

* commit '415e6f8ed46a70e6ae50e05cda56356dae31718c':
Fix issue with early service start
415e6f8ed46a70e6ae50e05cda56356dae31718c 25-Mar-2014 Adam Lesinski <adamlesinski@google.com> Merge "Fix issue with early service start" into klp-modular-dev
4bcf922a55beb0513f7c9cc18c57e6f3d2cd729e 25-Mar-2014 Matthew Williams <mjwilliams@google.com> am c798e4f5: am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.

* commit 'c798e4f5497c39a3c6c14b120cffdee1122a9212':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
c798e4f5497c39a3c6c14b120cffdee1122a9212 25-Mar-2014 Matthew Williams <mjwilliams@google.com> am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.

* commit '4701b51af216ce2b6fa9fa508ebba47bf13063c7':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
452fd49369da80a460d43fcb7e71d8549268f378 24-Mar-2014 Craig Mautner <cmautner@google.com> am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."

* commit '5332706b87c8772b97198e30c7cb4cc4ef3b577f':
Set ScreenshotSurface secure if any secure content is shown.
1c855178e497f7ba788dadb87167f1e6735d10cb 24-Mar-2014 Jinsuk Kim <jinsukkim@google.com> am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev

* commit '775a097f01a349548d2124ae9d7dd562c72eaa27':
Add HdmiCecManager
913487ceca69ef785fc2d78ee09389deca1dde54 24-Mar-2014 George Mount <mount@google.com> Allow opaque windows to become translucent.

Bug 13624779

Change-Id: I0c4885f227751edf96091d852c4bd3a729f1f5a7
ava/com/android/server/am/ActivityRecord.java
43111e897be9f79ababb0ecf99f155695416d956 24-Mar-2014 Dianne Hackborn <hackbod@google.com> Merge "Battery stats: wake locks, radio active, cleanup."
4590e52f3d0558e01322fe4dd55bb612afdfb079 24-Mar-2014 Dianne Hackborn <hackbod@google.com> Battery stats: wake locks, radio active, cleanup.

- Improve wake lock work source updates to also update the current
history tag, in case the new work source gets recorded in the
history.

- Fix bug in recording radio active time that was not distributing
any time to apps.

- No longer hold a wake lock while dispatching data conn active call,
since it comes with its own timestamp.

- Fix issue where the top app was not being cleared while the screen
was off.

- Remove obsolete STATS_LAST stats type.

- Fix bug that was not clearing the total run time when resetting
the stats.

Change-Id: Iabe17a9edf34f762374ae09fcffb8a819cf72e30
ava/com/android/server/AlarmManagerService.java
ava/com/android/server/NativeDaemonConnector.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/power/PowerManagerService.java
a6db4ab6193626c880970572a0d03db511d403af 24-Mar-2014 Adam Lesinski <adamlesinski@google.com> Fix issue with early service start

NotificationListener services would start too early
and crash due to system_server not being ready.

Bug: 13439345
Change-Id: I86ee93b50d016bfa0119e21a8cde8635212b16a4
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/pm/UserManagerService.java
87f738d2787444854cd15695b599b84b25027167 24-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev

* commit '51e938041e72f29c4e776a8627ea9d8a70d62728':
Fix support for simultaneous VPN tuns
ff3bb2fe95a7d0158f5a456368eb7fa91069bc23 24-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev

* commit '7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
Include the interface for clearDnsInterfaceForUidRange
48600b95cad8d49772ca5634a317b893d2346f42 24-Mar-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #13564072: Back button no longer dismisses IME after voice usage"
6b6b3fdbf5547417fde3ce56d9eb883963a54b58 24-Mar-2014 Dianne Hackborn <hackbod@google.com> Fix issue #13564072: Back button no longer dismisses IME after voice usage

Calling identity wasn't being cleared in an incoming code path.

Change-Id: Ib32060a91bf81531de049fafde69835b5382a25f
ava/com/android/server/InputMethodManagerService.java
e2cae0a6578596f9c87b970650a9cc234b32cb04 24-Mar-2014 John Spurlock <jspurlock@google.com> am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev

* commit '2b45d84e24946d0cbbcc577ca3e195c0db687c9a':
Unhide Notification kind, rename to category.
fea8d956649589f1cfd378571cc9ad61a92cd480 24-Mar-2014 George Mount <mount@google.com> Merge "Fix null ActivityOptions when starting an Activity in a new Process."
cf44a124ab4eca431b3c57776183cd3857113e6f 24-Mar-2014 John Spurlock <jspurlock@google.com> Unhide Notification kind, rename to category.

Change-Id: I8e6d5a30dff519d7ed4f38e018646dd2bc55db33
ava/com/android/server/InputMethodManagerService.java
b98ee1eb50389520fd06255fd38b233c7adf5814 24-Mar-2014 Craig Mautner <cmautner@google.com> am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."

* commit '103ed3558764f1fd41c9a5399e2030baa4110bfb':
Set ScreenshotSurface secure if any secure content is shown.
3c34e5dbbb99d3d66f71eea5db6e001cc5495263 24-Mar-2014 Jinsuk Kim <jinsukkim@google.com> am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev

* commit 'c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
Add HdmiCecManager
af597627cb344a144cbeb0a982e97e282cfd8f82 20-Mar-2014 Sander Alewijnse <salewijnse@google.com> Changed tag name and error strings for PersistentPreferredActivity storage.

They still referred to hard preferred activity, which was renamed
to persistent preferred activity.

Change-Id: Ib06baa5da746ea1e4cbd035cd73e8847acba3f7c
ava/com/android/server/pm/PersistentPreferredActivity.java
ava/com/android/server/pm/Settings.java
c01e1aeb0d86bd626684c97d709d4a8e995fddfb 24-Mar-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Add HdmiCecManager" into klp-modular-dev
fbcd503645d9527fd7c700b3e4e8f170c46a7eba 21-Mar-2014 Jinsuk Kim <jinsukkim@google.com> Add HdmiCecManager

Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).

Change-Id: I39da071a328074a4b7b049947943688bd7779c26
ava/com/android/server/hdmi/HdmiCecService.java
296f1a9130cc5d5339ab1d1c3cfc7324920acf8a 23-Mar-2014 Craig Mautner <cmautner@google.com> Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
9cf34e2ee4cb3d2e14c2863298ad3a2fafc31d39 23-Mar-2014 Craig Mautner <cmautner@google.com> Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."

This reverts commit f7ad855718dc576a1618a54035b82e92356aa0d8.

After careful consideration this would prove to be a security leak to leave it in. Tasks could deliberately launch dialog activities that don't want to be seen in an unsecure setting. These would then be visible over the task background.

Change-Id: Ia7e984bc9616573af6c7772f6ea0f2dd588bb85d
ava/com/android/server/wm/WindowState.java
61ada5d330e10a738ba5f085cae5b9b339895d19 23-Mar-2014 Craig Mautner <cmautner@google.com> Merge "Add Activity methods for icons and labels."
2fbd7541804f816171849413b095fcfc70e06c1e 21-Mar-2014 Craig Mautner <cmautner@google.com> Add Activity methods for icons and labels.

New Activity methods setRecentsLabel(CharSequence) and
setRecentsIcon(Bitmap) have been added. The topmost
activity with either of these set will be returned in
RecentTaskInfo members activityLabel and activityIcon.

Fixes bug 13562992.

Change-Id: Ic15d1d27b733b892a2a940063b105ac48f1ffee5
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
e9c9c441346586e26eccc0523fcf12f5158e53f7 22-Mar-2014 Dianne Hackborn <hackbod@google.com> Merge "Battery stats: track actually running time"
18a65ad09d9a245266874015e5aacb05d868a534 22-Mar-2014 Christopher Tate <ctate@google.com> Merge "Cap the size of app-defined permission trees"
2c92c9700c7b06f3c7dd5ab15d8343dfce68c833 20-Mar-2014 George Mount <mount@google.com> Fix null ActivityOptions when starting an Activity in a new Process.

Bug 13563265

Change-Id: Ie56cd6d55f13dbf68bafb82ab4bd6b27fde60df6
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
a1bd79268be693f04f4adee90673d6ed400cc9fd 21-Mar-2014 Dianne Hackborn <hackbod@google.com> Battery stats: track actually running time

Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.

Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.

Finally use new radio down timestamp to adjust the times we
compute for radio use. Note that this information is not (yet)
being used to adjust how these are recorded in the history.

Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
ava/com/android/server/AlarmManagerService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/am/BatteryStatsService.java
ni/com_android_server_am_BatteryStatsService.cpp
c55f9c04427796d5b6f833fe43adffd9d7b99ad2 21-Mar-2014 Christopher Tate <ctate@google.com> Cap the size of app-defined permission trees

Bug 13529742

Change-Id: I46c2ebc39caf4a9eacbffbb35fc386c2a1cedc12
ava/com/android/server/pm/PackageManagerService.java
cde7086b900fd192a8e389f62ab5007d351d86b8 21-Mar-2014 Matthew Williams <mjwilliams@google.com> Merge "Downgrade expedited to normal on reschedule."
05e4dc96fbe47480fcd639ac679683c90ba07484 21-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev

* commit '850eb678d7356ea60925dc6fa450e213d5cea2d5':
Fix support for simultaneous VPN tuns
9506e84b6f1b8a63abd5c7ecd580548386cc9aae 21-Mar-2014 Chad Brubaker <cbrubaker@google.com> am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev

* commit 'c77261471432e1577586395dd0a6a481ef7431b5':
Include the interface for clearDnsInterfaceForUidRange
850eb678d7356ea60925dc6fa450e213d5cea2d5 21-Mar-2014 Chad Brubaker <cbrubaker@google.com> am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev

* commit 'eb3c0d9ac387bb0aea5b4956daac1403253bc76d':
Fix support for simultaneous VPN tuns
c77261471432e1577586395dd0a6a481ef7431b5 21-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev

* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
Include the interface for clearDnsInterfaceForUidRange
717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7 21-Mar-2014 Paul Lawrence <paullawrence@google.com> Merge "Don't prompt at boot if we already did that when decrypting"
a7efb93c1b4e717049b106312ff353cd95c74f0e 21-Mar-2014 Jinsuk Kim <jinsukkim@google.com> am a10958f1: am cfba284a: am d73e66cc: Fix broken build

* commit 'a10958f1c386851dc69a5dae2c32b899b9f29277':
Fix broken build
a42cb8b0e2b8fdfbac1a6590d6b60814caa01088 21-Mar-2014 Colin Cross <ccross@android.com> resolved conflicts for merge of a67e34c8 to master

Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
3daafcd7bab6e3ace72396576529e3049ab4c066 21-Mar-2014 John Spurlock <jspurlock@google.com> Merge "Annotate framework vibrate calls with stream hints."
f7ad855718dc576a1618a54035b82e92356aa0d8 21-Mar-2014 Craig Mautner <cmautner@google.com> Apply FLAG_SHOW_WHEN_LOCKED within tasks.

If the bottommost fullscreen window of a task has FLAG_SHOW_WHEN_LOCKED
set then show all windows of the task that are above that window.

Fixes bug 13558398.

Change-Id: Ied8ada54efbb079eaf375470b2eae749e5551c24
ava/com/android/server/wm/WindowState.java
824ad0e6f9c799f5b0faa2024e35fc6e714a681a 21-Mar-2014 John Spurlock <jspurlock@google.com> Merge "Unhide notification category."
fd7f1e00399e53a392941928ed5a55ca77b1b721 18-Mar-2014 John Spurlock <jspurlock@google.com> Unhide notification category.

Rename @hidden Notification.kind -> category, and flesh out
shared values. Now a single value.

Update framework references, remove unused SystemUpdateService
magic value unused since 2012.

Change-Id: If06d19ff3a8c3125fca1457f5d3c665e2939c66c
ava/com/android/server/InputMethodManagerService.java
f9e1a0b369740e11ea1ed4f141ffb936fc1a6cdb 20-Mar-2014 John Spurlock <jspurlock@google.com> Annotate framework vibrate calls with stream hints.

Migrate existing framework usages of Vibrator.vibrate to use
the new overload with an explicit stream hint. This prevents
them from being blocked by rules targeting the unspecified stream.

For calls that pass the existing appops check in VibrateService,
pass streamHint down to the input device vibrator so we don't lose
the signal, but leave it up to InputManager to decide what to do
with it - currently unused.

Change-Id: I65c944e4010edea29a412bf57d8d7d3b8098b746
ava/com/android/server/VibratorService.java
ava/com/android/server/power/ShutdownThread.java
cfba284ad72b6ac3d7189f7c87cddb7299da7617 21-Mar-2014 Jinsuk Kim <jinsukkim@google.com> am d73e66cc: Fix broken build

* commit 'd73e66cce12f13faec44b12d9e6f33c2f28a2d5a':
Fix broken build
d73e66cce12f13faec44b12d9e6f33c2f28a2d5a 21-Mar-2014 Jinsuk Kim <jinsukkim@google.com> Fix broken build

Change-Id: Ia7d207f7937e29cf48dce30d8c5a91f50c9e7d4c
ava/com/android/server/hdmi/HdmiCecDevice.java
f2fecf48f740a079cf9015ea8c2695039ca11d81 21-Mar-2014 Jinsuk Kim <jinsukkim@google.com> am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev

* commit 'c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
Add HDMI-CEC service
c61f4dd744b1b0396703aa58eb22fc31d2b7050e 21-Mar-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Add HDMI-CEC service" into klp-modular-dev
0bfae1063a9db09338dd87c3656445b439da5898 21-Mar-2014 Winson Chung <winsonc@google.com> Merge "Adding workaround for the status bar not reporting the correct system decor rect."
96d970c93e0ed639f0639a1ea17bb98acc703ff1 21-Mar-2014 Winson Chung <winsonc@google.com> Adding workaround for the status bar not reporting the correct system decor rect.

Change-Id: I2ea089e9d41deb2ac2a266694ac65d58830856f5
ava/com/android/server/wm/WindowStateAnimator.java
7bcdb33d859ffb70f235cc8e0f22a0598194ddf8 21-Mar-2014 Winson Chung <winsonc@google.com> Merge "Adding support for clipping window transition for alternate recents."
399f62052a88e5e7628b7312637ae54fbbaa4bec 19-Mar-2014 Winson Chung <winsonc@google.com> Adding support for clipping window transition for alternate recents.

Change-Id: Ic7df4e6c0396afc794ffc21694814c0a93f20f31
ava/com/android/server/wm/AppTransition.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
503fb80d0e93fd1aed64dbef36f7fa4363bdd5a2 20-Mar-2014 Svetoslav <svetoslavganov@google.com> Fix build

Change-Id: I2b27d51d8f555ee160dc99dba7e223f1cb3557e7
ava/com/android/server/wm/WindowManagerService.java
8e3feb15c5aec2c72b0ef120a1da325e1e8f0dda 24-Feb-2014 Svetoslav <svetoslavganov@google.com> Added accessibility APIs for introspecting interactive windows.

1. The old introspection model was allowing querying only the active window
which is the one the user is touching or the focused one if no window is
touched. This was limiting as auto completion drop downs were not inspectable,
there was not way to know when the IME toggles, non-focusable windows were
not inspectable if the user taps them as until a screen-reader starts
introspecting the users finger is up, accessibility focus was limited to
only one window and the user couldn't use gestures to visit the whole UI,
and other things I can't remember right now.

The new APIs allow getting all interactive windows, i.e. ones that a
sighted user can interact with. This prevents an accessibility service
from interacting with content a sighter user cannot. The list of windows
can be obtained from an accessibility service or the host window from an
accessibility node info. Introspecting windows obey the same rules for
introspecting node, i.e. the service has to declare this capability
in its manifest.

When some windows change accessibility services receive a new type
of event. Initially the types of windows is very limited. We provide
the bounds in screen, layer, and some other properties which are
enough for a client to determined the spacial and hierarchical
relationship of the windows.

2. Update the documentation in AccessibilityService for newer event types.

3. LongArray was not removing elements properly.

4. Composite accessibility node ids were not properly constructed as they
are composed of two ints, each taking 32 bits. However, the values for
undefined were -1 so composing a 64 long from -1, -1 prevents from getting
back these values when unpacking.

5. Some apps were generating inconsistent AccessibilityNodeInfo tree. Added
a check that enforces such trees to be well formed on dev builds.

6. Removed an necessary code for piping the touch exploration state to
the policy as it should just use the AccessibilityManager from context.

7. When view's visibility changed it was not firing an event to notify
clients it disappeared/appeared. Also ViewGroup was sending accessibility
events for changes if the view is included for accessibility but this is
wrong as there may be a service that want all nodes, hence events from them.
The accessibility manager service takes care of delivering events from
not important for accessibility nodes only to services that want such.

8. Several places were asking for prefetching of sibling but not predecessor
nodes which resulted in prefetching of unconnected subtrees.

9. The local AccessibilityManager implementation was relying on the backing
service being ready when it is created but it can be fetched from a context
before that. If that happens the local manager was in a broken state forever.
Now it is more robust and starts working properly once the backing service
is up. Several places were lacking locking.

bug:13331285

Change-Id: Ie51166d4875d5f3def8d29d77973da4b9251f5c8
ava/com/android/server/wm/AccessibilityController.java
ava/com/android/server/wm/DisplayMagnifier.java
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
8c5567ee9e3d557da9729ef980a3588ce00f8240 20-Mar-2014 Jim Miller <jaggies@google.com> am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService

* commit 'bd33dc01f68ae0f4e4861568c02619e38c40af15':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
4f512fb451c8ddcea852645c5c24314c20c0974b 28-Feb-2014 Jinsuk Kim <jinsukkim@google.com> Add HDMI-CEC service

This CL adds a system service handling HDMI-CEC protocol. The service
is equipped with the capability sending/receiving HDMI-CEC messages

Not all the messages are in place. Currently it has messages to support
a few features only, as follows:

- One touch play
- System information
- Routing control (partially - active source status maintenance only)
- Device OSD transfer
- Power status

It will be extended to cover the wider usages in the follow up CLs.

The CEC standard version referenced in the implementation is 1.3a.

Change-Id: Ifed0b02f52ebf098eddb3bd0987efbf353b7e8fe
ava/com/android/server/hdmi/HdmiCecDevice.java
ava/com/android/server/hdmi/HdmiCecService.java
ni/Android.mk
ni/com_android_server_hdmi_HdmiCecService.cpp
ni/onload.cpp
3bf0fb1a909f167dc7356d3b584dc0cb27f086d0 20-Mar-2014 Craig Mautner <cmautner@google.com> Merge "Fix oversight when checking in last CL"
dd221b3780800f03900c52bfc4a1ac7d01b72bc2 20-Mar-2014 Craig Mautner <cmautner@google.com> Fix oversight when checking in last CL

Too much was deleted due to the order of operations while
debugging. CL 435015 removed some critical lines.

Fixes bug 13410184.

Change-Id: Ia1fbf985d73163742c4c531e8505606454897f69
ava/com/android/server/am/ActivityStackSupervisor.java
bd33dc01f68ae0f4e4861568c02619e38c40af15 20-Mar-2014 Jim Miller <jaggies@google.com> am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService

* commit '8e69abf8c62452e6e9bcd254a55a2d80c8ef5b3d':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
244d18bfb3ae7ff9781616b35e29ffb84713ef68 20-Mar-2014 Nick Kralevich <nnk@google.com> am 857fe511: am 0b4f63c3: am dd6b7495: am 83725810: Merge "Get rid of noise during boot."

* commit '857fe511fe7139a41ad3d587a73758be53340e90':
Get rid of noise during boot.
0b4f63c319f211ddd0d572b6b1eb647d0a6dc8a7 20-Mar-2014 Nick Kralevich <nnk@google.com> am dd6b7495: am 83725810: Merge "Get rid of noise during boot."

* commit 'dd6b7495577eca7a00aa37bfdca3449cf1443681':
Get rid of noise during boot.
046e0a7ba68c95e303842812e835e0f321e8d892 20-Mar-2014 Michael Wright <michaelwr@google.com> Merge "Use DisplayPowerRequest#wantLightSensorEnabled in ABC."
40c8725804f46c9d53f2815e0ee69e6cfb0152cc 20-Mar-2014 Dianne Hackborn <hackbod@google.com> batstats: fix wake lock tracking, service bug

- Fix bug I introduced in handling wake lock changes where
we weren't iterating over the new work sources correctly.
- Fix bug in ActiveServices that would wtf too much.
- Prepare to start tracking uptime in the battery history.

Change-Id: Ia94316be51bc6eab7b02f214a5c40c08e99cc3b1
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/BatteryStatsService.java
07cf4da1d004b145ba8b9055bbff314ef68528f3 19-Mar-2014 John Spurlock <jspurlock@google.com> Merge "Add stream-level suppression to vibrate/audio services."
4a6f0879502bea0258876497926aa31e7e837032 19-Mar-2014 Etan Cohen <etancohen@google.com> Merge "Catch Netd exceptions to avoid runtime restart"
d9cb2f3d062d409f5300a131cd920313fb92580e 19-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> Catch Netd exceptions to avoid runtime restart

bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04
ava/com/android/server/ConnectivityService.java
70b7d163aa0d4b2911eff525f83c9f245bfd9813 19-Mar-2014 Nick Kralevich <nnk@google.com> am 31654e19: am b630ffe3: am e75d340a: am 5c8e1a6e: Merge "Allow PMS to restorecon directories under /data."

* commit '31654e19c92c94675c0e2f2a86b59683d4c48d2f':
Allow PMS to restorecon directories under /data.
b630ffe3fdd72be186495f2c0a8d05b936a73d46 19-Mar-2014 Nick Kralevich <nnk@google.com> am e75d340a: am 5c8e1a6e: Merge "Allow PMS to restorecon directories under /data."

* commit 'e75d340ae5919942d19f57856ae9e3f8bc62e098':
Allow PMS to restorecon directories under /data.
c1ae44fb8ae76955710d863e69e76c1e80f92927 19-Mar-2014 Jeff Sharkey <jsharkey@android.com> Merge "Define an OEM directory, scan features and APKs."
1be762c1ba0f4ab57c9d2038620e03d45eeb1f0a 06-Mar-2014 Jeff Sharkey <jsharkey@android.com> Define an OEM directory, scan features and APKs.

To support OEM customizations, define a new top-level directory
that roughly mirrors the layout of the system partition. Scan this
location for (non-privileged) apps, and for additional features.

Bug: 13340779
Change-Id: Idb6d6626655061ee31ad952cab734d30ea6130b9
ava/com/android/server/pm/PackageManagerService.java
1b98e90db063da97c6bb9d47aa9798c8c32a58b5 19-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 0bff77d6 to master

Change-Id: Ia4c86126079740978658a05579b56d59d41a7b01
1af30c7ac480e5d335f267a3ac3b2e6c748ce240 10-Mar-2014 John Spurlock <jspurlock@google.com> Add stream-level suppression to vibrate/audio services.

- Add new audio restriction layer to app-ops. Restrictions add
additional constraints to audio operations at a stream-level.
Restrictions do not affect the persistable state, and are purely
additive: that is, they can only impose additional contstraints, not
enable something that has already been disabled. Restrictions
also support a whitelisted set of exempt package names.

- Add new audio stream-level checks to app-ops.

- Implement a provisional OP_PLAY_AUDIO suppression to three
java entry points MediaPlayer, AudioTrack, & SoundPool.

- Enhance vibrator api to take stream information as an optional
hint - the constants correspond to AudioManager stream types.
OP_VIBRATE now supports the stream-level restriction check.

- Simplify Vibrator subclasses by adding default implementations
for two .vibrate calls.

- Migrate NoMan's zen-mode control to use the new app-ops
stream-level restriction mechanism.

Change-Id: Ifae8952647202f728cf1c73e881452660c704678
ava/com/android/server/AppOpsService.java
ava/com/android/server/VibratorService.java
ava/com/android/server/notification/NotificationManagerService.java
e5659baa4f439865658d11d6617773e0849f22a2 19-Mar-2014 Michael Wright <michaelwr@google.com> Use DisplayPowerRequest#wantLightSensorEnabled in ABC.

Change-Id: I2cb869a40ed91331a55972d0ea557269733d5204
ava/com/android/server/power/AutomaticBrightnessController.java
45b1e5ec053eecc4e00246eac5c4137a2aba12e0 19-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am 42b746e4: am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev

* commit '42b746e4d8baa6141598ddaae7148baea2ddf366':
Handle provisioning APN by turning off/on data.
42b746e4d8baa6141598ddaae7148baea2ddf366 19-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev

* commit 'bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
Handle provisioning APN by turning off/on data.
0535a9f7aa5d0f875b06845e9af5f6dbfc5c8a19 13-Mar-2014 Ashish Sharma <ashishsharma@google.com> Include elapsed realtime (nanos) of the event in the radio state change notifications.

Bug: 13247811
Change-Id: I3454aa159a68b9087b4762df947b41965b5a3941
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
76aa61a920ed6839cd2daf2eb4ffc62473424a4e 18-Mar-2014 Craig Mautner <cmautner@google.com> Merge "Defer removal of activity until animation complete."
81481fc20145fdb9e4985ee106af6cb9971cde0e 18-Mar-2014 Craig Mautner <cmautner@google.com> Defer removal of activity until animation complete.

Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.

Fixes the ugly output associated with bug 13440426.

Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
ava/com/android/server/wm/WindowManagerService.java
dd23853e6383df8f21c73bb01c2b665e28850822 18-Mar-2014 Doug Zongker <dougz@google.com> am 06fe82d8: am 2e6d960c: am cdf00888: add option to shutdown after factory reset

* commit '06fe82d8e01780b7b6c16364f81f8dd75d467420':
add option to shutdown after factory reset
8fc2eba0f7590122c15290b7ce3389be15394fd4 18-Mar-2014 Dianne Hackborn <hackbod@android.com> am a2a13718: am 7987d84e: am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"

* commit 'a2a13718d00172d224960146e4956de58da5b484':
Insufficient ProcessRecord cleanup when persistent process is killed
2e6d960c85436b46f71a048a825c545a376fbf06 18-Mar-2014 Doug Zongker <dougz@google.com> am cdf00888: add option to shutdown after factory reset

* commit 'cdf008883921c2eb7daf10c82687e9a36461eb16':
add option to shutdown after factory reset
cdf008883921c2eb7daf10c82687e9a36461eb16 18-Mar-2014 Doug Zongker <dougz@google.com> add option to shutdown after factory reset

Add a new hidden method to recovery system to trigger a factory reset
followed by a shutdown, rather than a reboot back to the regular
system. Use this flag when the MASTER_CLEAR intent is broadcast with
a boolean extra "shutdown" set to true.

Change-Id: I2ceb25b715d9f0ef492a75b3d287d1e17cec89ef
ava/com/android/server/MasterClearReceiver.java
157b645e5d1767a6f41bdf6bacce110f98eb3267 18-Mar-2014 Craig Mautner <cmautner@google.com> Merge "Fix activities appearing behind home icons"
7987d84e35fb8d7a20ef33786906968e8b7f2dc2 18-Mar-2014 Dianne Hackborn <hackbod@android.com> am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"

* commit 'd1d91eca3e78f2074b110a0e3530aeff6deef6fe':
Insufficient ProcessRecord cleanup when persistent process is killed
e9ebd60fc4dd32a57784e8d9c7dcb8b599d25f75 18-Mar-2014 Dianne Hackborn <hackbod@google.com> Merge "Treat IME processes as hosting activities"
95e9daab03d0349a69940625c7f718175f371581 17-Mar-2014 Craig Mautner <cmautner@google.com> Fix activities appearing behind home icons

Notify the Window Manager when a task has been moved to the front.

Fixes bug 13410184.

Change-Id: I85ec63ae6d1dbd917ba2288b1486f531a69dd1a0
ava/com/android/server/am/ActivityStackSupervisor.java
ecc9f9b6f308316ff2a8f6e2b6f642724533ba80 18-Mar-2014 Kenny Guy <kennyguy@google.com> Merge "Add flag to allow fetching related users recent tasks."
edb67190d65659ff1da563f1d081d9429bd31a31 18-Mar-2014 Wonsik Kim <wonsik@google.com> Merge "Revert "VideoPlaneView initial implementation""
f0f94d129b6eb3c48624e915898d86d4f2de59ff 18-Mar-2014 Dianne Hackborn <hackbod@google.com> Treat IME processes as hosting activities

When we stop using an IME process, we still treat that
process as if it is hosting activities (in the activity part
of the LRU list), to try to keep it around. This is intended
to help the experience of switching between IMEs, reducing
the chance of your previous IME process being killed and thus
requiring much more time to switch.

Change-Id: Ie5793fd9b40d980fa18f80246326511ed6ae0597
ava/com/android/server/InputMethodManagerService.java
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ProcessRecord.java
82326a98a4507deee89a90654dd0953c459811af 17-Mar-2014 Kenny Guy <kennyguy@google.com> Add flag to allow fetching related users recent tasks.

Fetch related users recent tasks along with requested users
tasks when flag is set
Set flag in requests coming from systemui/recents.

Change-Id: I985e2d9d6b9728603685fc6126e8193af119e172
ava/com/android/server/am/ActivityManagerService.java
10ad98223fd1fabb7b893de55d1384fd012aed7b 17-Mar-2014 Dianne Hackborn <hackbod@google.com> Start enforcing explicit intents for Context.bindService()

No longer prints a warning, now throws an exception.

Also fix a bug in UserManagerService that was causing an
exception while booting.

Change-Id: I3b43cfe08067da840b6850b9bed58664d36d34f1
ava/com/android/server/pm/UserManagerService.java
475e3f0e887cd23d3107acc06d29d440c60fbecf 17-Mar-2014 Wonsik Kim <wonsik@google.com> Revert "VideoPlaneView initial implementation"

This reverts commit 5f8aa4142919b3001fd2621f7acd5f609a5129a5.

Change-Id: I161748f365512c5e24acba2c3d9ebd9405fa8e3f
ava/com/android/server/wm/WindowStateAnimator.java
5dac28f59d3a214d1e4b48b1bef11071bdff830f 15-Mar-2014 Tim Kilbourn <tkilbourn@google.com> am c2b8df82: am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

* commit 'c2b8df82d701eb3508da06f75b2201c3f9796373':
FEATURE_LEANBACK implies that the device is a tv.
42dd0bb6b506be81c76cffc7b6f5491c937d4e07 15-Mar-2014 Tim Kilbourn <tkilbourn@google.com> am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

* commit '9539b4a02f74b447db0e3aa1039229f6b913aa87':
FEATURE_LEANBACK implies that the device is a tv.
d00f47402cb886a43a3448128bdcd9dd2f348a2a 12-Mar-2014 Craig Mautner <cmautner@google.com> Launch new tasks with Doc Centric flag.

Introduction of new Intent flag FLAG_ACTIVITY_NEW_DOCUMENT. When
this flag is set the target activity will be launched in its own
task. This is the start of the new Doc Centric mode of working.

Change-Id: I719168532134ab2c5ea3300df676c2b2a0e81795
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
0722968c590d814036a67133949d52d0b20ecc0d 14-Mar-2014 Tim Kilbourn <tkilbourn@google.com> FEATURE_LEANBACK implies that the device is a tv.

For managing the ui mode, consider the device to be a television if it
has either the FEATURE_TELEVISION or FEATURE_LEANBACK system features.

When leanback is available for non-television devices, we need to
reconsider the use of these features for setting the television ui mode.

Change-Id: I7b82372ce19067e010be9b42111816bab186f95b
ava/com/android/server/UiModeManagerService.java
09d47bbb43fcda1d1cc05f88849ed011a84d0d60 14-Mar-2014 Victoria Lease <violets@android.com> am c2d934d7: am f8ce43ea: am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"

* commit 'c2d934d7e87b9eb8cbb15ccc0c39b13ad32de460':
remove unnecessary switchUser call
f8ce43ea146cace780cb4f75348d4eca4526660a 14-Mar-2014 Victoria Lease <violets@android.com> am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"

* commit '1365d98270e0a0a61d10743820e923aeff974b39':
remove unnecessary switchUser call
c9519fcd386a43d3908111c468903329b9346a3d 14-Mar-2014 Dianne Hackborn <hackbod@google.com> am 32a9180a: am f29a4981: am d4981014: am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev

* commit '32a9180a6c1ac12503aaf0d123c2bfff73349508':
Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
7238585e2eea81d416e3e98c283e99c3a9a38a1a 14-Mar-2014 JP Abgrall <jpa@google.com> am 4f261396: am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev

* commit '4f26139661b0039cff5e570975e6bf9b0bbce1af':
ConnectivityService: add support to set TCP initial rwnd
4b59883afd498dd993263c95aa6db84cbe7c49b4 14-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 7c2b1625: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev

* commit '7c2b1625d66d3c80c313160f78c8bccd9499539e':
Remove SO_BINDTODEVICE from VPN protect
f29a4981616c05f300b582eb09d48ed81c97dd37 14-Mar-2014 Dianne Hackborn <hackbod@google.com> am d4981014: am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev

* commit 'd4981014d486c3ff72813d0d37048ee2abdb3d63':
Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
4f26139661b0039cff5e570975e6bf9b0bbce1af 14-Mar-2014 JP Abgrall <jpa@google.com> am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev

* commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4':
ConnectivityService: add support to set TCP initial rwnd
7c2b1625d66d3c80c313160f78c8bccd9499539e 14-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev

* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
Remove SO_BINDTODEVICE from VPN protect
d4981014d486c3ff72813d0d37048ee2abdb3d63 14-Mar-2014 Dianne Hackborn <hackbod@google.com> am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev

* commit 'e5191aabff5b9b751349b8634836a858af744905':
Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
6b2b14028ddec40b70c346f5a1e4d266720fadcd 14-Mar-2014 Dave Platt <dplatt@google.com> am cb1254f1: am e4e6b3cc: am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients"

* commit 'cb1254f1abc44b82e2a9da0d9a73230eb46e129e':
NsdService does not clean up after exiting clients
e4e6b3cc1908c60bd0e45063116cf935b7aad56a 14-Mar-2014 Dave Platt <dplatt@google.com> am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients"

* commit '21384faa2b3da619a54b35f15936c00593b30694':
NsdService does not clean up after exiting clients
00d115a7533df23027f671c90c0ae52684392e4a 14-Mar-2014 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp

Change-Id: I1f4e555773fe6138efaf73444525da0f747b01d5
57392e14cd270023c0e85b5c3165d90641060d0c 13-Mar-2014 John Spurlock <jspurlock@google.com> Merge "Add more information to existing notification_* events."
493e3e7e6523fd94cc1acae3e45935a1227d58c3 06-Feb-2014 Paul Lawrence <paullawrence@google.com> Don't prompt at boot if we already did that when decrypting

vold will store password securely until KeyGuard requests it
and hands it on to KeyStore.

Needs matching vold changes from
https://googleplex-android-review.git.corp.google.com/#/c/432050/

Bug: 12990752
Change-Id: I930ed8180cf0b8feb1e58db043d5fb6dff1bab20
ava/com/android/server/LockSettingsService.java
ava/com/android/server/MountService.java
48dd8b0fc0090ebf6cef0a9ac045fc480dd31397 13-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev

* commit '74f99a4e904af56a62f86b81831c23c763b6001e':
Only allow System apps to make VPN exempt routes
7f68f7f4a128538c1bbd33c82a40f0cc15994bf9 13-Mar-2014 Chad Brubaker <cbrubaker@google.com> am f5729a6a: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev

* commit 'f5729a6a1573ba27f69a5c5dc144be3f8f60b026':
Add the calling package name to requestRouteToHost
aa737c49df79749fe92b89d745eba7442762e2b5 13-Mar-2014 Narayan Kamath <narayan@google.com> am 9af19bee: am 52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt.

* commit '9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
74f99a4e904af56a62f86b81831c23c763b6001e 13-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev

* commit '7fb074389370ac93afc5830189371dc3ec26265c':
Only allow System apps to make VPN exempt routes
f5729a6a1573ba27f69a5c5dc144be3f8f60b026 13-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev

* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
Add the calling package name to requestRouteToHost
e6a7d93420406cdbdf1b88b9635344dea52b4650 13-Mar-2014 John Spurlock <jspurlock@google.com> Add more information to existing notification_* events.

Include calling UID/PID in the existing
notification_{enqueue/cancel/cancel_all} event logs.

Include a new "reason" arg for cancel + cancel_all to
identify listener vs noman vs statusbarmgr calls.

Found and fixed a cancelAll path (from statusbarmgr)
that was not logging at all.

Bug:13442201
Change-Id: I2e1f875076a96b1fe3b86e8990641efb1cadfcfb
ava/com/android/server/EventLogTags.logtags
ava/com/android/server/notification/NotificationDelegate.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerService.java
aea74a5977ca9f1054926eb24f247562c3a4a6ba 08-Mar-2014 Craig Mautner <cmautner@google.com> Add Lock Task Mode.

When in lock task mode only the specified task may run. All
attempts to switch to another task are ignored until the task
finishes or a call to stopLockTaskMode() is made.

Change-Id: I6cfe92fe1bcf22cd47b5398c08e23c52a4092dda
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
08fc3a7fc24cf16c15f53bab3d061a8c32367655 13-Mar-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix some uid issues in battery stats."
bbb7472b8e378a46a1e77747265c19d22bd6968c 13-Mar-2014 Dianne Hackborn <hackbod@google.com> Fix some uid issues in battery stats.

Change-Id: I9f7773568ff12603d51b26d50d758add09bedbb2
ava/com/android/server/power/Notifier.java
4979ff9f280727f15a0e4118426fbd4c3ba9cd31 13-Mar-2014 Kenny Guy <kennyguy@google.com> Merge "Show notifications from related users."
aaebbbff734cf65dcfd4489252948beca3d9225e 13-Mar-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps."
dae57a14141a90d71332086c3d6e8bd3ebf84fe5 12-Mar-2014 Alexandra Gherghina <alexgherghina@google.com> Check for empty activity stack. This avoids a null pointer exception
when switching from an user with no open apps.

Change-Id: I02629818f2bc82ee3a2825cf484ef1e32e3e6067
ava/com/android/server/am/ActivityStackSupervisor.java
088a997defe5ac88d10c341af277bceb7c46f479 12-Mar-2014 Jeff Brown <jeffbrown@google.com> am 81cc19cf: am 236e174a: am 0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev

* commit '81cc19cf18dff969319c7d1ded4f285394e37aab':
Add a temporary hack to report screen on while dozing.
4224e836428391f77adaa14180ad558d12851208 12-Mar-2014 RoboErik <epastern@google.com> Merge "Adds a TransportController and TransportPerformer to session"
8ae0f34db936a649ddaf9cdd086c224f6514efeb 25-Feb-2014 RoboErik <epastern@google.com> Adds a TransportController and TransportPerformer to session

This makes transport controls a primitive interface on sessions with
a way to create the performer, register callbacks, and send commands
and updates between controllers and performers. This still needs some
cleanup but has been tested with OneMedia.

Change-Id: I373d35f7ccc383b8421bd14044457467d80425f3
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
306c46884eb3121a981a0d1ed0c5461908c227fc 12-Mar-2014 RoboErik <epastern@google.com> am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not merge

* commit 'ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd':
b/12068020 Make kb layouts only unique to vendor/product. Do not merge
141d88916647cada1c90448d5739a927fa508724 12-Mar-2014 Jeff Brown <jeffbrown@google.com> am 578e1938: am 3ce589e5: am 2d8a3908: Fix power manager display wake lock bugs.

* commit '578e19381c2329511187083045d3ad5509428730':
Fix power manager display wake lock bugs.
ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd 16-Dec-2013 RoboErik <epastern@google.com> b/12068020 Make kb layouts only unique to vendor/product. Do not merge

This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/

Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
ava/com/android/server/input/InputManagerService.java
ni/com_android_server_input_InputManagerService.cpp
3a7c4a5669420ae9b01eda88d1d60114e99d70ff 03-Mar-2014 Kenny Guy <kennyguy@google.com> Show notifications from related users.

When filtering notifications for user include those for users that
are related to the current user.
Pipe through user id so we know which user the notification is for.

Change-Id: I4e2657c23bd7b611d450be5a1f9457824bc062cb
ava/com/android/server/notification/NotificationDelegate.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerService.java
236e174a96e73e5ae189285d984e3091210c762b 12-Mar-2014 Jeff Brown <jeffbrown@google.com> am 0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev

* commit '0575b185c618a79ede771389ed9a78436b5636bd':
Add a temporary hack to report screen on while dozing.
0575b185c618a79ede771389ed9a78436b5636bd 12-Mar-2014 Jeff Brown <jeffbrown@google.com> Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
3ce589e59507193ce15a76fa135bf2efc7bca7c6 12-Mar-2014 Jeff Brown <jeffbrown@google.com> am 2d8a3908: Fix power manager display wake lock bugs.

* commit '2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e':
Fix power manager display wake lock bugs.
2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e 12-Mar-2014 Jeff Brown <jeffbrown@google.com> Fix power manager display wake lock bugs.

Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.

1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.

2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on. This could happen when the display was
rapidly turned on-off-on-off.

Bug: 13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
ava/com/android/server/power/DisplayPowerController.java
ava/com/android/server/power/DisplayPowerState.java
ava/com/android/server/power/PowerManagerService.java
e39ef098963df1c50912cfeb53c01868ad91a48b 12-Mar-2014 Jeff Brown <jeffbrown@google.com> Add a temporary hack to report screen on while dozing.

The window manager and view hierarchy currently disable all drawing
when PowerManager.isScreenOn() returns false so no drawing occurs
while dozing. This will be fixed in a future patch to take the
display blanking state into account correctly.

This patch is a workaround to unblock development in the meantime.

Bug: 13133142
Change-Id: I2dc0b422c77285e657d73adca2606aa68264d987
ava/com/android/server/power/PowerManagerService.java
5c719495724987a405e29b1623dfe613e9a4cdf5 11-Mar-2014 Dianne Hackborn <hackbod@google.com> Merge "Reduce wake lock noise in battery history."
ee142967f60388d73c3bb99f321a781aa07f1eec 11-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev

* commit 'e5098b502c28d8f40ff3b39070fc5fb7f1a3e445':
DO NOT MERGE Debounce wifi country code Info
dbba6f076999afaad720c7c5657f7cbf9cdf2d14 11-Mar-2014 Vinit Deshapnde <vinitd@google.com> am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

* commit '2e76f5d8a282f4f948f88208e77dc4b3d0ec6634':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
303e1ff1fec8b240b587bb18b981247a99833aa8 08-Mar-2014 Winson Chung <winsonc@google.com> Initial changes for recents.

Change-Id: Ide2c202b4a5b25410f0f32bd0a81ccf817ede38f
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
e5098b502c28d8f40ff3b39070fc5fb7f1a3e445 11-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev

* commit 'e8af5e10e04697acb26b47e5d60b99e5c61a020c':
DO NOT MERGE Debounce wifi country code Info
2e76f5d8a282f4f948f88208e77dc4b3d0ec6634 11-Mar-2014 Vinit Deshapnde <vinitd@google.com> am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

* commit '5f683ca80611c3e98c91f631ee05dccf3e7e0227':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
e5167ca61e2c5607aad9041b44158581bc61b4d8 08-Mar-2014 Dianne Hackborn <hackbod@google.com> Reduce wake lock noise in battery history.

When the work source of a wake lock was changed, this would
cause the old wake lock to be released in battery stats before
the new one was acquired (the power manager would correctly
keep holding the associated wake lock). This resulted in a
pointless entry in the battery history showing the last wake
lock being released and a new one acquired.

This change adds a new path in to battery stats to report
when a wake lock has changed, allowing it to acquire the
new wake locks first before the old ones, so it can't drop
down to zero wake locks. This also provides better timing
information, as the same current time can be used for both
operations.

In addition, added a new kind of history entry for the
current time, so you can tell when in actual world clock
time the battery data is happening.

Change-Id: Ibbf2eed83bb93f31f60267889b7bc5b9e71e355f
ava/com/android/server/AlarmManagerService.java
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/power/Notifier.java
ava/com/android/server/power/PowerManagerService.java
d52207423225bcd99e94276e9d0fc2cb5f905602 10-Mar-2014 Jason Gerecke <killertofu@gmail.com> Support unique calibration per orientation

Updates the format of the calibration XML to store the Surface rotation
that a specific calibration applies to. Also updates the API to require
a rotation value for get/set, and has the native framework supply this
according to the current rotation whenever it changes.

Change-Id: I72b6703f646dd18db537365c5c9843f720a5f41e
ava/com/android/server/input/InputManagerService.java
ava/com/android/server/input/PersistentDataStore.java
ni/com_android_server_input_InputManagerService.cpp
857aa7be880c53d78f72a9f227cbdf72ee68d587 28-Jan-2014 Jason Gerecke <killertofu@gmail.com> Initialize mAffineTransform and update on modification

This patch causes the InputReader to update its mAffineTransform to reflect
the currently-set calibration on startup and whenever its value is changed
through the InputManagerService.

Change-Id: I81c76e8cf168728ee140abaf148e1cd31687d5af
ava/com/android/server/input/InputManagerService.java
ni/com_android_server_input_InputManagerService.cpp
d6396d67201fb2b64d13070324bb115c9c23b08a 28-Jan-2014 Jason Gerecke <killertofu@gmail.com> Allow persistence of input device calibration

This patch extends the PersistentDataStore store to read and write
input device calibration data. A new SET_INPUT_CALIBRATION permission
grants apps the ability to update this information, and a new
TouchCalibration class is used to wrap the raw calibration data.

Change-Id: I4daac2b15ef03616ea5b068c1e77bebd0ce7b8c1
ava/com/android/server/input/InputManagerService.java
ava/com/android/server/input/PersistentDataStore.java
724cc1f04f117ee27583d015b414a5ba4540d3b1 10-Mar-2014 Amith Yamasani <yamasani@google.com> Merge "Allow related users to show activities on primary user"
2bc68575325ab7bf082de24f5f095f20ea63f877 10-Mar-2014 Paul Lawrence <paullawrence@google.com> Merge "Clean up a few minor issues"
eb7bd8bbc3f2c1bb383e394fa255e5b86e03f1bd 10-Mar-2014 Selim Cinek <cinek@google.com> Merge "Fixed a bug where the current wallpaper could be reset on an update"
2d3ddc2ba9f86d795e437ea90dccb59cf1ebfd11 08-Mar-2014 Dave Allison <dallison@google.com> am 199670c4: am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."

* commit '199670c46a9950bd2e06af43ea082427b542060a':
ART profiler usage.
324aa693b82656809b97e307676adbbce37c3d95 08-Mar-2014 Dave Allison <dallison@google.com> am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."

* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
ART profiler usage.
734983fff35d9ed2b7a9848bdfbca401887d0dd8 05-Mar-2014 Amith Yamasani <yamasani@google.com> Allow related users to show activities on primary user

Make ActivityManager and WindowManager understand related users.

Task stack will now contain interleaved tasks for related users,
but still group regular users separately from groups of related users.

InputMethodManagerService permits related users to invoke IME and receive
key events.

Change-Id: I3bd87b32aec69c3f8d470c8b29b144f4e849c808
ava/com/android/server/InputMethodManagerService.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
c51cf03cf2458c8c137f60c7379f2cccf681d16f 03-Mar-2014 Dianne Hackborn <hackbod@google.com> Start recording wakeup reasons in battery history.

Depends on a modification to libsuspend so that we can get
a callback each time the device wakes up, to read the current
wakeup reasons from the kernel. These are then stuffed in
to a new field in the battery history.

Also add new dump options --history-start and --charged
to better control what is dumped.

Finally the alarm manager uses a "*walarm*" tag for history
item wake locks that are coming from a wakeup alarm.

Change-Id: I457571973d5b2b5fdc4e4b63ab16275db20d7edd
ava/com/android/server/AlarmManagerService.java
ava/com/android/server/am/BatteryStatsService.java
ni/Android.mk
ni/com_android_server_am_BatteryStatsService.cpp
ni/onload.cpp
ca35c18a374c143831cc282987c762507c0ffc34 07-Mar-2014 Narayan Kamath <narayan@google.com> am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes."

* commit 'cd4874cfdc00d17454529b5dca85a487c7c2de77':
Inform libcore of time format pref. changes.
f084e2779b03c261e0fcbfd7d7c6d9960a6358a1 07-Mar-2014 Narayan Kamath <narayan@google.com> Merge "Inform libcore of time format pref. changes."
ccb2a086fe0de77a4e3277454cb4a66f8e7dc57d 19-Dec-2013 Narayan Kamath <narayan@google.com> Inform libcore of time format pref. changes.

- Introduce a boolean extra for intent TIME_CHANGED that
specifies if the user wants a 24 hour format or not.
- Have the ActivityManagerService inform running processes
of changes to this preference.
- Add plumbing in ActivityThread to inform j.t.DateFormat

(cherry-picked from dd491cc756233c088fd26eba4918671fcc9cfc30)

Change-Id: Ib90636bda4bc8332cfa22def831877b524b5c486
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/CoreSettingsObserver.java
72f456fc51ecd584c3b82f8f54020edd7b9a0f46 07-Mar-2014 Dianne Hackborn <hackbod@google.com> am a6590837: am 8b776e86: am c71c901a: am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev

* commit 'a6590837a9d0211b4c44f25e1cbe2cd196aa1a3d':
Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
8b776e8616ebbf49ae0bfcc79d74d32c560016b1 07-Mar-2014 Dianne Hackborn <hackbod@google.com> am c71c901a: am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev

* commit 'c71c901ad4d33a373efdad4cf97d12f8ca77e089':
Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
c71c901ad4d33a373efdad4cf97d12f8ca77e089 07-Mar-2014 Dianne Hackborn <hackbod@google.com> am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev

* commit '278fa87cc9a5e08d410c5b1e6c75afcffc22a988':
Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
ebebadb56d6b3eab6e11dae9d48d639f0af4946d 05-Mar-2014 Selim Cinek <cinek@google.com> Fixed a bug where the current wallpaper could be reset on an update

There is a race condition which caused the wallpaper to be reset
on an app update since the broadcast notifying the service is async.
This CL corrects this behaviour by enforcing that we only reset the
wallpaper if its service was shut down twice in a certain timeframe.
Before, the condition falsely was checking whether the service was
started in the last couple of millis instead of killed.

Bug: 11901821
Change-Id: Icfbc7a5df63215079a83805c5187a3182b192757
ava/com/android/server/wallpaper/WallpaperManagerService.java
34a0992512a6b991cb9f98034437e205f8170be2 06-Mar-2014 Kenny Guy <kennyguy@google.com> Merge "Start related users on boot and user switch."
75870cf391eb6f1ec91f512e0a6f28840093d413 06-Mar-2014 Dianne Hackborn <hackbod@google.com> am 75374879: am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump.

* commit '75374879938c1767b0266132672361487f2f58d4':
Issue #13308712: Add --checkin to package manager dump.
75374879938c1767b0266132672361487f2f58d4 06-Mar-2014 Dianne Hackborn <hackbod@google.com> am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump.

* commit 'ea391750fbf78b395b414147dba6426ad907431d':
Issue #13308712: Add --checkin to package manager dump.
1f97d0ae87dc1891e2417e2e2338a870c4985336 05-Mar-2014 John Spurlock <jspurlock@google.com> Balance calls to setStreamMute.

Otherwise can get into a situation where ringer volume appears
permanently muted (until reboot).

Change-Id: I58c09f68dc02cba4de72e3a024b72484b9b9bc82
ava/com/android/server/notification/NotificationManagerService.java
6143a02f96a5c6c7a0a84f5dbe70732998256a72 05-Mar-2014 Kenny Guy <kennyguy@google.com> Start related users on boot and user switch.

Collect related initialized users and start
them on boot and user switch.
Update list users command to show whether a
user is running or not.

Change-Id: Ib3d5debcb01ec55a07d93450b988b0180fc63263
ava/com/android/server/am/ActivityManagerService.java
c1ca3bac5d35a029003e839ccccf66b028739aaf 05-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev

* commit 'bf9eec4c3bbbacd0954d819c18709962a81338bf':
Only apply tcp buffer sizes for default net
bf9eec4c3bbbacd0954d819c18709962a81338bf 05-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev

* commit '1c8ba7e551274782f3f61b90807711a056cc9730':
Only apply tcp buffer sizes for default net
8c7d4180e999d25645257b402e11d6df6729ec14 05-Mar-2014 John Spurlock <jspurlock@google.com> Merge "Block calls in limited interruptions mode."
c323b8d4d68008cc2c6d143e30db7d89245ec527 05-Mar-2014 John Spurlock <jspurlock@google.com> Block calls in limited interruptions mode.

Calls should be blocked by default in this mode, not allowed.

Change-Id: Ia628389857c5df90cec820efd0ca81e1d949631e
ava/com/android/server/notification/NotificationManagerService.java
fc1fa64020702d77a51efbe5c0586bb3c06cc666 05-Mar-2014 Tom O'Neill <tomo@google.com> Merge "Remove reference to internal bug number"
e17bbad52190382446fa0adb4f7a103e4b013d65 05-Mar-2014 Kenny Guy <kennyguy@google.com> Merge "Fix bug with starting users in background."
264707caa392abd8c92764e0b04b37290c16fb5a 05-Mar-2014 Kenny Guy <kennyguy@google.com> Fix bug with starting users in background.

It shouldn't tell the window manager to lock or freeze the
screen when starting a user in the background.

Change-Id: I24c6c19a20c360ecbed7d28e1d7249c025a463b9
ava/com/android/server/am/ActivityManagerService.java
7a4e519eda4e0e7bac9ad0159b29b11f61b50e01 05-Mar-2014 Christopher Tate <ctate@google.com> am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev

* commit '8106dce705ba69d5bc0ccafa8e21068216f42a5f':
Update PackageMonitor to recognize new 'replacing' semantics
8106dce705ba69d5bc0ccafa8e21068216f42a5f 05-Mar-2014 Christopher Tate <ctate@google.com> am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev

* commit 'a6c59158761423551941f6ed338a117658e581ad':
Update PackageMonitor to recognize new 'replacing' semantics
2e416f16745c55b4957611cb3fa5acc82f247092 04-Mar-2014 Craig Mautner <cmautner@google.com> am f716acc6: am 80b13579: am 7a93aa2f: am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"

* commit 'f716acc66f2c30503f8c10f57ecba3d597107801':
Avoid duplication of AppWindowToken in created Task
0f3237476904a59e351ef1d451cb7453b63b1d58 04-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Only apply tcp buffer sizes for default net"
80b1357909e57aa330c2624b8a5baac9f3bdce3f 04-Mar-2014 Craig Mautner <cmautner@google.com> am 7a93aa2f: am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"

* commit '7a93aa2fc2555b0de41bb5f30eb0e9cce2413084':
Avoid duplication of AppWindowToken in created Task
fe6d3c54944b56a34394a83b81a3d20cec52b3c9 04-Mar-2014 Tom O'Neill <tomo@google.com> Remove reference to internal bug number

Change-Id: Idec0d6529ee9742b226260df09cfe7cd2b3823fb
ava/com/android/server/LocationManagerService.java
07ee5d1f1db4d6df4bdb52af2eb4ab7b167df0b4 04-Mar-2014 Tom O'Neill <tomo@google.com> Removing a test provider clears its enabled state

- Bug: 11446702

Change-Id: I56ad9235a99772079193553c0f28bd8d74b3d8e3
ava/com/android/server/LocationManagerService.java
d49f64c6054dc864f651fc57a174cc3991571548 01-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> Only apply tcp buffer sizes for default net

This may mean that secondary networks have bad network settings,
but currently default settings are overriden by secondary nets
which seems worse.

bug:13211589
Change-Id: I3ef1a17ccde05306d786729c4369a31f78b2ebcf
ava/com/android/server/ConnectivityService.java
08488bf3fe6f4b1fadf59821feaf07b4c2ae52ae 21-Feb-2014 Kenny Guy <kennyguy@google.com> Allow user to be started in background.

Change-Id: I2adeb258cd33765a559c1f952c47088abbc4336c
ava/com/android/server/am/ActivityManagerService.java
84f494c2782abf4b01f72e3c58bf821ab03afbab 01-Mar-2014 Tom O'Neill <tomo@google.com> Merge "Seeing if a provider is enabled doesn't require special permissions"
afecea18054c457cbd55d1ed9c023f2c2aa3726b 01-Mar-2014 Tom O'Neill <tomo@google.com> Seeing if a provider is enabled doesn't require special permissions

- Bug: 10696351

Change-Id: I4f1612ce10587728e71277587144fdcb59445b3f
ava/com/android/server/LocationManagerService.java
77b987f1a1bb6028a871de01065b94c4cfff0b5c 27-Feb-2014 Dianne Hackborn <hackbod@google.com> Hold a wake lock while dispatching network activity events.

Also add new API for determining whether the current data network
is active, and thus better scheduling network operations. This
API is designed to not be tied to a mobile network -- regardless
of the network, apps can use it to determine whether they should
initiate activity or wait. On non-mobile networks, it simply always
reports as the network being active.

This changed involved reworking how the idle timers are done so
that we only register an idle timer with the current default
network. This way, we can know whether we currently expect to
get callbacks about the network being active, or should just always
report that it is active. (Ultimately we need to be getting this
radio active data from the radio itself.)

Change-Id: Iaf6cc91a960d7542a70b72f87a7db26d12c4ea8e
ava/com/android/server/ConnectivityService.java
ava/com/android/server/INativeDaemonConnectorCallbacks.java
ava/com/android/server/MountService.java
ava/com/android/server/NativeDaemonConnector.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/NsdService.java
ava/com/android/server/am/BatteryStatsService.java
718e39f1dcd9c2377af8f8a10bfe20e2164555fd 28-Feb-2014 Will Haldean Brown <haldean@google.com> am 987fb9cd: am 9d50308b: am 41044e5e: Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev

* commit '987fb9cd299bf0bf73bec233eaf184fb4e8353ac':
Maintain binding to crashed listeners from NotificationManagerService.
9d50308b3e51b871e541397384d8c59d7717bd56 28-Feb-2014 Will Haldean Brown <haldean@google.com> am 41044e5e: Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev

* commit '41044e5e8ef3ade33ae5d6377beca5852851a16b':
Maintain binding to crashed listeners from NotificationManagerService.
41044e5e8ef3ade33ae5d6377beca5852851a16b 28-Feb-2014 Will Haldean Brown <haldean@google.com> Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev
f87b2248497223a18ee0e5403967a5de55d8cbb5 28-Feb-2014 Chad Brubaker <cbrubaker@google.com> Merge "Remove SO_BINDTODEVICE from VPN protect"
866b25425e84f72911abc0e0ff8141f11c0980cc 28-Feb-2014 Will Haldean Brown <haldean@google.com> Maintain binding to crashed listeners from NotificationManagerService.

This fixes the logic on the death handlers for notification listeners,
and doesn't unbind from the listener services so that the system will
bring them back up again.

Bug: 12587702
Change-Id: I44ce250e0e1c2583836dc823d9a333dabec51df9
ava/com/android/server/notification/NotificationManagerService.java
ddb90b65f7a4bc2c7b0d1af01af00bd0358ed361 28-Feb-2014 Jeff Brown <jeffbrown@google.com> am 098bed6f: am bb689496: am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent.

* commit '098bed6f27b05c16ecc30f9d39005e5995f14263':
Make meaning of PowerManager.isScreenOn() more consistent.
bb6894964b30d02dc3545f07b45140646ef17581 28-Feb-2014 Jeff Brown <jeffbrown@google.com> am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent.

* commit '4c7e6900c8bfd57652fc1ceca724208ca7556196':
Make meaning of PowerManager.isScreenOn() more consistent.
4c7e6900c8bfd57652fc1ceca724208ca7556196 28-Feb-2014 Jeff Brown <jeffbrown@google.com> Make meaning of PowerManager.isScreenOn() more consistent.

The power manager sends SCREEN_ON and SCREEN_OFF broadcasts
purely based on the current wakefulness state. In particular,
when the system is awake, we consider the screen to be on even
if the screen may actually be off due to the proximity sensor
or some other condition. Likewise when the system is dozing
or asleep, we consider the screen to be off although technically
it may still be on and dozing.

This behavior is maintained for compatibility with applications
that interpret screen on / off as an indicator of user presence.

As it happened, the value of PowerManager.isScreenOn() did not
always match the state indicated by the broadcasts under certain
situations. Instead, it was based on the desired screen state.
These states used to be closely correlated but the addition
of doze mode causes them to diverge in meaning.

One consequence is that wake events from input devices might not
always wake the device from sleep unless the display's power
state was actually DOZING or OFF even if the power manager's
wakefulness was already DOZING or ASLEEP. This is now fixed.

Change-Id: Ie819c6d2c5a9ffaaf3101c5dee93ff72e9bc9f30
ava/com/android/server/power/PowerManagerService.java
98bab263500b258025c9c6ca64f8aaff7dc914f4 27-Feb-2014 Christopher Tate <ctate@android.com> am 4522bd12: am a58c03f6: am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"

* commit '4522bd12a4f3d2b0c3156fc70937f78bed15a1f8':
Fixed upgrading from forward-lock application to system application
a58c03f603cd90d1fed5566c88af5cd6c6f4caf5 27-Feb-2014 Christopher Tate <ctate@android.com> am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"

* commit '41bfe121cfa889df803a8916000e1fd0fbe87d5a':
Fixed upgrading from forward-lock application to system application
4915fb22c71a56a629116751b2d7783a9c6fde4c 27-Feb-2014 Derek Sollenberger <djsollen@google.com> Merge "Cleanup unnecessary includes for libskia."
7531aa22355cf03f51def61ba67f1636bf85f408 13-Jan-2014 Mike Lockwood <lockwood@google.com> Add support for USB devices with multiple configurations and alternate interfaces

Added UsbConfiguration class, as well as accessors to UsbDevice to get configuration list
Added methods to UsbDeviceConnection to select configurations and alternate interfaces.

Also added accessors for USB descriptor name strings and fixed some memory leaks in the JNI code.

Bug: 12425052
Change-Id: Idb990f4d5c054a8cb997eb3f440f6da9f83bce05
ni/com_android_server_UsbHostManager.cpp
e677d7113f6627161653f686b6381d2eef4d502f 13-Feb-2014 John Spurlock <jspurlock@google.com> Introduce zen mode.

- New global zen mode setting with three values:
ZEN_MODE_OFF, ZEN_MODE_LIMITED, ZEN_MODE_FULL
- Status bar icon (on lhs) when in _LIMITED / _FULL
- Rules are hardcoded for now:
_LIMITED = intercept all notifications except calls/alarms
_FULL = intercept everything
- UI affordance in shade to set mode
- Only one exit condition: "Until you delete this"
- Intercepted notifications:
- appear darker in the shade
- do not cause sound/vibration
- do not fire fullScreenIntents
- do not contribute an icon to the status bar

Change-Id: Ic36c95982b483432006bf9dab102a31370382aa9
ava/com/android/server/notification/NotificationDelegate.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/statusbar/StatusBarManagerService.java
950fe8f8d4d654e645fa7205ca275b5a03feb214 27-Feb-2014 Derek Sollenberger <djsollen@google.com> Cleanup unnecessary includes for libskia.

The libskia target exports all of its public includes directories so
redefining them here is redundant. Also this cleans up and makes it
obvious where the framework is making using of private Skia headers.

Change-Id: Ie7ecc9ddd3df780bed6b9af54ba58ca58274e043
ni/Android.mk
a5e27eb4a47a7b02cad2a84aa51ff1318a6b26d2 27-Feb-2014 Nicolas Prevot <nprevot@google.com> Merge "Correcting a deadlock in CreateRelatedUser"
c6d033ed11f3b6b73f2650c56827ed0427411e9e 27-Feb-2014 Nicolas Prevot <nprevot@google.com> Correcting a deadlock in CreateRelatedUser

A deadlock sometimes happened in CreateRelatedUser of UserManagerService.
A lock was kept when it should have been released.

Change-Id: I15444c0b5d0d5d1e14e7bf29c2115aa954b7dfc0
ava/com/android/server/pm/UserManagerService.java
c2248715e3ca37a4dc91624b580d6b0503e0ad3e 27-Feb-2014 Dianne Hackborn <hackbod@google.com> Merge "Collect per-uid mobile radio usage."
a9499d704c1a196b1c0bf8317b71e4f7ddd3f75d 27-Feb-2014 Wonsik Kim <wonsik@google.com> Merge "VideoPlaneView initial implementation"
d45665bf0b26fddf5716a0fd43036848d9301960 26-Feb-2014 Dianne Hackborn <hackbod@google.com> Collect per-uid mobile radio usage.

We now compute radio active time per application, by distributing
the active time across all applications each time the radio goes
down, weighting it by the number of packets transferred.

Per-app radio power use is now computed using this radio active
time.

This also gives us a new metric "ms per packet", which give an
idea of how effectively an application is using the radio. This
is collected and reported as a new set of stats in the human-
readable checkin. (It can be computed from the raw checkin data).

Also improve sync reporting to include the sync source as used
in wake locks, not just the component name.

Change-Id: I0b0185fadd1e47ae749090ed36728ab78ac24c5e
ava/com/android/server/BatteryService.java
ava/com/android/server/content/SyncManager.java
ava/com/android/server/content/SyncOperation.java
8fb4cf1ef4ca3b3c5ea1897cc1a4f9f5dc454877 26-Feb-2014 RoboErik <epastern@google.com> Merge "Move Session apis to android.media.session"
5f8aa4142919b3001fd2621f7acd5f609a5129a5 18-Feb-2014 Wonsik Kim <wonsik@google.com> VideoPlaneView initial implementation

Note that eventually VideoPlaneView should not inherit from SurfaceView.

Remove a few trailing spaces too.

Change-Id: Ia0a461169d560435a827861be2cc15f1e3ee68fa
ava/com/android/server/wm/WindowStateAnimator.java
2f5b057da7d05d5d699a272aa24fd7c97cdda820 21-Feb-2014 RoboErik <epastern@google.com> Move Session apis to android.media.session

This is to make it easier to distinguish the new apis from the old
ones.

Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
a1f1a3c573acd91024fda0ceb3b921c73b186963 25-Feb-2014 Dianne Hackborn <hackbod@google.com> More battery stats.

- Add events for sync.
- Add more descriptive tags for wake events.
- Fix battery reset.
- Fix tracking of wifi data.

Change-Id: Ic07f2a86a5ed33e7da57eb1108c31c777ecd801f
ava/com/android/server/AlarmManagerService.java
ava/com/android/server/BatteryService.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/am/PendingIntentRecord.java
ava/com/android/server/content/SyncManager.java
ava/com/android/server/power/Notifier.java
ava/com/android/server/power/PowerManagerService.java
a77cf8735432daddb233164f41103a0ff38408bb 25-Feb-2014 John Spurlock <jspurlock@google.com> Merge "Tabs -> spaces in frameworks/base."
b5abedbd5cef473574884a7453cdf4d412af26af 25-Feb-2014 Craig Mautner <cmautner@google.com> am c407ace3: am d4c819c0: am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev

* commit 'c407ace3019c4e542654cf17fd04d9436d3f3436':
Clean up activities and displays when done
d4c819c0029da8fb7248564aefde2146d5ecfc19 25-Feb-2014 Craig Mautner <cmautner@google.com> am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev

* commit 'dd9ce6287eb9ccae8d527e6750c91b0bd47834fc':
Clean up activities and displays when done
dd9ce6287eb9ccae8d527e6750c91b0bd47834fc 25-Feb-2014 Craig Mautner <cmautner@google.com> Merge "Clean up activities and displays when done" into klp-modular-dev
95da1087ed3c7b9983b571bc5409827ae390f15f 25-Feb-2014 Craig Mautner <cmautner@google.com> Clean up activities and displays when done

More maintenance fixes.

Fix bug 13157352.

Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/wm/DisplayContent.java
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
8a985d24ce9a38f40ed88fecbdcd0e75e3a68f44 25-Feb-2014 John Spurlock <jspurlock@google.com> Tabs -> spaces in frameworks/base.

Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
ava/com/android/server/BluetoothManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStackSupervisor.java
eb1d804246f031889619e9c5466e899f95c249d0 25-Feb-2014 Jeff Brown <jeffbrown@google.com> am 01d63a35: am ae8106ef: am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev

* commit '01d63a35245ad20cf5251b69777db5c81fc76a84':
Fix typo that causes dreaming on battery.
ae8106ef9cdea9b6325afec197023d5b2d6214d0 25-Feb-2014 Jeff Brown <jeffbrown@google.com> am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev

* commit '2326acb591d889d9492219f5f8f79940fd66ba70':
Fix typo that causes dreaming on battery.
2326acb591d889d9492219f5f8f79940fd66ba70 25-Feb-2014 Jeff Brown <jeffbrown@google.com> Merge "Fix typo that causes dreaming on battery." into klp-modular-dev
966604f1599886989c954b9246f157bb47f4a4f8 25-Feb-2014 Jeff Brown <jeffbrown@google.com> Fix typo that causes dreaming on battery.

Bug: 13173012
Change-Id: I611970a5b4c4b0072ce52e3fc6a57dd3a0c075b3
ava/com/android/server/power/PowerManagerService.java
aec25d92242f46fe25eff3d2e1e7553a8882e8b3 24-Feb-2014 Dianne Hackborn <hackbod@google.com> Merge "Improve how battery stats collects network stats."
786e71ab11f2d89afffc9db7473f16206395c813 06-Feb-2014 Jake Hamby <jhamby@google.com> Remove unneeded new RIL command.

Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also remove some accidentally added debug log lines.

Bug: 12864208
Change-Id: I6f035d6900c9fcb1427bad62057d7b4a1d3cd99c
ava/com/android/server/ConnectivityService.java
d0c5b9abed60b7bc056d026bf0f2b2235410fb70 22-Feb-2014 Dianne Hackborn <hackbod@google.com> Improve how battery stats collects network stats.

This optimizes the path for battery stats to collect
per-uid network usage. It now collects wifi and mobile
usage separately, with a path that allows it to recycle
all data structures and filter out stats it isn't
interested in before they come back to java.

This is setting us up for the actual goal, to collect
mobile stats independently each time the mobile radio
goes down, allowing us to distribute mobile radio usage
across uids based on the number of packets they transferred
during a session.

Change-Id: I21a0f517cf087ea5aa8b8dd535e20b46e361a52b
ava/com/android/server/NetworkManagementService.java
9862a48574bc088eed97ce8a23b51797e623f863 24-Feb-2014 Chad Brubaker <cbrubaker@google.com> Merge "Only allow System apps to make VPN exempt routes"
4845037a48aa4463028fbea912dcb982a56daaa2 24-Feb-2014 Chad Brubaker <cbrubaker@google.com> Merge "Add the calling package name to requestRouteToHost"
627de95925b58e7602374a66ceba76200592ec11 24-Feb-2014 Sander Alewijnse <salewijnse@google.com> Merge "Enables a profile owner or device owner to set and clear default intent handler activities."
92a507986af512d248a1987971b59911406721a9 22-Feb-2014 Craig Mautner <cmautner@google.com> am 3dc57b39: am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev

* commit '3dc57b39f2a87fe3692b5606de2b0c0693fc485c':
Fixes for ActivityView on home activity
c004c9a87f0d4afa3a01f39922ad934def93c776 22-Feb-2014 Craig Mautner <cmautner@google.com> am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev

* commit 'ffda464851008f750246f343c939d8003071cd23':
Fixes for ActivityView on home activity
ffda464851008f750246f343c939d8003071cd23 22-Feb-2014 Craig Mautner <cmautner@google.com> Merge "Fixes for ActivityView on home activity" into klp-modular-dev
12ff7391a10fff5107e2734d50ed0b428fb75f67 22-Feb-2014 Craig Mautner <cmautner@google.com> Fixes for ActivityView on home activity

When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.

Fixes bug 13119389.

Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
ava/com/android/server/am/ActivityStackSupervisor.java
5eb4adcbda0ff22e48716d3cf9356a9a720475b5 22-Feb-2014 Craig Mautner <cmautner@google.com> resolved conflicts for merge of d2794f5e to master

Change-Id: I24339e45e5fc697abf294286e2d6b57620ed9d1a
21c09e8a58982531f69dcbce760be42528bc9f9d 22-Feb-2014 Craig Mautner <cmautner@google.com> am f0f45452: Merge "Reset deferred task removal when app token added." into klp-modular-dev

* commit 'f0f454522ae5024645a292596e644c6f7a06853c':
Reset deferred task removal when app token added.
f0f454522ae5024645a292596e644c6f7a06853c 22-Feb-2014 Craig Mautner <cmautner@google.com> Merge "Reset deferred task removal when app token added." into klp-modular-dev
4418372b21e91f6d4b9e11931dd87a90a023d79e 22-Feb-2014 Greg Hackmann <ghackmann@google.com> am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp

* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
42bf39edbdad19f51497938d0a3469dd772f19e8 22-Feb-2014 Craig Mautner <cmautner@google.com> Reset deferred task removal when app token added.

A task is scheduled for deletion after the final activity has
been removed and has animated away. But if another activity is then
added to the task the deletion flag must be reset.

Also added improved debugging.

Fixes bug 12987986.

Change-Id: I207ea6e9592a9e036d67aa5d1465b4acc5bdd120
ava/com/android/server/wm/Task.java
ava/com/android/server/wm/WindowManagerService.java
0cab896a987f6687affd5c50c3bdbe10745c8dff 22-Feb-2014 Greg Hackmann <ghackmann@google.com> resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp

Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
c023453a2b79b338aea36b48fd610a099379d34c 14-Feb-2014 Chad Brubaker <cbrubaker@google.com> Only allow System apps to make VPN exempt routes

requestRouteToHost will only allow system applications to make routes
exempt from the VPN's routing rules.

If a VPN is currently running and a non-system app requests a route it
will only succeed if that host is currently covered by a VPN exempt
routing rule. Otherwise it will fail.

For example, if a VPN is running and the MMS network is brought online
those routes will be added as VPN exempt. If an application then tries
to request a route to a MMS endpoint it will succeed because the routes
already exist. If an application tries to request a route to a host
covered by the VPN the call will fail.

Bug: 12937545
Change-Id: If7bcec91bbb96c62c8fb69748c975847e6c00b6f
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Vpn.java
d98fff4a02c50d999190bb68e5a9566f56221848 21-Feb-2014 JP Abgrall <jpa@google.com> Merge "ConnectivityService: add support to set TCP initial rwnd"
32d1ac4d45c25180cb841664986398c7e23995e4 21-Feb-2014 JP Abgrall <jpa@google.com> ConnectivityService: add support to set TCP initial rwnd

The value for the TCP initial receive window comes from,
in order,

kernel
/proc/sys/net/ipv4/tcp_default_init_rwnd

init.rc (via properties)
net.tcp.default_init_rwnd

properties
net.tcp.default_init_rwnd

gservices
Settings.Global.TCP_DEFAULT_INIT_RWND

Bug: 12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
ava/com/android/server/ConnectivityService.java
ae39c6283b4f2a0166a604e16aeb099d2347921a 21-Feb-2014 Craig Mautner <cmautner@google.com> am c72f5c2d: am ec5c3b90: am c2c0a61c: Add copyright notice to files missing them.

* commit 'c72f5c2de565ab3c46176155f3414cc154b5df39':
Add copyright notice to files missing them.
ec5c3b9040625e53e3f5cff1fe3d963b936065f0 21-Feb-2014 Craig Mautner <cmautner@google.com> am c2c0a61c: Add copyright notice to files missing them.

* commit 'c2c0a61cf5f779b4726f089f28d966c03ccbba54':
Add copyright notice to files missing them.
f475ca33d9232785710aaa438f17915029dfa83b 17-Feb-2014 Sander Alewijnse <salewijnse@google.com> Enables a profile owner or device owner to set and clear default intent handler activities.

Those intent handlers are persistent preferences. They will remain the default intent
handler even if the set of potential event handlers for the intent filter changes
and if the intent preferences are reset.

Change-Id: Id0cfae46f93c10d89e441f272096a205ec518dd0
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/PersistentPreferredActivity.java
ava/com/android/server/pm/PersistentPreferredIntentResolver.java
ava/com/android/server/pm/Settings.java
17ab38f8a87bc90eab11373f878f220ce3031de6 27-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make AssetAtlasService 64-bit compatible

Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>

(cherry-picked from 4de3f481bc59ab4b766dc027e41aff7cda9d62f7)

Change-Id: If22daf40eef46f8df9f94d65ddcc52c45b3acf2a
ava/com/android/server/AssetAtlasService.java
ni/com_android_server_AssetAtlasService.cpp
c2c0a61cf5f779b4726f089f28d966c03ccbba54 21-Feb-2014 Craig Mautner <cmautner@google.com> Add copyright notice to files missing them.

Fixes bug 13121968.

Change-Id: Ifd86581178e7e98bd72b832020e7c8379d40b2de
ava/com/android/server/am/CompatModePackages.java
ava/com/android/server/notification/NotificationManagerInternal.java
ava/com/android/server/wm/AppWindowAnimator.java
ava/com/android/server/wm/DimLayer.java
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowStateAnimator.java
e1abfdf711ce9ff3b15ff1b4d86531f5a8dd3dec 21-Feb-2014 Craig Mautner <cmautner@google.com> am 6222a8ef: am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev

* commit '6222a8ef853609ea9c0f725c2412a2d25968d9da':
Set the new SurfaceControl opaque flag.
709efec60deabf5a4260963e2b4c8e21f0428fc3 21-Feb-2014 Craig Mautner <cmautner@google.com> am 56dbf7b0: am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev

* commit '56dbf7b092826b1cef42357bda422baf18d2292c':
Resize DimLayer explicitly on rotation.
d429710f8edf6aeacb79c2f8ae8a6dc404173c42 21-Feb-2014 Michael Wright <michaelwr@google.com> Merge "Unbreak manual brightness setting."
ac8bdfe4f06367e06e43d8759b6009b483a5e668 21-Feb-2014 Jeff Brown <jeffbrown@google.com> Merge "resolved conflicts for merge of baaa080b to master"
10102e4c0e501333a12b38a5cfe709d1558d84dd 21-Feb-2014 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of baaa080b to master

Change-Id: I3ee12321e298f7a2ea577a99f30c49f3bb497fae
5c977ea1b78046e54f9975c78290316fcc2d630a 19-Feb-2014 Michael Wright <michaelwr@google.com> Unbreak manual brightness setting.

Change-Id: I0ba5b82f60eacd66db0dcf4166e9a919ee06f2e0
ava/com/android/server/power/DisplayPowerController.java
0e3b52e5e89ddebeba83ff9ee4360422293c2ee8 21-Feb-2014 Ben Gruver <bgruv@google.com> Merge "Add ability to match intents based on the package name of the intent sender"
1a405db22a2ade6b745f3e1cf93ba0c54b048d95 21-Feb-2014 Amith Yamasani <yamasani@google.com> Merge "Abort removing account if prohibited by policy"
5934dbc9f12936b7faf592660a28b4bbcff0cdd0 21-Feb-2014 Amith Yamasani <yamasani@google.com> Abort removing account if prohibited by policy

Bug: 13077993

If an EDU device was marked as prohibited from adding/removing accounts, it was throwing
an error but still continuing to remove the account. This fixes the problem by aborting
the removeAccount steps.

Change-Id: Ie7f157c5397a7391aab6f37c8a4331479f1b451b
ava/com/android/server/accounts/AccountManagerService.java
1648f042f31df54c25a725c4c5ca2c852a10ef0e 20-Feb-2014 Craig Mautner <cmautner@google.com> am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev

* commit 'fd8a8ccbb79b3d83bb328d64c544c59251eef151':
Set the new SurfaceControl opaque flag.
3519530fae3584c74db294ab11814f94b966d419 20-Feb-2014 Craig Mautner <cmautner@google.com> am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev

* commit '267b37ceff64b6adaeef52e3a582f1186144f93e':
Resize DimLayer explicitly on rotation.
fd8a8ccbb79b3d83bb328d64c544c59251eef151 20-Feb-2014 Craig Mautner <cmautner@google.com> Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
267b37ceff64b6adaeef52e3a582f1186144f93e 20-Feb-2014 Craig Mautner <cmautner@google.com> Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
902945d1518a8a3b987dd2afdae790cf942b20ec 20-Feb-2014 Craig Mautner <cmautner@google.com> Resize DimLayer explicitly on rotation.

Using the alpha value to trigger a resizing of the DimLayer was a
Bad Idea. The alpha value should reflect the true alpha value and
not be used to trick the code. Actually changing the size and
position is a Better Idea.

Fixes bug 13101776.

Change-Id: I11c16b8276919ea85960fe87bb17c0956ce8a3b1
ava/com/android/server/wm/DimLayer.java
90506a41c6b85cf7e65b663480e4fe003a99c8c2 20-Feb-2014 Jeff Brown <jeffbrown@google.com> am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev

* commit '07e6d1b9a5f81ff5a5bf91f2b260ee487d5f2b65':
Add a new "doze mode" based on Dream components.
2687550272ba061448f5d5b914700dc335299ee7 31-Jan-2014 Jeff Brown <jeffbrown@google.com> Add a new "doze mode" based on Dream components.

When a doze component has been specified in a config.xml resource
overlay, the power manager will try to start a preconfigured dream
whenever it would have otherwise gone to sleep and turned the
screen off. The dream should render whatever it intends to show
then call startDozing() to tell the power manager to put the display
into a low power "doze" state and allow the application processor
to be suspended. The dream may wake up periodically using the
alarm manager or other features to update the contents of the display.

Added several new config.xml resources related to dreams and dozing.
In particular for dozing there are two new resources that pertain to
decoupling auto-suspend mode and interactive mode from the display
state. This is a requirement to enable the application processor
and other components to be suspended while dozing. Most devices
do not support these features today.

Consolidated the power manager's NAPPING and DREAMING states into one
to simplify the logic. The NAPPING state was mostly superfluous
and simply indicated that the power manager should attempt to start
a new dream. This state is now tracked in the mSandmanSummoned field.

Added a new DOZING state which is analoguous to DREAMING. The normal
state transition is now: AWAKE -> DREAMING -> DOZING -> ASLEEP.
The PowerManager.goToSleep() method now enters the DOZING state instead
of immediately going to sleep.

While in the doze state, the screen remains on. However, we actually
tell the rest of the system that the screen is off. This is somewhat
unfortunate but much of the system makes inappropriate assumptions
about what it means for the screen to be on or off. In particular,
screen on is usually taken to indicate an interactive state where
the user is present but that's not at all true for dozing (and is
only sometimes true while dreaming). We will probably need to add
some more precise externally visible states at some point.

The DozeHardware interface encapsulates a generic microcontroller
interface to allow a doze dream for off-loading rendering or other
functions while dozing. If the device possesses an MCU HAL for dozing
then it is exposed to the DreamService here.

Removed a number of catch blocks in DreamService that caught Throwable
and attempted to cause the dream to finish itself. We actually just
want to let the process crash. Cleanup will happen automatically if
needed. Catching these exceptions results in mysterious undefined
behavior and broken dreams.

Bug: 12494706
Change-Id: Ie78336b37dde7250d1ce65b3d367879e3bfb2b8b
ava/com/android/server/dreams/DreamController.java
ava/com/android/server/dreams/DreamManagerService.java
ava/com/android/server/dreams/McuHal.java
ava/com/android/server/input/InputManagerService.java
ava/com/android/server/power/DisplayPowerController.java
ava/com/android/server/power/DisplayPowerRequest.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/wm/InputMonitor.java
ni/Android.mk
ni/com_android_server_dreams_McuHal.cpp
ni/com_android_server_input_InputManagerService.cpp
ni/onload.cpp
520a5673fbe8bff90954045b24a361982861ef8d 20-Feb-2014 Narayan Kamath <narayan@google.com> am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"

* commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf':
AArch64: Make AssetAtlasService 64-bit compatible
b88a904dfe719a8cbb0b9d73cb4637c22a1deed4 20-Feb-2014 Dan Stoza <stoza@google.com> Merge "Allow disabling layer rotation during screenshots"
332886854438809e956fb232b69879e33b5dc2bb 20-Feb-2014 RoboErik <epastern@google.com> Merge "Initial round of MediaSession APIs"
01fe661ae5da3739215d93922412df4b24c859a2 13-Feb-2014 RoboErik <epastern@google.com> Initial round of MediaSession APIs

This is far from complete but puts the basic components in place
for an app to interact with media sessions.

Change-Id: Icfe313f90ad76ae56badbe42b0e43fc5f68db36f
ava/com/android/server/media/MediaSessionRecord.java
ava/com/android/server/media/MediaSessionService.java
a1cd90bc8fe1aacf253a43c9d0167f92844f47e9 19-Feb-2014 Patrick Tjin <pattjin@google.com> Merge "Modify unexpected mtu debug message to print mtu"
a45610fc1f767d014c0773a910e3e6a1a280db5d 19-Feb-2014 Patrick Tjin <pattjin@google.com> Modify unexpected mtu debug message to print mtu

Change-Id: Iacc78582c5e3d6b156e8e2eda25e89e0e5be6eda
ava/com/android/server/ConnectivityService.java
a78068e7a3af53cc2b590902f74074d1781513da 19-Feb-2014 Adam Lesinski <adamlesinski@google.com> am 13c83996: am 1c532c2e: am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev

* commit '13c839962e246517a7a95326610ea30c529d79dc':
Make UsbService optional
55b8ddc30386ec15073304b1f9fabc7eb789f52e 19-Feb-2014 Adam Lesinski <adamlesinski@google.com> am 0817d16c: am 04520a01: am 6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev

* commit '0817d16c539ca6b499da9f807e8ac6988233e9c3':
Add fastpath for single signature comparison
1c532c2e2d8464ef7ddd0cc5914f3b1ab2dc49c2 19-Feb-2014 Adam Lesinski <adamlesinski@google.com> am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev

* commit '4b07b26e8654df52ca80bb2165ebdf9352ab9337':
Make UsbService optional
04520a01b8469729379e73a7995a188ffea2b187 19-Feb-2014 Adam Lesinski <adamlesinski@google.com> am 6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev

* commit '6feaa267a585f22595f846c9e3d09a76dc3db47a':
Add fastpath for single signature comparison
4b07b26e8654df52ca80bb2165ebdf9352ab9337 19-Feb-2014 Adam Lesinski <adamlesinski@google.com> Merge "Make UsbService optional" into klp-modular-dev
f81daa986e3a2d75c6f2398a59b965790484e0a2 14-Feb-2014 Chad Brubaker <cbrubaker@google.com> Add the calling package name to requestRouteToHost

The calling package name will be used to check if an application is a
system application when deciding if a route should be exempt from VPN
routing rules.

Bug: 12937545
Change-Id: I2c09c875fe9bb9685871a0a801ddcbb32fc17405
ava/com/android/server/ConnectivityService.java
08c9db7363a45e2e86f3f69f52758c37775cea7e 19-Feb-2014 Craig Mautner <cmautner@google.com> am 6ed1c96b: am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."

* commit '6ed1c96b7253d2590ffe339714bdcaf8c77217c0':
A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
a1baf0288407c17737cf92bba5c7fccb8c8c55ed 19-Feb-2014 Craig Mautner <cmautner@google.com> am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."

* commit '23ef1b5e0b84e3bb726454b97846f91f2efad212':
A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
83b34efe9e7ae803e213889d67f01032282e1614 19-Feb-2014 Dan Sandler <dsandler@android.com> Merge "Make some notifications public (safe for secure lockscreens):"
71dd1b63436e9cdd5cbd2d42cd5841d497da8238 19-Feb-2014 Craig Mautner <cmautner@google.com> Set the new SurfaceControl opaque flag.

Converts surfaces from transparent to opaque and opaque to transparent
without creating a new surface. Uses the new SurfaceControl.setOpaque
method.

Fixes bug 12387406.

Change-Id: I669c064e622e211b00b1585183a488d5b3f4b778
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
f5b3a01e54d9b2e496f865e05b18f9455b0b8038 19-Feb-2014 Adam Lesinski <adamlesinski@google.com> Add fastpath for single signature comparison

PackageManager does not need to create a hash set
when comparing two sets of signatures, where each set
contains one signature. This is the common case for
most applications.

Bug:13029313
Change-Id: I61883d85960db7b376e234d7abae6149c4d20245
ava/com/android/server/pm/PackageManagerService.java
2cb6c60c0d2de3bc743c043aca963db6fe52662f 15-Feb-2014 Adam Lesinski <adamlesinski@google.com> Make UsbService optional

Tweaked the services Android.mk to build dependencies
when building with mm[m].

Change-Id: I6dad511c652bcacc085f27ede5f8f22a6982c6bd
ava/com/android/server/usb/UsbDebuggingManager.java
ava/com/android/server/usb/UsbDeviceManager.java
ava/com/android/server/usb/UsbHostManager.java
ava/com/android/server/usb/UsbService.java
ava/com/android/server/usb/UsbSettingsManager.java
ca1bf21c511dc7d513b631a1af8498b5b08d107a 14-Feb-2014 Dianne Hackborn <hackbod@google.com> Implement wifi part of issue #12973036: Improve power_profile.xml

Add battery stats tracking of wifi state.

Also update when we retrieve the current time to use a more
consistent value across stats tracking.

Change-Id: I6a7c3efd58ff2c8ea86dac141c8f848e7996d63f
ava/com/android/server/am/BatteryStatsService.java
e62c4a10cbcf6946d505470d8cc44c6855c679b3 18-Feb-2014 Jeff Sharkey <jsharkey@android.com> am ab528077: am 37d894a4: am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"

* commit 'ab5280776f40c473228d3e920771a41289ed7fee':
Structure device not freed in error case
d3b21393bfdd9adb6d5936f1f6c04b7c410261de 18-Feb-2014 Jeff Sharkey <jsharkey@android.com> am fef3dd01: am 41185c84: am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"

* commit 'fef3dd01fbad923bf7ff509f4ee95312fd7cb4db':
Tethering: Skip link local addresses when enabling NAT
9a41b24c8f7768d3402256dbd876024f33b1f36b 18-Feb-2014 Jeff Sharkey <jsharkey@android.com> am 392ee12f: am 96190f1c: am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"

* commit '392ee12fd57870e1e8f0777d03295b0435babd1f':
Fix, MountService now only sends one onShutDownComplete
37d894a42b5744e3e5def5fbfcc641fe3afa2063 18-Feb-2014 Jeff Sharkey <jsharkey@android.com> am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"

* commit '660a514e80e0019d8c6632e84bd03491722fc2ab':
Structure device not freed in error case
41185c844fa7986ff3e5daa4c11288f6bed1463b 18-Feb-2014 Jeff Sharkey <jsharkey@android.com> am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"

* commit 'df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
Tethering: Skip link local addresses when enabling NAT
96190f1c054e2e34ac741de1d7afb2f6645d218c 18-Feb-2014 Jeff Sharkey <jsharkey@android.com> am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"

* commit 'e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
Fix, MountService now only sends one onShutDownComplete
16ec12ae77fdd2b09ea0ea0885ac52f11bd32c59 15-Feb-2014 Dan Stoza <stoza@google.com> Allow disabling layer rotation during screenshots

Add the ability to ignore layers' transformation matrices during
screenshot capture, which will allow the window manager to capture
unrotated images for recents during the device rotation animation.

Bug: 11805195
Change-Id: I96e65506b198d34724eb3aa84815aae6f6de4935
ava/com/android/server/wm/WindowManagerService.java
4f4161442d1ac6c1a519a06df0e4efeab3072195 15-Feb-2014 Ben Gruver <bgruv@google.com> am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory"

* commit 'da37944785c47b2b92c1a0f79c5d602256859fe6':
Check the return value of listFiles on the ifw directory
0a18029075fbe5e5da396c66ef26cfa7e7f1a082 13-Feb-2014 Paul Lawrence <paullawrence@google.com> Clean up a few minor issues

Make public some constants, remove unused imports.

See https://googleplex-android-review.git.corp.google.com/#/c/412885/
for when these were introduced.

Change-Id: I90d0e33a411ebdd84c36e3d9afae70d2f2847538
ava/com/android/server/MountService.java
a9f387bdf0a836de8bcb12a46a5cdfcb544fbb1a 14-Feb-2014 Paul Lawrence <paullawrence@google.com> Merge "Support default, pattern, pin and password encryption types"
88aaef71289177644f723d3d0f20f34a6f9b3d2c 14-Feb-2014 Jeff Brown <jeffbrown@google.com> am ce0552f3: am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern.

* commit 'ce0552f360d8c8f0bc45095293be369800ce9c93':
Refactor dream manager to new pattern.
8a4c2bb1f07cf1d971290a7310d7b71aceb71590 14-Feb-2014 Jeff Brown <jeffbrown@google.com> am 567f7ca4: Refactor dream manager to new pattern.

* commit '567f7ca424280ae957b04d4f3df690055f2d41df':
Refactor dream manager to new pattern.
567f7ca424280ae957b04d4f3df690055f2d41df 31-Jan-2014 Jeff Brown <jeffbrown@google.com> Refactor dream manager to new pattern.

Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
ava/com/android/server/dreams/DreamManagerService.java
ava/com/android/server/power/PowerManagerService.java
bcf12b302cd2715de54493808b2503de05c53757 11-Feb-2014 Chad Brubaker <cbrubaker@google.com> Remove SO_BINDTODEVICE from VPN protect

SO_BINDTODEVICE is not needed with policy routing.
SO_BINDTODEVICE was also used on the default iface which causes problems
when the default iface is IPv6 only and the socket tries to connect to a
IPv4 address.

Bug: 12940882
Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
ava/com/android/server/ConnectivityService.java
ava/com/android/server/connectivity/Vpn.java
ni/com_android_server_connectivity_Vpn.cpp
d63b4314b85e982a1d70d4064af59851f476dd36 13-Feb-2014 David Christie <dnchrist@google.com> Merge "Log history of location requests in LocationManager. -Assists with debugging power issues. Bug: 12824233"
6b1a93fcb9551730583f1d3ea36dbfd5589859f3 13-Feb-2014 Craig Mautner <cmautner@google.com> am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev

* commit '3816fa8beec3592360bf4ec1c4dde22c271b17f9':
Don't null class member before using it.
21ab13ff743fda1cec1923a8dec6b5553a514759 13-Feb-2014 Craig Mautner <cmautner@google.com> am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev

* commit '474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
Don't null class member before using it.
474f1fbe8d87563909c3cb69ec921d427cd1f0b0 13-Feb-2014 Craig Mautner <cmautner@google.com> Merge "Don't null class member before using it." into klp-modular-dev
3e5ce55fdeb67271d6a32042ab14cf523446cc09 13-Feb-2014 Craig Mautner <cmautner@google.com> am 4dd83975: am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev

* commit '4dd839756ce032cb6db613f08b9a28e5cd20bbe9':
Update DimLayer sizes on rotation.
991146f8ef2ba3e5610191b82a6144013ce7e8c1 13-Feb-2014 Craig Mautner <cmautner@google.com> Don't null class member before using it.

Changing the order of detachStack() and usage of mDisplayContent
fixes NPE.

Fixes bug 12823709.

Change-Id: I04760b1d6fd5d3ffc49b99ca4acb47bf7e61cb46
ava/com/android/server/wm/TaskStack.java
d14fa78dc84507fbdee8507205a3aff40296d328 13-Feb-2014 Craig Mautner <cmautner@google.com> am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev

* commit '0af894d25133890e7765e6c582b3ac4829070de8':
Update DimLayer sizes on rotation.
0af894d25133890e7765e6c582b3ac4829070de8 13-Feb-2014 Craig Mautner <cmautner@google.com> Merge "Update DimLayer sizes on rotation." into klp-modular-dev
b660b9d8cf6b951b85a35599d636c470795e9a1a 13-Feb-2014 Craig Mautner <cmautner@google.com> Update DimLayer sizes on rotation.

Required replumbing and updating the TaskStack bounds calculations
to match the new separation of TaskStack from DisplayContent.

Fixes bug 12780687.

Change-Id: I061c92831c06f4eb3e673ad6296e721b0c0f3202
ava/com/android/server/wm/DimLayer.java
ava/com/android/server/wm/DisplayContent.java
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/WindowManagerService.java
d39ccd0ad9cb562b0093eaf78a5273b000c0aa7a 13-Feb-2014 Dianne Hackborn <hackbod@google.com> Merge "Start tracking radio up time."
e13c4c0b664dabdc069ca8f9601d96a337eb02f9 12-Feb-2014 Dianne Hackborn <hackbod@google.com> Start tracking radio up time.

We now always turn on network state tracking for mobile,
and push this information down to battery stats.

In battery stats we use this to both log the changes in
the history and keep track of the total time the mobile
radio was active.

Power computation is switched over to using this information
to help determine power use, which will hopefully make it
more accurate (not counting inaccuracies in knowing when it
actually goes down).

Note yet done is aggregating this data per-uid, to better
emphasize which apps are causing the radio to be up. Right
now we just spread the total time across all uids weighted
by the total number of packets they have sent and received.

Also put in the battery stats infrastructure for bluetooth to
address issue #12973036: Improve power_profile.xml

Change-Id: I39d11b7ff6ae4f336f253d1cba308d8569de7e0d
ava/com/android/server/ConnectivityService.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/am/BatteryStatsService.java
d430354c6b6b3b39c35e8af90007414c325ccb2d 13-Feb-2014 Andreas Huber <andih@google.com> Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.""
9ae000ca8c05ad6f700ad7bf119bbc92fb964b57 13-Feb-2014 Andreas Huber <andih@google.com> Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."

This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
ni/Android.mk
04f0cab79d1499a5fe27330bb30dd94151b82880 13-Feb-2014 Andreas Huber <andih@google.com> Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
8e39736f91a08961cf59c87075e61d9026833b50 28-Jan-2014 Paul Lawrence <paullawrence@google.com> Support default, pattern, pin and password encryption types

Java plumbing to expose methods to get/set encryption type in
IMountService, and hooking up of those methods to the Settings app
so the type is set correctly.

Needs matching vold changes from
https://googleplex-android-review.googlesource.com/#/c/412649/

Bug: 8769627
Change-Id: I70c0ed72d11f5ab6f0958a7f9c101b6822b13baa
ava/com/android/server/MountService.java
005151484546fb0bf7f83c5a6ee065715230bf26 13-Feb-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 396b9e79 to master

Change-Id: Ie71a79699be57f5af6069559068bf6253835d805
27bf55c8159e7f883ddc839453d5a12374ddc50a 13-Feb-2014 Wink Saville <wink@google.com> am 16c0b295: am bba3a694: Merge "Telephony API extension v2"

* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
Telephony API extension v2
1c5010a566c4d03eba714dc5d1a187b91973a549 13-Feb-2014 Craig Mautner <cmautner@google.com> am f24ee132: am d3df99c4: am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev

* commit 'f24ee13254b544b7e73ea1b28facc1996b8185ab':
Add debug for 12987986.
639c8becc6d0efe9c205f3abf1e9347464a95020 18-Jan-2014 Michael Wright <michaelwr@google.com> Extract automatic brightness strategy

Pull the strategy for determining the automatic brightness levels
into its own class. This cleans up DisplayPowerController a bit and
lets us experiment with different automatic brightness strategies
more easily.

Change-Id: I8f4249da511e38f63260dbef81f97f5507aac948
ava/com/android/server/power/AutomaticBrightnessController.java
ava/com/android/server/power/DisplayPowerController.java
ava/com/android/server/power/DisplayPowerRequest.java
41a5cdf9862d4fa77153656e677567e707aa1d45 14-Nov-2013 Michael Wright <michaelwr@google.com> New ambient light level filtering for automatic brightness

This new filtering method maintains a ring buffer of all light sensor
measurements within the last ten seconds. Once all of the
measurements are either above the brightening threshold or below the
darkening threshold, adjust the screen brightness to the average of
the recorded measurements.

Change-Id: I012bd99f86149e02f03b05f19722aef9a07aba31
ava/com/android/server/power/DisplayPowerController.java
d3df99c474b8e267cead8382912b083b6f6ebe3d 13-Feb-2014 Craig Mautner <cmautner@google.com> am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev

* commit '4b79f8380c47b0da89348e1115ea70e7898997ca':
Add debug for 12987986.
4b79f8380c47b0da89348e1115ea70e7898997ca 13-Feb-2014 Craig Mautner <cmautner@google.com> Merge "Add debug for 12987986." into klp-modular-dev
164683221948c13fd9b652416c5cc1621df6401b 13-Feb-2014 Craig Mautner <cmautner@google.com> Add debug for 12987986.

For bug 12987986.

Change-Id: Idc122ba369ad7566e3fee290955bf91b0f610ae1
ava/com/android/server/wm/WindowManagerService.java
4cfd54eaf0106373e1fea75a1e33ac460cf7c23d 13-Feb-2014 Craig Mautner <cmautner@google.com> am 69481d54: am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev

* commit '69481d54c2c6da6ec931bb7435bddf7be1aba0af':
Don't add windows from exiting app tokens twice.
7825334929b098b36e1144872200e75ba6d24b13 07-Feb-2014 Andreas Huber <andih@google.com> Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.

AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.

Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
ni/Android.mk
b2340f3fcc2cfded97e0372a336bcf6f9211e0c1 12-Feb-2014 Ben Gruver <bgruv@google.com> Add ability to match intents based on the package name of the intent sender

Change-Id: Iaf9feececcff9188b1b02751aff6c3ab541dc73d
ava/com/android/server/firewall/IntentFirewall.java
ava/com/android/server/firewall/SenderPackageFilter.java
d5c8044e7e1f1402fdd4a035690329294ab07b33 12-Feb-2014 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 1cbea39f to master

Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700
8dfda07dd410c1776c6b0d373229fe77c76f8cfc 12-Feb-2014 Craig Mautner <cmautner@google.com> am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev

* commit '731c30c17dac51e2279f8f789a647c61bd55028b':
Don't add windows from exiting app tokens twice.
731c30c17dac51e2279f8f789a647c61bd55028b 12-Feb-2014 Craig Mautner <cmautner@google.com> Merge "Don't add windows from exiting app tokens twice." into klp-modular-dev
ac90c19cab7e05dc8add6acbc8f74c9f854d098d 12-Feb-2014 Craig Mautner <cmautner@google.com> Don't add windows from exiting app tokens twice.

If an apptoken's removal has been delayed then it will be in both
mExitingAppTokens and the stack's tasks. When rebuilding the windows
the windows from that apptoken will get added twice. This change
skips adding those windows from apptokens that have already been
added from mExitingAppTokens.

Change-Id: I55f94b7dbef36aeacb390b91fbe82426eaac5458
ava/com/android/server/wm/WindowManagerService.java
ae5708db9d02433027f4574f912def6558805642 12-Feb-2014 John Spurlock <jspurlock@google.com> am c4aee98a: Improve error handling in listener services.

* commit 'c4aee98a62f400dd9f6f964d26d739d409212775':
Improve error handling in listener services.
c4aee98a62f400dd9f6f964d26d739d409212775 12-Feb-2014 John Spurlock <jspurlock@google.com> Improve error handling in listener services.

Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.

Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound. Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.

Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes. That is, silently fail (or return null) - and provide a
log warning.

Bug:12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
ava/com/android/server/notification/NotificationManagerService.java
a447947e2ea9fc5ad4e3651a38de6fadb89afbd8 12-Feb-2014 John Spurlock <jspurlock@google.com> Merge "Improve error handling in listener services."
dd3d95f182a634acdcc1b1e8e4954234d048eb54 12-Feb-2014 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp

Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
da9a3bed8e1aa7d7867291a123466bb0a3be5bb0 12-Feb-2014 John Spurlock <jspurlock@google.com> Improve error handling in listener services.

Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.

Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound. Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.

Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes. That is, silently fail (or return null) - and provide a
log warning.

Bug:12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
ava/com/android/server/notification/NotificationManagerService.java
be83e4a08e909b773ffc06a6e59446deadb8af8b 12-Feb-2014 Jeff Brown <jeffbrown@google.com> am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE)

* commit '38f96e5020b3e82b98fe97b0be363a5ad185860f':
Add support for injecting events into ActivityContainers. (DO NOT MERGE)
ca9bc702df5c14a89c9b8b0109a05894bf74962e 11-Feb-2014 Jeff Brown <jeffbrown@google.com> Add support for injecting events into ActivityContainers.

Modified ActivityView to inject touch events it receives back into
its activity container. The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Change-Id: I23d018a2f7dd30f1f833f522eb7f143b43d8e637
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/input/InputManagerService.java
ni/com_android_server_input_InputManagerService.cpp
38f96e5020b3e82b98fe97b0be363a5ad185860f 11-Feb-2014 Jeff Brown <jeffbrown@google.com> Add support for injecting events into ActivityContainers. (DO NOT MERGE)

Modified ActivityView to inject touch events it receives back into
its activity container. The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.

Change-Id: I9cf1870db3be6f99a52ed9a1e3ceafe42c940093
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/input/InputManagerService.java
ni/com_android_server_input_InputManagerService.cpp
7b0e2827153752ae51c3ae80746e42ee185e7358 11-Feb-2014 Jeff Sharkey <jsharkey@android.com> Merge "First <provider> always wins."
c6809bb6853c6f055905cbbbf873bbe4066c5d21 11-Feb-2014 Jeff Sharkey <jsharkey@android.com> First <provider> always wins.

In scanPackageLI(), the first provider to claim an authority wins
over any other later providers. To match this behavior, this changes
ProviderIntentResolver to ignore later providers with the same
ComponentName.

Without this behavior, AM.getContentProvider() could end up wedged
waiting for a provider that generateApplicationProvidersLocked()
never decided to spin up.

Bug: 12956224
Change-Id: I37d3e6e9cf3eea2cac4c0e914134f6c83b2fc2bf
ava/com/android/server/pm/PackageManagerService.java
826e51c4da2beac50c0ed1e1359787a0b69c878c 11-Feb-2014 Kenny Guy <kennyguy@google.com> Merge "Add concepts of related users and managed profiles to user manager."
0d148c8b4ed94891d00acf20aa724493629970e9 11-Feb-2014 Michael Wright <michaelwr@google.com> Merge "Move inputservice over to frameworks/native"
d6b473713f43dec0828971854fe1018642cfaf27 11-Feb-2014 Michael Wright <michaelwr@google.com> Move inputservice over to frameworks/native

Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Try 2.

Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed
ni/Android.mk
ni/com_android_server_input_InputApplicationHandle.h
ni/com_android_server_input_InputManagerService.cpp
ni/com_android_server_input_InputWindowHandle.h
ni/com_android_server_power_PowerManagerService.h
7f258f970e2123131638665c9d6674a7e1c7e4ea 11-Feb-2014 Narayan Kamath <narayan@google.com> am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService"

* commit 'a9d171bd5bab29feaef409489ed23d3c490285ce':
Use long to store pointers in ConsumerIrService
a9d171bd5bab29feaef409489ed23d3c490285ce 11-Feb-2014 Narayan Kamath <narayan@google.com> am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService"

* commit '5c770dfba2846ee173d147fd974f8e9f073c1534':
Use long to store pointers in ConsumerIrService
a52dc3eb40777b055c0ca8d7885bd2c9577bcd1a 11-Feb-2014 Kenny Guy <kennyguy@google.com> Add concepts of related users and managed profiles to user manager.

Related users are a group that will share things like notifications.
Managed profiles are a profile of another user.

Change-Id: I2d0532f1abf939810f0fa3fc7c77ad13fa567833
ava/com/android/server/pm/UserManagerService.java
cab8617b8ccea3a99b1ee15e15915c512a10c738 11-Feb-2014 Jeff Brown <jeffbrown@google.com> am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev

* commit '25df673b849de374cf1de40250dfd8a48b7ac28b':
Make SystemService constructor take a Context.
25df673b849de374cf1de40250dfd8a48b7ac28b 11-Feb-2014 Jeff Brown <jeffbrown@google.com> am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev

* commit '1b51c9cb96fe2a0818289857a016521eed1ec183':
Make SystemService constructor take a Context.
1b51c9cb96fe2a0818289857a016521eed1ec183 11-Feb-2014 Jeff Brown <jeffbrown@google.com> Merge "Make SystemService constructor take a Context." into klp-modular-dev
b880d880c6cd989eacc28c365fc9a41d31900da1 11-Feb-2014 Jeff Brown <jeffbrown@google.com> Make SystemService constructor take a Context.

This change simplifies the process of initializing a SystemService
by folding the onCreate() step back into the constructor. It removes
some ambuiguity about what work should happen in the constructor and
should make it possible for services to retain most of their final
fields after refactoring into the new pattern.

Change-Id: I25f41af0321bc01898658ab44b369f9c5d16800b
ava/com/android/server/AlarmManagerService.java
ava/com/android/server/UiModeManagerService.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/lights/LightsService.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/pm/Installer.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/storage/DeviceStorageMonitorService.java
ava/com/android/server/twilight/TwilightService.java
33fa09b1ffe8d14d146de4b2632103d831ff8988 11-Feb-2014 Craig Mautner <cmautner@google.com> am 2d6b55aa: am 312ba86b: Change task removal sequence

* commit '2d6b55aaa9dd03f7d934f7a192989513b1087357':
Change task removal sequence
2d6b55aaa9dd03f7d934f7a192989513b1087357 11-Feb-2014 Craig Mautner <cmautner@google.com> am 312ba86b: Change task removal sequence

* commit '312ba86b476fa1d83864a7d465135cc9a4e94ad8':
Change task removal sequence
312ba86b476fa1d83864a7d465135cc9a4e94ad8 11-Feb-2014 Craig Mautner <cmautner@google.com> Change task removal sequence

- Remove task after removing activity. Removing the task before
removing the activity led to problems when the task was still needed.

- In WindowManager wait for activity manager to remove the task.
Previously was automatically removing the task when the last activity
was removed.

Fixes bug 12957434.

Change-Id: I7f6b1f09a2e2a845f177f337769075c9376f8bdb
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/wm/WindowManagerService.java
7f477021a1887fd5681d92b3575310125d2ffa90 11-Feb-2014 Dianne Hackborn <hackbod@google.com> Merge "Maybe fix issue #12957738: SecurityException in..."
f52fd37826e759930329fed7bf8a20494edcaff2 11-Feb-2014 Michael Wright <michaelwr@google.com> Merge "Revert "Move inputservice over to frameworks/native""
453fa30ab2dbff5934e551323763200fac96d723 11-Feb-2014 Michael Wright <michaelwr@google.com> Revert "Move inputservice over to frameworks/native"

This reverts commit 89e5c7ebb37fabc4368e87e17a502db62598bd61.
ni/Android.mk
ni/com_android_server_input_InputApplicationHandle.h
ni/com_android_server_input_InputManagerService.cpp
ni/com_android_server_input_InputWindowHandle.h
740dfefcfcba7a254e65bda3ac0d965ca161458b 10-Feb-2014 Michael Wright <michaelwr@google.com> Merge "Move inputservice over to frameworks/native"
943c05f327ac090a9d13b497957df96449d1aacf 10-Feb-2014 Michael Wright <michaelwr@google.com> Merge "Remove SkRegion dependency from libinput"
89e5c7ebb37fabc4368e87e17a502db62598bd61 10-Feb-2014 Michael Wright <michaelwr@google.com> Move inputservice over to frameworks/native

Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Change-Id: Iebef71f3030fb3d26a5f338eb66d75bb37c17734
ni/Android.mk
ni/com_android_server_input_InputApplicationHandle.h
ni/com_android_server_input_InputManagerService.cpp
ni/com_android_server_input_InputWindowHandle.h
9358dcca6f3d33d1e3f976a4c3a5f61e103930dc 10-Feb-2014 Dianne Hackborn <hackbod@google.com> Maybe fix issue #12957738: SecurityException in...

...Multiple Processes: uid 10069 does not have
android.permission.UPDATE_DEVICE_STATS.

Change-Id: Ibabb5b09d52412df8bebdc85a584f89e175b1ec5
ava/com/android/server/am/ActivityManagerService.java
a407d6a003d746fa0aff50f7ba5da61f19a85b75 06-Feb-2014 Michael Wright <michaelwr@google.com> Remove SkRegion dependency from libinput

This gets us one step closer to removing our dependency on Skia, which is at
least one of the things blocking us from moving the input system out of
f/b.

Change-Id: I755e6267996c93fe700f1056327386923287575a
ni/com_android_server_input_InputWindowHandle.cpp
56aa06c4249efe32c82af1dc71df9701dc8f457c 10-Feb-2014 Craig Mautner <cmautner@google.com> am 779d204a: am 9ef471f7: Don\'t remove Activities and Tasks until animation done

* commit '779d204abe6a3922b572822df5cd775ffd5d77e8':
Don't remove Activities and Tasks until animation done
d8efad825df245f0b235a91fdb381b5be8248379 10-Feb-2014 Christopher Tate <ctate@android.com> am 88daefd4: am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/app"

* commit '88daefd40767695f7e8a67d1d52dfaac2ab6bdb6':
Use canonical path for /vendor/app
694a022cb613424261a9753250e1c9a20955a4cf 10-Feb-2014 Dan Sandler <dsandler@android.com> am 9e07c1c4: am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()"

* commit '9e07c1c4f333171bff6e1cf1c4408e5738bcf127':
Make sure to turn off led after pulse()
779d204abe6a3922b572822df5cd775ffd5d77e8 08-Feb-2014 Craig Mautner <cmautner@google.com> am 9ef471f7: Don\'t remove Activities and Tasks until animation done

* commit '9ef471f7f2f59de032d7cb9c3c7241486109979e':
Don't remove Activities and Tasks until animation done
88daefd40767695f7e8a67d1d52dfaac2ab6bdb6 08-Feb-2014 Christopher Tate <ctate@android.com> am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/app"

* commit '379bb6ed4ea4de035569b04018f84d7ce95a8036':
Use canonical path for /vendor/app
68ac5cef63a9fef595a0cd6b7d8f9170994672ad 07-Feb-2014 Dianne Hackborn <hackbod@google.com> Merge "Battery stats: more events, fixes."
eaf2ac464b1cd741d7d0fe700771b1b7c00ddb29 07-Feb-2014 Dianne Hackborn <hackbod@google.com> Battery stats: more events, fixes.

Add new history events for top application package and
foreground application packages.

Doing this involved a fair amount of improvement to history
events. The event code is now separated out to have "start"
and "finish" identifies, and we use that to now keep track
of which events are active. With that, when resetting the
stats, we can spit out all of the currently active events at
the front of the new history.

Also fixed some problems when I re-arranged the history delta
int bits that were conflicting with the packing of the battery
status bits. These packing structures are changed to work
together correctly.

Change-Id: Ic8b815060dd8a50ff4a0a209efc2e1044215cd88
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
9ef471f7f2f59de032d7cb9c3c7241486109979e 07-Feb-2014 Craig Mautner <cmautner@google.com> Don't remove Activities and Tasks until animation done

Just like stacks and displays, activities and tasks need to stick
around until animations have completed.

Change-Id: I54fe8f6855d60cbc3a25cbc6e762defd5ac50bf5
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/wm/AppWindowToken.java
ava/com/android/server/wm/Task.java
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
9e07c1c4f333171bff6e1cf1c4408e5738bcf127 07-Feb-2014 Dan Sandler <dsandler@android.com> am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()"

* commit '6b1f3acdf0f0806c0b3826d1c4ea43bd6cc6f021':
Make sure to turn off led after pulse()
38f7dcd7dcb5d98d86f19f3c4725aea89f9792ff 06-Feb-2014 Craig Mautner <cmautner@google.com> DO NOT MERGE. Test for Configuration differences before changing.

Changing Configuration first and then testing for changes yields a
result indicating no change.

Fixes bug 12904769.

Change-Id: If7e39e843f15b1143d9877497d595511afabd020
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
9f97de13359662c2709eed227b3fab2ce7d5dabc 06-Feb-2014 Adam Lesinski <adamlesinski@google.com> am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev

* commit 'a5a93f559d337ad5b79716b05ea43707eb779dc8':
Check feature bits before loading optional services
7f416631413e75a1756bd316a2e1906725d72f24 06-Feb-2014 Adam Lesinski <adamlesinski@google.com> Merge "Check feature bits before loading optional services" into klp-modular-dev
d1c2c5421181b988f09fd12d9633e2a7c2a8ab60 06-Feb-2014 Craig Mautner <cmautner@google.com> Test for Configuration differences before changing.

Changing Configuration first and then testing for changes yields a
result indicating no change.

Fixes bug 12904769.

Change-Id: If7e39e843f15b1143d9877497d595511afabd020
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
6428046767ee4195617fb41b5639eefa2ca7a939 09-Jan-2014 Matthew Williams <mjwilliams@google.com> Downgrade expedited to normal on reschedule.

bug: 12033540
Expedited was previously tracked by a redundant internal variable, ostensibly
as an optimisation. This variable could differ from the value in the bundle
depending on how the operation is initialised, which led to confusion. Now an
expedited sync will only be treated as such on its first execution.

Change-Id: I9979102317aecbe8bc53a36381d4b2782ac131be

Conflicts:
services/core/java/com/android/server/content/SyncOperation.java
services/core/java/com/android/server/content/SyncQueue.java
ava/com/android/server/content/SyncManager.java
ava/com/android/server/content/SyncOperation.java
ava/com/android/server/content/SyncQueue.java
ava/com/android/server/content/SyncStorageEngine.java
af04b113dcd28ae788a3ffb4a5420817cb7ed95f 06-Feb-2014 Craig Mautner <cmautner@google.com> am 14d74b82: am 1bf2b873: Defer detach until animations are complete.

* commit '14d74b82363e1a72b967590ee7118b239b276fb4':
Defer detach until animations are complete.
643ca1e9a3fba3b815534048bf4249a1f8a134b3 06-Feb-2014 Craig Mautner <cmautner@google.com> am 481b54be: am dc548483: Move activities from DisplayContent to TaskStack

* commit '481b54be1acb990bab3933b6248964e351bdcd99':
Move activities from DisplayContent to TaskStack
14d74b82363e1a72b967590ee7118b239b276fb4 06-Feb-2014 Craig Mautner <cmautner@google.com> am 1bf2b873: Defer detach until animations are complete.

* commit '1bf2b873470d2ba8a4ac218da73516cc2b20aa76':
Defer detach until animations are complete.
481b54be1acb990bab3933b6248964e351bdcd99 06-Feb-2014 Craig Mautner <cmautner@google.com> am dc548483: Move activities from DisplayContent to TaskStack

* commit 'dc548483ae90ba26ad9e2e2cb79f4673140edb49':
Move activities from DisplayContent to TaskStack
6eb0fdb99bc09210bea4df054a9c8a05daea3d1b 06-Feb-2014 Dianne Hackborn <hackbod@google.com> Merge "Improve logging of first wake lock, history size."
3d658bf20e2d56e36941e7407deebeec1276fbcf 05-Feb-2014 Dianne Hackborn <hackbod@google.com> Improve logging of first wake lock, history size.

We now try to have a better label for the first wake lock
that is acquired in the log. This is done in two ways:

- The alarm manager now sorts the alarms it is going to
execute so that wakeup alarms are first, which are more
important w.r.t. which one should be logged.
- There is a new power manager facility to make a wake lock
as "unimportant for logging," which just means in battery
stats that a wake lock acquired after that can be considered
the actual one to log. This is only used by the alarm manager
to mark its TIME_TICK alarms as unimportant for logging.

Also reworked the battery history code to be cleaner and a bit
smaller. There is no longer a separate EVENT command, instead
the event code and tag are just another thing that can be included
in an UPDATE command.

The bits used in the first history int are also re-arrange, so
that only the ones that really change a fair amount in the state
bits are up at the top and there is no longer space used for
the command code (since now it is always just UPDATE). This
allows us to have more room for the time delta at the bottom,
to better avoid situations where we need to write an int delta.

Change-Id: I1bb860ae5b558a248800b090b03a84fbf7acd68a
ava/com/android/server/AlarmManagerService.java
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/power/DisplayPowerController.java
ava/com/android/server/power/Notifier.java
1bf2b873470d2ba8a4ac218da73516cc2b20aa76 06-Feb-2014 Craig Mautner <cmautner@google.com> Defer detach until animations are complete.

Allowing the detach of ActivityStack from DisplayContent to happen
immediately was causing all sorts of problems associated with not
having a Display to complete the animations.

Waiting for animations to complete before either the detach or the
display removal fixes those problems.

Change-Id: I8a5663bfac5c3c1084ff4fcc451e0e38e8080265
ava/com/android/server/wm/DisplayContent.java
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowStateAnimator.java
dc548483ae90ba26ad9e2e2cb79f4673140edb49 05-Feb-2014 Craig Mautner <cmautner@google.com> Move activities from DisplayContent to TaskStack

Now that activities and tasks can be detached from a display do not
keep their state within the DisplayContent class. All such state is
now moved to the TaskStack class with this change.

Change-Id: Ie6b1811e9ec3f545782bad8c3461bd4f2d336b93
ava/com/android/server/wm/DimLayer.java
ava/com/android/server/wm/DisplayContent.java
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
898c13df7b9b12ff10062f3542593e12fbe0c119 29-Jan-2014 Adam Lesinski <adamlesinski@google.com> Check feature bits before loading optional services

At startup, we check with PackageManager whether a system service is
available before attempting to load it. A system service is available
if its associated feature (similar to hardware features) is present.
This does not remove unavailable services from the compiled jar.

Change-Id: I13571805083aa4e65519a74acb52efd17b9fb3d7
ndroid.mk
ava/com/android/server/SystemServer.java
ava/com/android/server/am/ActivityManagerService.java
ava/service.mk
dbe576ebd1c6bc05d17657aedb3f2feec162f2b1 05-Feb-2014 Jake Hamby <jhamby@google.com> Merge "Add new RIL commands to read/write NV items and reset NV config."
9e4adfb358ca3680288c07201efc8811472a579d 05-Feb-2014 Craig Mautner <cmautner@google.com> resolved conflicts for merge of 32360147 to master

Change-Id: I97cc95f66df50006469f8debd286966cc21edb60
323601475e15296bf7bb9a20aa0af130bc561bc2 05-Feb-2014 Craig Mautner <cmautner@google.com> am df88d730: Add IIntentSender to ActivityContainer.startActivity

* commit 'df88d73092c62a1a3cd2b2056ca63ae2e70cc238':
Add IIntentSender to ActivityContainer.startActivity
df88d73092c62a1a3cd2b2056ca63ae2e70cc238 27-Jan-2014 Craig Mautner <cmautner@google.com> Add IIntentSender to ActivityContainer.startActivity

PendingIntents and IntentSenders can now be launched. Still does not
work once the host activity has been paused and resumed.

Window manager TaskStacks now exist independently of Displays and app
windows persist after Displays are removed below them. Attaching the
stack to a new Display does not yet restore the windows to it.

Fixes bug 12747909.

Change-Id: I509007ee23fda400b353f483cf6ecce08177763b
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/PendingIntentRecord.java
ava/com/android/server/wm/DimLayer.java
ava/com/android/server/wm/DisplayContent.java
ava/com/android/server/wm/Session.java
ava/com/android/server/wm/Task.java
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
ava/com/android/server/wm/WindowStateAnimator.java
8f9b33e77686de8e917ba61c5e2f2e31a1e0e49b 15-Jan-2014 Jake Hamby <jhamby@google.com> Add new RIL commands to read/write NV items and reset NV config.

Add new RIL commands and generic code cleanups.

The only changes required for OMA DM support are the
addition of five new methods in ITelephony.aidl for
reading/writing NV items and performing NV config and
radio resets (requires MODIFY_PHONE_STATE), along with
the new RIL request IDs in RILConstants.java.

Bug: 12864208
Change-Id: I958d2571580d98a49936ef2e6822e5ac086acbe2
ava/com/android/server/ConnectivityService.java
2ff96af24de2c22a21de9b56ea8543dccdbdcb9d 31-Jan-2014 David Christie <dnchrist@google.com> Log history of location requests in LocationManager.
-Assists with debugging power issues.
Bug: 12824233

Change-Id: Iaaef0dbe00154c7668034a166587671b75d1f3c7
ava/com/android/server/LocationManagerService.java
ava/com/android/server/location/LocationRequestStatistics.java
31b4834b6d5eb1e5156950930b69221819a84766 03-Feb-2014 Christopher Tate <ctate@google.com> Merge "Introduce "IdleService" API to expose idle-time maintenance to apps"
d417d625d244356bc770e2692fd59e754a72f59f 20-Aug-2013 Christopher Tate <ctate@google.com> Introduce "IdleService" API to expose idle-time maintenance to apps

When an application wishes to do low-priority background work when the
device is otherwise idle (e.g. in a desk dock overnight), it declares
a service in its manifest that requires this permission:

android:permission="android.permission.BIND_IDLE_SERVICE

to launch, and which publishes this intent filter:

<intent-filter>
<action android:name="android.service.idle.IdleService" />
</intent-filter>

This string is declared in the API as IdleService.SERVICE_INTERFACE.

The service must be implemented by extending the new "IdleService"
class, which provides the API through which the system will communicate
with the app.

IdleService declares three methods, two of which are lifecycle callbacks
to the service, and the third of which is for the service itself to
invoke when appropriate. The lifecycle callbacks are

public abstract boolean onIdleStart();
public abstract void onIdleStop();

The first of these is a notification to the service that an idle
maintenance interval has begun. The service can then spin off
whatever non-UI work it wishes. When the interval is over, or if
the OS determines that idle services should be shut down immediately,
the onIdleStop() method will be invoked. The service must shut down
any background processing immediately when this method is called.

Both of these methods must return immediately. However, the OS
holds a wakelock on the application's behalf for the entire period
between the onIdleStart() and onIdleStop() callbacks. This means
that for system-arbitrated idle-time operation, the application does
not need to do any of its own wakelock management, and does not need
to hold any wakelock permissions.

The third method in IdleService is

public final void finishIdle();

Calling this method notifies the OS that the application has finished
whatever idle-time operation it needed to perform, and the OS is thus
free to release the wakelock and return to normal operation (or to
allow other apps to run their own idle services).

Currently the idle window granted to each idle service is ten minutes.
The OS is rather conservative about when these services are run; low
battery or any user activity will suppress them, and the OS will not
choose to run them particularly often.

Idle services are granted their execution windows in round-robin
fashion.

Bug 9680213

Change-Id: Idd6f35940c938c31b94aa4269a67870abf7125b6
ava/com/android/server/IdleMaintenanceService.java
ava/com/android/server/MountService.java
ava/com/android/server/MountServiceIdler.java
dfd1aa4331b8ab452d7baf4fdf8cf0cd36c67ddd 31-Jan-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp

Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2
945d69d7b843ed319ec98986b033ea7b86383e69 31-Jan-2014 Hui Lu <huilu@google.com> am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev

* commit '3cab7fc1b8f06166df3a58cf10d4a0db36bde788':
Add proxy as another network.
a76be8ba7ac14092669c981e76f07f97d2c3f386 31-Jan-2014 Brian Carlstrom <bdc@google.com> Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
fdb98d477047f6dfdbd9e94a7b326d35ad78c6c8 30-Jan-2014 Brian Carlstrom <bdc@google.com> frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default

(cherry picked from commit c6c633608ad4cd77ed21227b0bdb11eb79797c31)

Bug: 12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
ava/com/android/server/SystemServer.java
3cab7fc1b8f06166df3a58cf10d4a0db36bde788 30-Jan-2014 Hui Lu <huilu@google.com> Merge "Add proxy as another network." into klp-modular-dev
1c5624a0128397fa6fd6484e6a473bad10547a34 15-Jan-2014 Hui Lu <huilu@google.com> Add proxy as another network.

Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
ava/com/android/server/ConnectivityService.java
31068163b660ff041e45f35174f75106dcb47ade 30-Jan-2014 Patrick Tjin <pattjin@google.com> Formatting fix

Remove whitespace from end of Sync Status table

Change-Id: I5b0bf3380e0c67c769ec9c334f1374713c94aa94
ava/com/android/server/content/SyncManager.java
bfe61f696de3ceecda51612d3b26f20af33bc16c 30-Jan-2014 Dan Sandler <dsandler@android.com> Make some notifications public (safe for secure lockscreens):

- USB connected
- ADB enabled
- Low storage
- USB mass storage status
- Tethering status

Change-Id: I8224d7bcc8141fc90ac5e28d4392c52724c524a7
ava/com/android/server/connectivity/Tethering.java
ava/com/android/server/storage/DeviceStorageMonitorService.java
ava/com/android/server/usb/UsbDeviceManager.java
583b7b16718b2787e64f1f26e476d349b96a909a 28-Jan-2014 Narayan Kamath <narayan@google.com> am 39a789bf: am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"

* commit '39a789bf6efd5c3478a442e60e896cae371fd04c':
AArch64: Make graphics classes 64-bit compatible
e0d1e295f15a5c70ca030732fd9309f0dc50b2cc 28-Jan-2014 Craig Mautner <cmautner@google.com> am af17925f: am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"

* commit 'af17925f94c3a293022a4c41fc284a0a9312dcb6':
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
af17925f94c3a293022a4c41fc284a0a9312dcb6 28-Jan-2014 Craig Mautner <cmautner@google.com> am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"

* commit '45b68ac3a7acb7af95fdfc5c0e31560b3c28c9f8':
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
36bef0bf30d6bae48cf3837df351075ca4fce654 20-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make graphics classes 64-bit compatible

This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
AArch64: Make graphics classes 64-bit compatible

Changes in this patch include

[x] Long is used to store native pointers as they can
be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

==================================================================

AArch64: Use long for pointers in graphics/Camera

For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
ava/com/android/server/AssetAtlasService.java
ni/com_android_server_AssetAtlasService.cpp
63c92ed41ee5df6751734ce2d8a1dd46327ad3a8 27-Jan-2014 Christopher Tate <ctate@google.com> Merge "Update PackageMonitor to recognize new 'replacing' semantics"
36ca2324418f2169eb332d95190ea4c3b4dd140f 27-Jan-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Clean up dhcp no-op logging"
8b3e3ecc3d1a0ab45c02e7cb84bc7db856d21f1d 09-Jan-2014 Christopher Tate <ctate@google.com> Update PackageMonitor to recognize new 'replacing' semantics

The ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE broadcast now uses the
EXTRA_REPLACING intent extra when it is sent as part of an upgrade operation
on a forward-locked application. Update PackageMonitor to recognize this
new information and express it appropriately to the observer.

Bug 11988313

Change-Id: I34dfaa965dd322f4fa8945e7b83c9f2e8cf5269a
ava/com/android/server/pm/PackageManagerService.java
7023df08f14ec5dee76ac54c03e870f84e297636 27-Jan-2014 Narayan Kamath <narayan@google.com> Revert "AArch64: Make graphics classes 64-bit compatible"

This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976.

Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
ava/com/android/server/AssetAtlasService.java
ni/com_android_server_AssetAtlasService.cpp
18b4cbeedef21c1fa666a110a157bab66edff976 20-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make graphics classes 64-bit compatible

This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
AArch64: Make graphics classes 64-bit compatible

Changes in this patch include

[x] Long is used to store native pointers as they can
be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

==================================================================

AArch64: Use long for pointers in graphics/Camera

For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
ava/com/android/server/AssetAtlasService.java
ni/com_android_server_AssetAtlasService.cpp
921f4f926472e5f5864cae203538f47fda6cdbdf 25-Jan-2014 Craig Mautner <cmautner@google.com> am 38eda9c4: Remove unnecessary logging.

* commit '38eda9c42bf327f6f521c766ea716305e5f71c05':
Remove unnecessary logging.
38eda9c42bf327f6f521c766ea716305e5f71c05 25-Jan-2014 Craig Mautner <cmautner@google.com> Remove unnecessary logging.

Fixes bug 12593710.

Change-Id: I55c33bb4d6c9e17e810be7cc033e01fb9d2d6cf7
ava/com/android/server/am/ActivityStackSupervisor.java
31d9989e75f3e72d4240f18392939a23dd6375da 25-Jan-2014 Dianne Hackborn <hackbod@google.com> Merge "Add app version codes to procstats."
8472e6189cd4e0520c047bdb28457abc728b373f 24-Jan-2014 Dianne Hackborn <hackbod@google.com> Add app version codes to procstats.

Now the per-package proc stats data is also per-app-version-code.

In addition to changing the data structure to have one more
SparseArray and passing a version code all over, this also required
improving how we reset the stats so that we can prune a multi-package
process record back to a single package. Otherwise, as you install
updates to apps, the proc stats data would continue to explode as
the data for each of those app's processes got turned to a
multi-package due to tracking the old and new versions at the
same time.

This also bumps the checkin version code, since the package entries
also include a new field for the app version code.

Change-Id: I80de36addb0a75c7b08aef747c6f6c8012d01ee4
ava/com/android/server/am/ProcessRecord.java
ava/com/android/server/am/ProcessStatsService.java
ava/com/android/server/am/ServiceRecord.java
d01f8422dad3a8933111b334a8f9c2469bd0e4a6 24-Jan-2014 Robert Greenwalt <rgreenwalt@google.com> Clean up dhcp no-op logging

bug:10553167
Change-Id: I1f6feb9a44e17d45ffc9f28b37bf5690230a3ade
ava/com/android/server/ConnectivityService.java
85642f8b23e3dad256e41d1b7c600cabbc31397b 23-Jan-2014 Christopher Tate <ctate@android.com> am 222496f8: am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete"

* commit '222496f82fb78473a876da5dc395714b0fa5b99c':
Only send storage intents after boot complete
222496f82fb78473a876da5dc395714b0fa5b99c 23-Jan-2014 Christopher Tate <ctate@android.com> am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete"

* commit '5d734dbc56cd2d4350f4a35f1bedbb6b40247e5c':
Only send storage intents after boot complete
39e79006cf22f10eb62ac721238778aa6b7d3473 22-Jan-2014 Dianne Hackborn <hackbod@google.com> Merge "Battery stats improvements."
099bc627c463d9941e23e480f25a78a154429c55 22-Jan-2014 Dianne Hackborn <hackbod@google.com> Battery stats improvements.

- Adjust total power use when there is unaccounted power so that our
percentages don't end up > 100%.
- Fix accounting of isolated uids to be against the owning real app
uids.
- Rework how we put cpu use into the battery stats to no longer need
this uid name cache that can confuse the uid it is associated with.
- Finish implementing events in the history, adding a string pool and
reading/writing/dumping them.
- Add first two events: processes starting and finishing.
- Fix alarm manager reporting of wakeup alarms to be adjusted by the
WorkSource associated with the alarm, so they are blamed on the
correct app.
- New "--history" dump option allows you to perform a checkin of
only the history data.
- Fixed BitDescription bug that would cause incorrect printing of
changes in some states.

Change-Id: Ifbdd0740132ed178033851c58f165adc0d50f716
ava/com/android/server/AlarmManagerService.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/am/ProcessRecord.java
79bea304eababaae0421a0ee563f783faf1638ac 22-Jan-2014 Christopher Tate <ctate@android.com> am 46c95dfc: am b450505c: am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"

* commit '46c95dfc1009607184ea023921e1f262f38cd61e':
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
46c95dfc1009607184ea023921e1f262f38cd61e 22-Jan-2014 Christopher Tate <ctate@android.com> am b450505c: am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"

* commit 'b450505c2e0d0dfd67bc228961a00a6eaaf092df':
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
509cc13b705f8c488774e7097ab17471c3dacd2e 18-Jan-2014 Jeff Brown <jeffbrown@google.com> am e2c9cd58: Merge "Refactor display manager service to new pattern." into klp-modular-dev

* commit 'e2c9cd583f4f706b48270b8cbe84df627c69af24':
Refactor display manager service to new pattern.
84aa8ab3c6b6cd5fca2a06e47ae29c01b037eed8 17-Jan-2014 Dianne Hackborn <hackbod@google.com> Merge "Add --checkin to package manager dump."
60dc0d97fc0a40caae2fa91fbf296b8ac630d748 17-Jan-2014 Dianne Hackborn <hackbod@google.com> Add --checkin to package manager dump.

Change-Id: Ibafd82f40dd4fa6a5b700a8b6725b007a528a92f
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/Settings.java
4ccb823a9f62e57f9d221f83a97e82967e79a9e5 17-Jan-2014 Jeff Brown <jeffbrown@google.com> Refactor display manager service to new pattern.

Transform DisplayManagerService into a SystemService and start cleaning
up other local services that it uses from window manager and input manager.

Clean up service thread initialization.

Remove unnecessary static variables from ActivityManagerService.

It's starting to become clear that we really need a better way to manage
service dependencies. Boot phases don't quite cut it.

Change-Id: If319dbd7cbfbd4812fe55ece969e818d4b20755b
ava/com/android/server/DisplayThread.java
ava/com/android/server/FgThread.java
ava/com/android/server/IoThread.java
ava/com/android/server/ServiceThread.java
ava/com/android/server/SystemServer.java
ava/com/android/server/UiThread.java
ava/com/android/server/Watchdog.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/NativeCrashListener.java
ava/com/android/server/display/DisplayDevice.java
ava/com/android/server/display/DisplayDeviceInfo.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/DisplayTransactionListener.java
ava/com/android/server/display/DisplayViewport.java
ava/com/android/server/dreams/DreamManagerService.java
ava/com/android/server/input/InputManagerService.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/power/DisplayPowerController.java
ava/com/android/server/power/ElectronBeam.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/wm/WindowManagerService.java
35974112ecd6a296a49f04af0292de2569d039a2 16-Jan-2014 Doug Zongker <dougz@android.com> Merge "boot into recovery via the pre-recovery service"
265e87b40867963a5e8078bb46455500c13083c8 16-Jan-2014 Jeff Brown <jeffbrown@google.com> Fix build.

Change-Id: I7e0000a5a98e443f27b90884a85bd6106c1f7b9b
ava/com/android/server/SystemServer.java
3b0218b0ae1fad67f539ff3c10d6d2f3abec1a11 14-Jan-2014 Doug Zongker <dougz@android.com> boot into recovery via the pre-recovery service

Change PowerManagerService to start the pre-recovery service rather
than rebooting directly, when requested to reboot into recovery. Add
a new RECOVERY permission which a caller needs (in addition to REBOOT)
in order to go to recovery.

Bug: 12188746
Change-Id: I39121b701c4724558fe751adfbad79f8567faa43
ava/com/android/server/power/PowerManagerService.java
09d30981f8e882ffaa336aa4665bfe348557895a 16-Jan-2014 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 6f357d32 to master

Change-Id: I1979e6ed1acddbe656f5010114fd900f10865e75
d3ee63b6c6999475288502ccd37eb8840fb8a1c0 16-Jan-2014 Jeff Brown <jeffbrown@google.com> am 02cc684e: Delete unused power manager functionality.

* commit '02cc684e42b13454ba1a013340b41696323a4c2a':
Delete unused power manager functionality.
6f357d3284a833cc50a990e14b39f389b8972254 16-Jan-2014 Jeff Brown <jeffbrown@google.com> Start untangling system server early bootstrapping.

Refactored SystemServer to get rid of a bunch of legacy cruft related
to how the ServerThread used to be started up.

Create system context first when system server starts. This removes
the tangled initialization order dependency that forced us to start
the activity manager service before most anything else.

Moved factory test related constants into the FactoryTest class.

Partially migrated Installer, ActivityManagerService, and
PowerManagerService to the new SystemService pattern. There's more
work to be done here, particularly around the lifecycle of the
power manager.

Bug: 12172368
Change-Id: Ia527dd56e3b3fd90f9eeb41289dbe044921230d4
ava/com/android/server/AppOpsService.java
ava/com/android/server/ServiceThread.java
ava/com/android/server/SystemServer.java
ava/com/android/server/Watchdog.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/am/BroadcastQueue.java
ava/com/android/server/am/CompatModePackages.java
ava/com/android/server/firewall/IntentFirewall.java
ava/com/android/server/pm/Installer.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/wm/WindowManagerService.java
02cc684e42b13454ba1a013340b41696323a4c2a 16-Jan-2014 Jeff Brown <jeffbrown@google.com> Delete unused power manager functionality.

timeSinceScreenWasLastOn() was used by Watchdog previously but is no
longer so we can remove it.

Change-Id: I91c324b6c98c1aeb85f64b0296a41240e6c2ef4f
ava/com/android/server/power/PowerManagerService.java
ac2c9bf4ce0b2e7a75252b9f8359d34a10b9716b 16-Jan-2014 John Spurlock <jspurlock@google.com> Merge "Defend against malformed broadcast in NotificationManager."
5d2eeb111a6e1e46a1fd25c73f55caa408fa8303 16-Jan-2014 John Spurlock <jspurlock@google.com> Defend against malformed broadcast in NotificationManager.

Bug:12583158
Change-Id: I4b10e19b9a23ff8e950006b3b3496bd6800346ea
ava/com/android/server/notification/NotificationManagerService.java
441b57bce9dcd507a3e36b911b5adeacb066c9be 16-Jan-2014 Craig Mautner <cmautner@google.com> am 593a4e6f: Fix NPE when destroyActivity occurs after detach.

* commit '593a4e6f982cecddc3f2f6107044b5e12fab3e20':
Fix NPE when destroyActivity occurs after detach.
fc8fa54f80b419966b3893a0992354a17c270333 16-Jan-2014 Craig Mautner <cmautner@google.com> am e9ddaa0b: Merge "Cleanup after ActivityView" into klp-modular-dev

* commit 'e9ddaa0b183d979be782a63970929cebd861b7c9':
Cleanup after ActivityView
593a4e6f982cecddc3f2f6107044b5e12fab3e20 16-Jan-2014 Craig Mautner <cmautner@google.com> Fix NPE when destroyActivity occurs after detach.

*** FATAL EXCEPTION IN SYSTEM PROCESS: ActivityManager
java.lang.NullPointerException
at com.android.server.am.ActivityStack.removeTask(ActivityStack.java:3627)
at com.android.server.am.ActivityStack.removeActivityFromHistoryLocked(ActivityStack.java:2693)
at com.android.server.am.ActivityStack.activityDestroyedLocked(ActivityStack.java:2878)
at com.android.server.am.ActivityStack$ActivityStackHandler.handleMessage(ActivityStack.java:296)
at android.os.Handler.dispatchMessage(Handler.java:102)
at android.os.Looper.loop(Looper.java:136)
at com.android.server.am.ActivityManagerService$AThread.run(ActivityManagerService.java:1868)

Change-Id: Ifaf0fe6c62d1f63897d57dc96b4d86d8111b45db
ava/com/android/server/am/ActivityStack.java
34b73dfaa3a92e5a85abf62317183fb114f2ffff 13-Jan-2014 Craig Mautner <cmautner@google.com> Cleanup after ActivityView

- Release Surface and VirtualDisplay when shutting down ActivityView.
- Shut down child stacks when relaunching parent activity.

Change-Id: I60314b2b43bd2da5406cf6ec871293b5baca157c
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/wm/WindowManagerService.java
c8345b32c9636d4d2984a2e9f23dd0391c664ba4 16-Jan-2014 Dianne Hackborn <hackbod@google.com> Merge "Add battery power use reporting to batterystats service."
a7c837f043c1ca0bdecd42645ba7da8c5717566d 16-Jan-2014 Dianne Hackborn <hackbod@google.com> Add battery power use reporting to batterystats service.

Move the BatteryStatsHelper class (which computes power use based
on the raw battery stats) out of the settings app and in to the
framework. It is now used by batterystats dump output to print
the computed power information from its current stats.

This involved a lot of refactoring of the BatteryStatsHelper code
to remove all of the UI dependencies. I also did a bunch of cleanup
in it, such as making all power computations be in terms of mAh.

Change-Id: I8ccf2c9789dc9ad34904917ef57050371a59dc28
ava/com/android/server/am/BatteryStatsService.java
3a43aa9cef79324dd149a47c5a73ce1fa8ed95b3 15-Jan-2014 Craig Mautner <cmautner@google.com> am 9cfb2e5f: Merge "Retain stacks even if they are empty." into klp-modular-dev

* commit '9cfb2e5f4c95c16d8ca531808f60486f214f9039':
Retain stacks even if they are empty.
9cfb2e5f4c95c16d8ca531808f60486f214f9039 15-Jan-2014 Craig Mautner <cmautner@google.com> Merge "Retain stacks even if they are empty." into klp-modular-dev
6873e17d4b565aa1d4ea2a8f1ac261f517dcc2ff 14-Jan-2014 Dianne Hackborn <hackbod@google.com> am 305c61a1: am 3a8a8ddd: am 8c359bf4: am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1

* commit '305c61a1c6816549b225719518df5b29a17f0f42':
Fix issue #12031685: Sticky Service Breakage in Android 4.4.1
8ad31fb08d7d0d4209590e191fa68a6716d595fa 14-Jan-2014 Craig Mautner <cmautner@google.com> am 5c44c51c: Merge "Use new DisplayManager flag to show own content only." into klp-modular-dev

* commit '5c44c51c2a0b5a2268de07fab6854623188b5a7c':
Use new DisplayManager flag to show own content only.
5c44c51c2a0b5a2268de07fab6854623188b5a7c 14-Jan-2014 Craig Mautner <cmautner@google.com> Merge "Use new DisplayManager flag to show own content only." into klp-modular-dev
529cbcd0af105aeda46759f92e2b0d1d469554f0 13-Jan-2014 Craig Mautner <cmautner@google.com> Use new DisplayManager flag to show own content only.

Change-Id: I8b2666e5849e57b5eb2ed73ed3d5e39da2dbd55d
ava/com/android/server/am/ActivityStackSupervisor.java
04a0ea60ac7e20369e63edc4f3f8cedf8425a439 13-Jan-2014 Craig Mautner <cmautner@google.com> Retain stacks even if they are empty.

Previously stacks would be removed when the last ActivityRecord was
removed. This causes problems for ActivityContainers which persist and
permit activities to be launched into an empty stack.

Change-Id: Ia79ac65d17c42eff3a7b1321980c21b29996001b
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/WindowManagerService.java
94827c3484da6f0a9cd171e6892d2710b1eafa12 13-Jan-2014 Daniel Cashman <dcashman@google.com> am 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev

* commit '21a801d0885d65f128b84a593140b07fd0d4e980':
Clear cached locations when location providers disabled Bug: 12118307
4bc9432f2876097d041955d4be76ec73533082b3 13-Jan-2014 Jeff Sharkey <jsharkey@android.com> am 38c65b1f: am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered"

* commit '38c65b1f70042bc8e37e91106692158f0ce98703':
MountService listeners can not be unregistered
38c65b1f70042bc8e37e91106692158f0ce98703 13-Jan-2014 Jeff Sharkey <jsharkey@android.com> am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered"

* commit '6fba240b72e9ae2bc66c98b058e78aecd568ae3f':
MountService listeners can not be unregistered
80a6e776e008f3a048ec568ea5a0ca63e0b6d936 13-Jan-2014 Craig Mautner <cmautner@google.com> am cf6e0d68: Merge "Add display synchronously." into klp-modular-dev

* commit 'cf6e0d686f42036992bdac4f47d37bc8c0775027':
Add display synchronously.
cf6e0d686f42036992bdac4f47d37bc8c0775027 13-Jan-2014 Craig Mautner <cmautner@google.com> Merge "Add display synchronously." into klp-modular-dev
ad25fa36cb63f134acf636d70696bbf81548802e 13-Jan-2014 Craig Mautner <cmautner@google.com> Add display synchronously.

Adding the virtual display to window manager through a handler message
causes timing issues. Add the display directly to fix it.

Change-Id: I3ad6b16ce6dff2a48abd120a8e873e11a028e2c3
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/wm/WindowManagerService.java
663fb7a09e48c77a7fff4f7a8488b08175170d6f 11-Jan-2014 Craig Mautner <cmautner@google.com> am da9b87a7: am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities."

* commit 'da9b87a70994ed00868dd4405243932fe7e267f2':
Fix visibility of multiple non-fullscreen activities.
da9b87a70994ed00868dd4405243932fe7e267f2 11-Jan-2014 Craig Mautner <cmautner@google.com> am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities."

* commit '5d8936b4cfdb14941536e533c2cc376e99b9f7d5':
Fix visibility of multiple non-fullscreen activities.
7ef6c04afdf45bb5bfacd3c5a5bd24f349af140e 11-Jan-2014 Craig Mautner <cmautner@google.com> am d7c97a79: Merge "Remove misleading warnings." into klp-modular-dev

* commit 'd7c97a798f25d54a00adc0cfb2af4dedd5a4e3f2':
Remove misleading warnings.
d7c97a798f25d54a00adc0cfb2af4dedd5a4e3f2 11-Jan-2014 Craig Mautner <cmautner@google.com> Merge "Remove misleading warnings." into klp-modular-dev
330a6bd8a643c33318c751239a092ce393d87b06 11-Jan-2014 Craig Mautner <cmautner@google.com> Remove misleading warnings.

Error messages that are obsolete and/or incorrect.

Fixes bug 12421138.

Change-Id: I43f095048757f7ae9bff47abed594dd34d8387ce
ava/com/android/server/am/ActivityStackSupervisor.java
d4abbb964b6153ab19a9366c1168f4794b618594 10-Jan-2014 Craig Mautner <cmautner@google.com> am 93884a5b: Fix invalid stackId bug.

* commit '93884a5b35ec97a0f44795950363188d9a21137a':
Fix invalid stackId bug.
93884a5b35ec97a0f44795950363188d9a21137a 10-Jan-2014 Craig Mautner <cmautner@google.com> Fix invalid stackId bug.

Eliminate race condition by executing window manager createStack
directly from activity manager.

Change-Id: I2dda276d07d0ae09c7c958980bc5ebffe72ebd92
ava/com/android/server/wm/WindowManagerService.java
1f7488e21994d7b6e143a4540659c1fbae630634 10-Jan-2014 Craig Mautner <cmautner@google.com> resolved conflicts for merge of 4504de5d to master

Change-Id: I8d96fd2b479aebd6de913e617ca190f66c25aaa5
4504de5d5a8e1c7dfb306b16282f348856c24764 20-Dec-2013 Craig Mautner <cmautner@google.com> Implement ActivityView.

With an existing ActivityContainer a caller can now create an
ActivityView which consists of a new VirtualDisplay immediately
attached to the ActivityContainer.

Change-Id: Id70333dcbef55d524a87df8f8c92d72ca5579364
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/wm/WindowManagerService.java
88a00abe0803327bb55171082e18fe2901c35d49 10-Jan-2014 Craig Mautner <cmautner@google.com> am 0bb2a4de: Merge "Call moveHomeStack before moving any stack." into klp-modular-dev

* commit '0bb2a4deee6451a2f3075254761e9bfb38429fa4':
Call moveHomeStack before moving any stack.
fefeef8249e898d2d450da21d0edda49b88be7ce 10-Jan-2014 Craig Mautner <cmautner@google.com> Call moveHomeStack before moving any stack.

Order matters, otherwise mFocusedStack and mLastStack aren't updated
correctly.

Fixes bug 12478856.

Change-Id: I12e4334678bb3af49d1ff26c4003def3e8d987c2
ava/com/android/server/am/ActivityStack.java
7fa44e90ed11cd35764f7f9efa587203c241fb27 09-Jan-2014 Jeff Brown <jeffbrown@google.com> am b6d9eb87: Merge "Add flag to force public virtual display to show own content." into klp-modular-dev

* commit 'b6d9eb875a0bf1bb655a90c88457689342eb0991':
Add flag to force public virtual display to show own content.
b6d9eb875a0bf1bb655a90c88457689342eb0991 09-Jan-2014 Jeff Brown <jeffbrown@google.com> Merge "Add flag to force public virtual display to show own content." into klp-modular-dev
80a3a364fd0c7441dbee4de7dd441a6ce743f066 09-Jan-2014 Vinit Deshpande <vinitd@google.com> Merge "Revert "Revert "Move Wifi services to a new git project"""
2dfae9bea104c0594fd5641f9704f34b204abd87 08-Jan-2014 RoboErik <epastern@google.com> Merge "b/12068020 Make kb layouts only unique to vendor/product"
b859449b717b24ac6e678c303d7706d55fd184f7 08-Jan-2014 Craig Mautner <cmautner@google.com> resolved conflicts for merge of 88bfc6dd to master

Change-Id: Ib656ac0591b21ad14f2df51021729552e9373515
88bfc6ddc846d714bc15518ef6741e39145a1687 08-Jan-2014 Craig Mautner <cmautner@google.com> Merge "Extend stack management to other displays." into klp-modular-dev
7b925fbb87d7bfac17bf04e62ea786e96ee7e6d9 08-Jan-2014 Mike Lockwood <lockwood@google.com> am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"

* commit '43bc1c07d25b7f278a860bbb9118f46ac732593a':
Added missing USB device descriptor fields needed for intent filters
43bc1c07d25b7f278a860bbb9118f46ac732593a 08-Jan-2014 Mike Lockwood <lockwood@google.com> am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"

* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
Added missing USB device descriptor fields needed for intent filters
bcf40bcda520955429747154f6d598b833a1261e 08-Jan-2014 Narayan Kamath <narayan@google.com> am e853de1f: am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712"

* commit 'e853de1f10820da1bc7b6bf13faadaf835239c29':
Fix a bug introduced in change 73712
e853de1f10820da1bc7b6bf13faadaf835239c29 08-Jan-2014 Narayan Kamath <narayan@google.com> am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712"

* commit '2d87407e5765228a3469b9681ebff6c0c7eee140':
Fix a bug introduced in change 73712
2c0971eeec76f5a4b0aee890f4a05d47020da2b6 08-Jan-2014 Narayan Kamath <narayan@google.com> am 3f7b8d0c: resolved conflicts for merge of 92ae0347 to klp-modular-dev

* commit '3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85':
AArch64: Use long for pointers in services
3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85 08-Jan-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 92ae0347 to klp-modular-dev

Change-Id: I703aea4f20985a4bbda0f685254721d6480bb20f
d14c8c9039c0056e1f30ad5d410c8fde20d63df5 08-Jan-2014 Jeff Brown <jeffbrown@google.com> Add flag to force public virtual display to show own content.

Change-Id: I1039f2ef3154169ec90411a4c7ba2c94629f72c4
ava/com/android/server/display/DisplayDeviceInfo.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/VirtualDisplayAdapter.java
3ffa1a899a6169600dabe39fb8528db9af522ba6 08-Jan-2014 Vinit Deshpande <vinitd@google.com> Revert "Revert "Move Wifi services to a new git project""

This reverts commit f1182c9c1abdb4e8f733632d0567410ab9fc1d3c.

Change-Id: Ic440cfa6502b651b2cc67faf73c7c9c49df42190
ava/com/android/server/SystemServer.java
ava/com/android/server/wifi/NetworkUpdateResult.java
ava/com/android/server/wifi/README.txt
ava/com/android/server/wifi/StateChangeResult.java
ava/com/android/server/wifi/SupplicantStateTracker.java
ava/com/android/server/wifi/WifiApConfigStore.java
ava/com/android/server/wifi/WifiConfigStore.java
ava/com/android/server/wifi/WifiController.java
ava/com/android/server/wifi/WifiMonitor.java
ava/com/android/server/wifi/WifiNative.java
ava/com/android/server/wifi/WifiNotificationController.java
ava/com/android/server/wifi/WifiService.java
ava/com/android/server/wifi/WifiSettingsStore.java
ava/com/android/server/wifi/WifiStateMachine.java
ava/com/android/server/wifi/WifiTrafficPoller.java
ava/com/android/server/wifi/WifiWatchdogStateMachine.java
ava/com/android/server/wifi/p2p/WifiP2pService.java
d9feaf49719d58cfc4fad203bd10e75253024fa9 08-Jan-2014 Vinit Deshpande <vinitd@google.com> Merge "Revert "Move Wifi services to a new git project""
f1182c9c1abdb4e8f733632d0567410ab9fc1d3c 08-Jan-2014 Vinit Deshpande <vinitd@google.com> Revert "Move Wifi services to a new git project"

This reverts commit 4a3f9cf099bbbe52dc0edb2a7e1d1c976bc335a3.

Change-Id: I6269a683e842a5d1cfdafea892be86972ae11c40
ava/com/android/server/SystemServer.java
ava/com/android/server/wifi/NetworkUpdateResult.java
ava/com/android/server/wifi/README.txt
ava/com/android/server/wifi/StateChangeResult.java
ava/com/android/server/wifi/SupplicantStateTracker.java
ava/com/android/server/wifi/WifiApConfigStore.java
ava/com/android/server/wifi/WifiConfigStore.java
ava/com/android/server/wifi/WifiController.java
ava/com/android/server/wifi/WifiMonitor.java
ava/com/android/server/wifi/WifiNative.java
ava/com/android/server/wifi/WifiNotificationController.java
ava/com/android/server/wifi/WifiService.java
ava/com/android/server/wifi/WifiSettingsStore.java
ava/com/android/server/wifi/WifiStateMachine.java
ava/com/android/server/wifi/WifiTrafficPoller.java
ava/com/android/server/wifi/WifiWatchdogStateMachine.java
ava/com/android/server/wifi/p2p/WifiP2pService.java
ed8ed0bc81864c802f25c54aeb896db6055a7c20 08-Jan-2014 Vinit Deshapnde <vinitd@google.com> Merge "Move Wifi services to a new git project"
fb290df3c9a6f37ec050163029e25844de2f8590 16-Dec-2013 RoboErik <epastern@google.com> b/12068020 Make kb layouts only unique to vendor/product

Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: Id0890d13e1c859eaf993d4831b7b1acbaf5df80f
ava/com/android/server/input/InputManagerService.java
ni/com_android_server_input_InputManagerService.cpp
08af733f87857dc8fdb83f25554874bd6a561287 08-Jan-2014 Christopher Tate <ctate@google.com> Don't just log this warning; record the situation for posterity

When a previously 3rd-party permission declaration is superseded
by a new system-owned declaration, don't just log; leave a persistent
record of the fact for post-hoc recognition of what happened even
after reboots.

Change-Id: I816a5003f8f8ef2dfbdbfa36316c4bae5005dfbf
ava/com/android/server/pm/PackageManagerService.java
dfc73e9c243092d395913737af622c89ad1830be 07-Jan-2014 Adam Lesinski <adamlesinski@google.com> am 66e9b1e1: Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev

* commit '66e9b1e1178813037daf3798b8fe23467c4b91ab':
Move SystemService code to frameworks/base/core
66e9b1e1178813037daf3798b8fe23467c4b91ab 07-Jan-2014 Adam Lesinski <adamlesinski@google.com> Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev
4a3f9cf099bbbe52dc0edb2a7e1d1c976bc335a3 27-Dec-2013 Vinit Deshapnde <vinitd@google.com> Move Wifi services to a new git project

Bug: 12175455
Change-Id: I1fa07e29c6a9aae38d9e334d519a9f2445d15613
ava/com/android/server/SystemServer.java
ava/com/android/server/wifi/NetworkUpdateResult.java
ava/com/android/server/wifi/README.txt
ava/com/android/server/wifi/StateChangeResult.java
ava/com/android/server/wifi/SupplicantStateTracker.java
ava/com/android/server/wifi/WifiApConfigStore.java
ava/com/android/server/wifi/WifiConfigStore.java
ava/com/android/server/wifi/WifiController.java
ava/com/android/server/wifi/WifiMonitor.java
ava/com/android/server/wifi/WifiNative.java
ava/com/android/server/wifi/WifiNotificationController.java
ava/com/android/server/wifi/WifiService.java
ava/com/android/server/wifi/WifiSettingsStore.java
ava/com/android/server/wifi/WifiStateMachine.java
ava/com/android/server/wifi/WifiTrafficPoller.java
ava/com/android/server/wifi/WifiWatchdogStateMachine.java
ava/com/android/server/wifi/p2p/WifiP2pService.java
e4f7ce167052d70b7969b0b14fb67dc236c9d3e4 07-Jan-2014 Narayan Kamath <narayan@google.com> am 107eb740: am ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."

* commit '107eb74074981904c29e005a24dc707b13db457e':
Fix broken XML parsing idiom.
107eb74074981904c29e005a24dc707b13db457e 07-Jan-2014 Narayan Kamath <narayan@google.com> am ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."

* commit 'ce9418c59e1c9e696b35123d75c077c164893b9f':
Fix broken XML parsing idiom.
a807dbaeed2a125cea6868f6d51402f8416fddec 06-Jan-2014 Todd Poynor <toddpoynor@google.com> am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE

* commit '91ecb36df50be3446809e9da2a8f571d157f7549':
ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
e0a3884cb627efc650e19fbe76b1b3343468cf57 17-Dec-2013 Craig Mautner <cmautner@google.com> Extend stack management to other displays.

- Abandon ActivityContainer.startActivity() in favor of
IActivityManager.startActivityAsUserInContainer().
- Modify Am to test starting an activity on a container.
- Create a DisplayContext as the base context if the activity token
is on a different display.
- Test for home display in more cases when manipulating home stack.
- Rename mDisplayInfos => mActivityDisplays.
- Create new method for moving task to front of stack regardless of
which display it is on.

Change-Id: I4fcb83ae844c5839ee3e2722229623d1a80ed921
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/wm/DisplayContent.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
e58a49e411327e26b6ad9939833f53c7fa5aef20 21-Dec-2013 Amith Yamasani <yamasani@google.com> Merge commit '817ec49e' into manualmerge

Conflicts:
services/print/java/com/android/server/print/PrintManagerService.java

Change-Id: I1b9bf364ca50ee3c48f53d87ae0ce23e7f3c2bc2
817ec49e7991d4cac50b2308cd7cf5f8641e1e29 20-Dec-2013 Amith Yamasani <yamasani@google.com> Wrap some services into a SystemService

These services can now be excluded by modifying the list of REQUIRED_SERVICES (TB renamed)

Changed appwidget, devicepolicy, backup and print services.

Change-Id: Id8e2855d5c045cd57bdb02dca9ed75172803bce7
ava/com/android/server/SystemServer.java
b102b2cc73baa20e8cc9e4c081235b031c4e8fe0 20-Dec-2013 Adam Lesinski <adamlesinski@google.com> Move SystemService code to frameworks/base/core

Paves the way for building services without needing to see the
rest of frameworks/base/services.

Change-Id: I8ac4bc9d25471e96076cd888c1fc24b918d8911f
ava/com/android/server/LocalServices.java
ava/com/android/server/SystemService.java
ava/com/android/server/SystemServiceManager.java
3bc26143dc81267beba26e50965b4835cf73fdf8 19-Dec-2013 David Christie <dnchrist@google.com> Fix issue where gps "on" stats continue to run when gps is disabled.
-Shows up in Settings->Battery->app_detail_page
-Bug: 12015795

Change-Id: Id1485eed72e22cffb3e6e306495fac37a4d348cc
ava/com/android/server/location/GpsLocationProvider.java
1f4bf364b2a4eecfae7c3243396ad6a5c43843a9 20-Dec-2013 Amith Yamasani <yamasani@google.com> Merge "Move files to new directory structure of framework services"
49782e46c0eb85a25ae2abcf80880c48dbab5aea 20-Dec-2013 Amith Yamasani <yamasani@google.com> am 9158825f: Move some system services to separate directories

* commit '9158825f9c41869689d6b1786d7c7aa8bdd524ce':
Move some system services to separate directories
9158825f9c41869689d6b1786d7c7aa8bdd524ce 22-Nov-2013 Amith Yamasani <yamasani@google.com> Move some system services to separate directories

Refactored the directory structure so that services can be optionally
excluded. This is step 1. Will be followed by another change that makes
it possible to remove services from the build.

Change-Id: Ideacedfd34b5e213217ad3ff4ebb21c4a8e73f85
ava/com/android/server/AlarmManagerService.java
ava/com/android/server/AppOpsService.java
ava/com/android/server/AssetAtlasService.java
ava/com/android/server/AttributeCache.java
ava/com/android/server/BatteryService.java
ava/com/android/server/BluetoothManagerService.java
ava/com/android/server/BootReceiver.java
ava/com/android/server/BrickReceiver.java
ava/com/android/server/CertBlacklister.java
ava/com/android/server/CommonTimeManagementService.java
ava/com/android/server/ConnectivityService.java
ava/com/android/server/ConsumerIrService.java
ava/com/android/server/CountryDetectorService.java
ava/com/android/server/DiskStatsService.java
ava/com/android/server/DockObserver.java
ava/com/android/server/DropBoxManagerService.java
ava/com/android/server/EntropyMixer.java
ava/com/android/server/EventLogTags.logtags
ava/com/android/server/FgThread.java
ava/com/android/server/INativeDaemonConnectorCallbacks.java
ava/com/android/server/IdleMaintenanceService.java
ava/com/android/server/InputMethodManagerService.java
ava/com/android/server/IntentResolver.java
ava/com/android/server/IoThread.java
ava/com/android/server/LocalServices.java
ava/com/android/server/LocationManagerService.java
ava/com/android/server/LockSettingsService.java
ava/com/android/server/MasterClearReceiver.java
ava/com/android/server/MountService.java
ava/com/android/server/NativeDaemonConnector.java
ava/com/android/server/NativeDaemonConnectorException.java
ava/com/android/server/NativeDaemonEvent.java
ava/com/android/server/NetworkManagementService.java
ava/com/android/server/NetworkTimeUpdateService.java
ava/com/android/server/NsdService.java
ava/com/android/server/RandomBlock.java
ava/com/android/server/RecognitionManagerService.java
ava/com/android/server/SamplingProfilerService.java
ava/com/android/server/SerialService.java
ava/com/android/server/ServiceWatcher.java
ava/com/android/server/ShutdownActivity.java
ava/com/android/server/SystemServer.java
ava/com/android/server/SystemService.java
ava/com/android/server/SystemServiceManager.java
ava/com/android/server/TelephonyRegistry.java
ava/com/android/server/TextServicesManagerService.java
ava/com/android/server/TwilightCalculator.java
ava/com/android/server/UiModeManagerService.java
ava/com/android/server/UiThread.java
ava/com/android/server/UpdateLockService.java
ava/com/android/server/VibratorService.java
ava/com/android/server/Watchdog.java
ava/com/android/server/WiredAccessoryManager.java
ava/com/android/server/accounts/AccountAuthenticatorCache.java
ava/com/android/server/accounts/AccountManagerService.java
ava/com/android/server/accounts/IAccountAuthenticatorCache.java
ava/com/android/server/am/ActiveServices.java
ava/com/android/server/am/ActivityManagerService.java
ava/com/android/server/am/ActivityRecord.java
ava/com/android/server/am/ActivityResult.java
ava/com/android/server/am/ActivityStack.java
ava/com/android/server/am/ActivityStackSupervisor.java
ava/com/android/server/am/AppBindRecord.java
ava/com/android/server/am/AppErrorDialog.java
ava/com/android/server/am/AppErrorResult.java
ava/com/android/server/am/AppNotRespondingDialog.java
ava/com/android/server/am/AppWaitingForDebuggerDialog.java
ava/com/android/server/am/BackupRecord.java
ava/com/android/server/am/BaseErrorDialog.java
ava/com/android/server/am/BatteryStatsService.java
ava/com/android/server/am/BroadcastFilter.java
ava/com/android/server/am/BroadcastQueue.java
ava/com/android/server/am/BroadcastRecord.java
ava/com/android/server/am/CompatModeDialog.java
ava/com/android/server/am/CompatModePackages.java
ava/com/android/server/am/ConnectionRecord.java
ava/com/android/server/am/ContentProviderConnection.java
ava/com/android/server/am/ContentProviderRecord.java
ava/com/android/server/am/CoreSettingsObserver.java
ava/com/android/server/am/EventLogTags.logtags
ava/com/android/server/am/FactoryErrorDialog.java
ava/com/android/server/am/IntentBindRecord.java
ava/com/android/server/am/LaunchWarningWindow.java
ava/com/android/server/am/NativeCrashListener.java
ava/com/android/server/am/PendingIntentRecord.java
ava/com/android/server/am/PendingThumbnailsRecord.java
ava/com/android/server/am/ProcessList.java
ava/com/android/server/am/ProcessMemInfo.java
ava/com/android/server/am/ProcessRecord.java
ava/com/android/server/am/ProcessStatsService.java
ava/com/android/server/am/ProviderMap.java
ava/com/android/server/am/ReceiverList.java
ava/com/android/server/am/ServiceRecord.java
ava/com/android/server/am/StrictModeViolationDialog.java
ava/com/android/server/am/TaskAccessInfo.java
ava/com/android/server/am/TaskRecord.java
ava/com/android/server/am/ThumbnailHolder.java
ava/com/android/server/am/UriPermission.java
ava/com/android/server/am/UriPermissionOwner.java
ava/com/android/server/am/UsageStatsService.java
ava/com/android/server/am/UserStartedState.java
ava/com/android/server/am/package.html
ava/com/android/server/clipboard/ClipboardService.java
ava/com/android/server/connectivity/DataConnectionStats.java
ava/com/android/server/connectivity/Nat464Xlat.java
ava/com/android/server/connectivity/PacManager.java
ava/com/android/server/connectivity/Tethering.java
ava/com/android/server/connectivity/Vpn.java
ava/com/android/server/content/ContentService.java
ava/com/android/server/content/SyncManager.java
ava/com/android/server/content/SyncOperation.java
ava/com/android/server/content/SyncQueue.java
ava/com/android/server/content/SyncStorageEngine.java
ava/com/android/server/display/DisplayAdapter.java
ava/com/android/server/display/DisplayDevice.java
ava/com/android/server/display/DisplayDeviceInfo.java
ava/com/android/server/display/DisplayManagerService.java
ava/com/android/server/display/DisplayTransactionListener.java
ava/com/android/server/display/DisplayViewport.java
ava/com/android/server/display/LocalDisplayAdapter.java
ava/com/android/server/display/LogicalDisplay.java
ava/com/android/server/display/OverlayDisplayAdapter.java
ava/com/android/server/display/OverlayDisplayWindow.java
ava/com/android/server/display/PersistentDataStore.java
ava/com/android/server/display/VirtualDisplayAdapter.java
ava/com/android/server/display/WifiDisplayAdapter.java
ava/com/android/server/display/WifiDisplayController.java
ava/com/android/server/dreams/DreamController.java
ava/com/android/server/dreams/DreamManagerService.java
ava/com/android/server/firewall/AndFilter.java
ava/com/android/server/firewall/CategoryFilter.java
ava/com/android/server/firewall/Filter.java
ava/com/android/server/firewall/FilterFactory.java
ava/com/android/server/firewall/FilterList.java
ava/com/android/server/firewall/IntentFirewall.java
ava/com/android/server/firewall/NotFilter.java
ava/com/android/server/firewall/OrFilter.java
ava/com/android/server/firewall/PortFilter.java
ava/com/android/server/firewall/SenderFilter.java
ava/com/android/server/firewall/SenderPermissionFilter.java
ava/com/android/server/firewall/StringFilter.java
ava/com/android/server/input/InputApplicationHandle.java
ava/com/android/server/input/InputManagerService.java
ava/com/android/server/input/InputWindowHandle.java
ava/com/android/server/input/PersistentDataStore.java
ava/com/android/server/lights/Light.java
ava/com/android/server/lights/LightsManager.java
ava/com/android/server/lights/LightsService.java
ava/com/android/server/location/ComprehensiveCountryDetector.java
ava/com/android/server/location/CountryDetectorBase.java
ava/com/android/server/location/FlpHardwareProvider.java
ava/com/android/server/location/FusedLocationHardwareSecure.java
ava/com/android/server/location/FusedProxy.java
ava/com/android/server/location/GeocoderProxy.java
ava/com/android/server/location/GeofenceManager.java
ava/com/android/server/location/GeofenceProxy.java
ava/com/android/server/location/GeofenceState.java
ava/com/android/server/location/GpsLocationProvider.java
ava/com/android/server/location/GpsXtraDownloader.java
ava/com/android/server/location/LocationBasedCountryDetector.java
ava/com/android/server/location/LocationBlacklist.java
ava/com/android/server/location/LocationFudger.java
ava/com/android/server/location/LocationProviderInterface.java
ava/com/android/server/location/LocationProviderProxy.java
ava/com/android/server/location/MockProvider.java
ava/com/android/server/location/PassiveProvider.java
ava/com/android/server/media/MediaRouterService.java
ava/com/android/server/media/RemoteDisplayProviderProxy.java
ava/com/android/server/media/RemoteDisplayProviderWatcher.java
ava/com/android/server/net/LockdownVpnTracker.java
ava/com/android/server/net/NetworkIdentitySet.java
ava/com/android/server/net/NetworkPolicyManagerService.java
ava/com/android/server/net/NetworkStatsCollection.java
ava/com/android/server/net/NetworkStatsRecorder.java
ava/com/android/server/net/NetworkStatsService.java
ava/com/android/server/notification/NotificationDelegate.java
ava/com/android/server/notification/NotificationManagerInternal.java
ava/com/android/server/notification/NotificationManagerService.java
ava/com/android/server/os/SchedulingPolicyService.java
ava/com/android/server/pm/BasePermission.java
ava/com/android/server/pm/GrantedPermissions.java
ava/com/android/server/pm/Installer.java
ava/com/android/server/pm/KeySetManager.java
ava/com/android/server/pm/PackageKeySetData.java
ava/com/android/server/pm/PackageManagerService.java
ava/com/android/server/pm/PackageSetting.java
ava/com/android/server/pm/PackageSettingBase.java
ava/com/android/server/pm/PackageSignatures.java
ava/com/android/server/pm/PackageVerificationResponse.java
ava/com/android/server/pm/PackageVerificationState.java
ava/com/android/server/pm/PendingPackage.java
ava/com/android/server/pm/PreferredActivity.java
ava/com/android/server/pm/PreferredComponent.java
ava/com/android/server/pm/PreferredIntentResolver.java
ava/com/android/server/pm/SELinuxMMAC.java
ava/com/android/server/pm/Settings.java
ava/com/android/server/pm/SharedUserSetting.java
ava/com/android/server/pm/UserManagerService.java
ava/com/android/server/power/DisplayBlanker.java
ava/com/android/server/power/DisplayPowerController.java
ava/com/android/server/power/DisplayPowerRequest.java
ava/com/android/server/power/DisplayPowerState.java
ava/com/android/server/power/ElectronBeam.java
ava/com/android/server/power/Notifier.java
ava/com/android/server/power/PowerManagerService.java
ava/com/android/server/power/RampAnimator.java
ava/com/android/server/power/ScreenOnBlocker.java
ava/com/android/server/power/ShutdownThread.java
ava/com/android/server/power/SuspendBlocker.java
ava/com/android/server/power/WirelessChargerDetector.java
ava/com/android/server/search/SearchManagerService.java
ava/com/android/server/search/Searchables.java
ava/com/android/server/statusbar/StatusBarManagerInternal.java
ava/com/android/server/statusbar/StatusBarManagerService.java
ava/com/android/server/storage/DeviceStorageMonitorInternal.java
ava/com/android/server/storage/DeviceStorageMonitorService.java
ava/com/android/server/twilight/TwilightListener.java
ava/com/android/server/twilight/TwilightManager.java
ava/com/android/server/twilight/TwilightService.java
ava/com/android/server/twilight/TwilightState.java
ava/com/android/server/updates/CarrierProvisioningUrlsInstallReceiver.java
ava/com/android/server/updates/CertPinInstallReceiver.java
ava/com/android/server/updates/ConfigUpdateInstallReceiver.java
ava/com/android/server/updates/IntentFirewallInstallReceiver.java
ava/com/android/server/updates/SELinuxPolicyInstallReceiver.java
ava/com/android/server/updates/SmsShortCodesInstallReceiver.java
ava/com/android/server/updates/TZInfoInstallReceiver.java
ava/com/android/server/usb/UsbDebuggingManager.java
ava/com/android/server/usb/UsbDeviceManager.java
ava/com/android/server/usb/UsbHostManager.java
ava/com/android/server/usb/UsbService.java
ava/com/android/server/usb/UsbSettingsManager.java
ava/com/android/server/wallpaper/WallpaperManagerService.java
ava/com/android/server/wifi/README.txt
ava/com/android/server/wifi/WifiController.java
ava/com/android/server/wifi/WifiNotificationController.java
ava/com/android/server/wifi/WifiService.java
ava/com/android/server/wifi/WifiSettingsStore.java
ava/com/android/server/wifi/WifiTrafficPoller.java
ava/com/android/server/wm/AppTransition.java
ava/com/android/server/wm/AppWindowAnimator.java
ava/com/android/server/wm/AppWindowToken.java
ava/com/android/server/wm/BlackFrame.java
ava/com/android/server/wm/DimLayer.java
ava/com/android/server/wm/DisplayContent.java
ava/com/android/server/wm/DisplayMagnifier.java
ava/com/android/server/wm/DisplaySettings.java
ava/com/android/server/wm/DragState.java
ava/com/android/server/wm/FakeWindowImpl.java
ava/com/android/server/wm/FocusedStackFrame.java
ava/com/android/server/wm/InputMonitor.java
ava/com/android/server/wm/KeyguardDisableHandler.java
ava/com/android/server/wm/PointerEventDispatcher.java
ava/com/android/server/wm/ScreenRotationAnimation.java
ava/com/android/server/wm/Session.java
ava/com/android/server/wm/StackTapPointerEventListener.java
ava/com/android/server/wm/StartingData.java
ava/com/android/server/wm/StrictModeFlash.java
ava/com/android/server/wm/Task.java
ava/com/android/server/wm/TaskGroup.java
ava/com/android/server/wm/TaskStack.java
ava/com/android/server/wm/ViewServer.java
ava/com/android/server/wm/Watermark.java
ava/com/android/server/wm/WindowAnimator.java
ava/com/android/server/wm/WindowManagerService.java
ava/com/android/server/wm/WindowState.java
ava/com/android/server/wm/WindowStateAnimator.java
ava/com/android/server/wm/WindowToken.java
ava/service.mk
ni/Android.mk
ni/com_android_server_AlarmManagerService.cpp
ni/com_android_server_AssetAtlasService.cpp
ni/com_android_server_ConsumerIrService.cpp
ni/com_android_server_SerialService.cpp
ni/com_android_server_SystemServer.cpp
ni/com_android_server_UsbDeviceManager.cpp
ni/com_android_server_UsbHostManager.cpp
ni/com_android_server_VibratorService.cpp
ni/com_android_server_connectivity_Vpn.cpp
ni/com_android_server_input_InputApplicationHandle.cpp
ni/com_android_server_input_InputApplicationHandle.h
ni/com_android_server_input_InputManagerService.cpp
ni/com_android_server_input_InputWindowHandle.cpp
ni/com_android_server_input_InputWindowHandle.h
ni/com_android_server_lights_LightsService.cpp
ni/com_android_server_location_FlpHardwareProvider.cpp
ni/com_android_server_location_GpsLocationProvider.cpp
ni/com_android_server_power_PowerManagerService.cpp
ni/com_android_server_power_PowerManagerService.h
ni/onload.cpp
19c662b3df3b35756a92282bb6cc767e6407cb8a 20-Dec-2013 Amith Yamasani <yamasani@google.com> Move files to new directory structure of framework services

Change-Id: I6239d90fa0b813e37878f8fc31caf7a2d70fa3ba
ava/com/android/server/wifi/NetworkUpdateResult.java
ava/com/android/server/wifi/StateChangeResult.java
ava/com/android/server/wifi/SupplicantStateTracker.java
ava/com/android/server/wifi/WifiApConfigStore.java
ava/com/android/server/wifi/WifiConfigStore.java
ava/com/android/server/wifi/WifiMonitor.java
ava/com/android/server/wifi/WifiNative.java
ava/com/android/server/wifi/WifiStateMachine.java
ava/com/android/server/wifi/WifiWatchdogStateMachine.java
ava/com/android/server/wifi/p2p/WifiP2pService.java