1673 Commits

Author SHA1 Message Date
Jim Miller
a7596147b4 First pass at FingerprintService integration with HAL.
Move FingerprintService to framework services directory
Fix merge conflicts.

Tested: scanning, enrolling, removing.

Change-Id: I58b2b902cb671dc82cdaa54a195ba5f1a154622c
2014-06-17 14:03:37 -07:00
Jeff Sharkey
96f4e595ba 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
2014-06-17 11:51:31 -07:00
Jungshik Jang
3ecdd832c7 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
2014-06-17 14:04:38 +09:00
Jungshik Jang
8db85ab744 Merge "Rename HdmiCecKeycodeTranslater to HdmiCecKeycode." 2014-06-17 04:00:08 +00:00
Jungshik Jang
cd3445cc8b Rename HdmiCecKeycodeTranslater to HdmiCecKeycode.
Since HdmiCecKeycode defines all keys used for Hdmi CEC,
simple HdmiCecKeycode sounds better than HdmiCecKeycodeTranslater.

Change-Id: I1a0ea9f128b19dd47bfda3bf2dd8794a9e42c6f8
2014-06-17 13:23:06 +09:00
Lorenzo Colitti
b86f752a24 Merge "Notify network observers of route changes." 2014-06-17 04:04:28 +00:00
Jungshik Jang
3e1e33f13b Merge "Rearrange ownership between Hdmi control modules." 2014-06-17 04:00:08 +00:00
Jungshik Jang
79c58a4b97 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
2014-06-17 13:03:55 +09:00
Lorenzo Colitti
c18cbfdf8d Notify network observers of route changes.
Bug: 9180552
Change-Id: If8432bc74335676320b815784b21f404d3479c35
2014-06-17 11:18:54 +09:00
Jinsuk Kim
6d97f5b91c 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
2014-06-16 14:01:45 +09:00
Jinsuk Kim
ca515e307e Merge "Added an argument isPressed to HdmiControlService#sendKeyEvent" 2014-06-10 22:31:57 +00:00
Jeff Sharkey
c4858a2ba9 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
2014-06-16 13:20:18 -07:00
Jeff Sharkey
b87de28f50 Build usesLibraryFiles with ArraySet.
Use ArraySet instead of using odd shared variable.

Change-Id: Ide5095069ae8f2dcb4553f37e877fc1fce33ebde
2014-06-16 13:20:17 -07:00
Jinsuk Kim
0d3985a977 Added an argument isPressed to HdmiControlService#sendKeyEvent
sendKeyEvent requires additional argument isPressed to handled
both up/down key event.

Change-Id: I0080adc72920dd7ae4e4dae041781f76a6658f9b
2014-06-16 17:26:10 +09:00
Natalie Silvanovich
bc8169b055 Merge "Null checks in register/unregister BT Adapters" 2014-06-14 02:21:10 +00:00
Christoph Studer
26b6db36a3 am afaf0c54: Prevent duplicate notifications
* commit 'afaf0c54731e126affcd3319a1d9a4f0da63411e':
  Prevent duplicate notifications
2014-06-16 16:28:30 +00:00
Narayan Kamath
5d140e4b1b am 5406f59a: am 6a6411e3: am 076dc013: Merge "Move dex file pruning to installd."
* commit '5406f59abd0cde826e8254fe628bea6d80769c8c':
  Move dex file pruning to installd.
2014-06-16 13:58:39 +00:00
Narayan Kamath
5406f59abd am 6a6411e3: am 076dc013: Merge "Move dex file pruning to installd."
* commit '6a6411e3d8c533a40bfe1897e2c26e3d6f3b52e0':
  Move dex file pruning to installd.
2014-06-16 13:54:10 +00:00
Christoph Studer
c511555670 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
2014-06-14 20:45:54 +00:00
Craig Mautner
916cd9770c am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
* commit '6335fbcba106147d914acae0a9d8f4fcd53af768':
  Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
2014-06-14 00:30:47 +00:00
Craig Mautner
4019037540 am 6fe2184b: Do not treat the dummy animation as an animation
* commit '6fe2184bf10362ac53db7e8f6a0be521ea59b054':
  Do not treat the dummy animation as an animation
2014-06-14 00:22:36 +00:00
Craig Mautner
6335fbcba1 Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.
2014-06-13 17:18:47 -07:00
Craig Mautner
6fe2184bf1 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
2014-06-13 15:46:22 -07:00
Justin Koh
0f3d3dd26c am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly."
* commit 'dd5c94717077c9366dee364c88a86a78e5ee2688':
  Revert "Close ActivityView and ActivityContainer cleanly."
2014-06-13 17:27:48 +00:00
Justin Koh
dd5c947170 Revert "Close ActivityView and ActivityContainer cleanly."
This reverts commit 4a9f129874785d34930f165268dbc618e4bc2618.

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2
2014-06-13 09:55:09 -07:00
Craig Mautner
4849aa86b1 am be634951: Fix permission problem and NPE
* commit 'be63495101dba3b0c3c496cdd810df9e30e926d4':
  Fix permission problem and NPE
2014-06-12 23:36:54 +00:00
Nick Kralevich
50ece5ec53 am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles."
* commit '9a0485aa567c99157e45d08e9712a281f34ffc5f':
  Add service_contexts to policy update bundles.
2014-06-12 21:10:30 +00:00
Craig Mautner
be63495101 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
2014-06-12 13:50:53 -07:00
Craig Mautner
f5030ecbca am 4a9f1298: Close ActivityView and ActivityContainer cleanly.
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.
2014-06-12 00:00:17 +00:00
Craig Mautner
4a9f129874 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
2014-06-11 16:33:00 -07:00
Craig Mautner
28084383c1 am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
* commit 'e33010a261d881426ce0af9a9e2177137ec3f6b9':
  Add NO_ANIMATION flag to ActivityView Intents.
2014-06-11 17:42:06 +00:00
Craig Mautner
e33010a261 Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 2014-06-11 08:41:11 +00:00
Griff Hazen
579ace0358 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
2014-06-11 01:18:36 +00:00
Griff Hazen
9f637d1095 Reduce notification service historical archive size to 1 for watches.
To remove the memory footprint

Bug: 15536759
Change-Id: I081bd962fef689b5d8ed126208499d56ebf4ae38
2014-06-10 15:31:48 -07:00
Jungshik Jang
7237cd811c Merge "Refine new device action." 2014-06-10 22:29:12 +00:00
Jungshik Jang
60cffce420 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
2014-06-16 13:33:07 +09:00
Jinsuk Kim
67ad9a4557 Use android-cec key conversion in HdmiControlService.sendKeyAction
Change-Id: I8395d0217e2bbcd2cd6148414be8bcde1db168c0
2014-06-16 02:58:42 +00:00
Jinsuk Kim
401e3de791 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
2014-06-16 02:49:15 +00:00
Jinsuk Kim
0a3316bcfd 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
2014-06-15 21:45:47 +00:00
Craig Mautner
d163e75189 Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.

Change-Id: I7bac1aa1d96fa7922cc835949730a26204f15f2f
2014-06-13 17:39:35 -07:00
Craig Mautner
bc2a6dff1f 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
2014-06-13 17:33:15 -07:00
Qiwen Zhao
220cad6d97 Merge commit '0f3d3dd2'
Conflicts:
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
2014-06-13 14:43:51 -07:00
Wink Saville
24683f1e15 Merge "Merge kwd to master" 2014-06-12 05:34:42 +00:00
Wink Saville
fb40dd4d00 Merge kwd to master
Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
2014-06-13 13:30:57 +00:00
Kenny Guy
17c9d69d70 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
2014-06-13 14:10:29 +01:00
Matthew Williams
78b9654311 Merge "JobScheduler blocking main thread." into lmp-preview-dev 2014-06-12 03:30:50 +00:00
Matthew Williams
49a85b64f7 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
2014-06-12 12:40:42 -07:00
Robert Greenwalt
a83ce3451d Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev 2014-06-12 03:30:50 +00:00
Robert Greenwalt
6078b50b01 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
2014-06-11 23:17:46 -07:00
Robert Greenwalt
594b456b6e Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev 2014-06-10 22:12:51 +00:00