19120 Commits

Author SHA1 Message Date
Paul Jensen
fb1a3d4ddf am 0f59a16d: am 4d00f65c: am 43293a8b: Merge "Use a new socket for each of the host\'s IP addresses." into lmp-dev
* commit '0f59a16de57c575d51e66d8ada983a4dd4860111':
  Use a new socket for each of the host's IP addresses.
2014-07-30 18:54:00 +00:00
Ben Murdoch
23ec52e669 Remove dependency on WebView native library path.
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

Change-Id: Id3c1e3cc2e2a06c1021ad0260a37abcd07d78fd6
2014-07-30 19:36:31 +01:00
Lorenzo Colitti
f0382899c7 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
2014-07-30 17:31:04 +00:00
Bernhard Bauer
ee0c1f5898 Remove a method from DevicePolicyManagerService that slipped in by accident.
Change-Id: Ic4db8055e890ca666895fb92dbf957c7d9f394d7
2014-07-30 18:06:39 +01:00
Chris Wren
9c4021e401 am cf670e93: am b033f028: am 6d23f4fd: Merge "Add a log and statistics for notification expansion." into lmp-dev
* commit 'cf670e9325f291f978e175aa7893ed038e5c2b32':
  Add a log and statistics for notification expansion.
2014-07-30 16:54:14 +00:00
Robin Lee
059c83ce02 am a25bd32c: am 9011c4e7: am e6818f08: Merge "Don\'t turn off screen after wiping user profiles" into lmp-dev
* commit 'a25bd32c51c145cbf21e4842e1a8207e644483ee':
  Don't turn off screen after wiping user profiles
2014-07-30 16:54:10 +00:00
Nicolas Prevot
ffb6538fc0 am b4a59eac: am 19b87db6: am 43586171: Removing old tag TAG_FORWARDING_INTENT_FILTERS.
* commit 'b4a59eac58bf1540fd85c2cb2fd6ef94707f9c9d':
  Removing old tag TAG_FORWARDING_INTENT_FILTERS.
2014-07-30 16:53:55 +00:00
Adrian Roos
0137fad85c am a31c657f: am b0ccee55: am a8ef647d: Trust: Make setEnabledFeatures asynchronous
* commit 'a31c657fa680a46579e10f1e117497a276c74ebe':
  Trust: Make setEnabledFeatures asynchronous
2014-07-30 16:53:34 +00:00
Adrian Roos
dd1c74b4e7 am ced134ad: am f4f27378: am 33d3756f: Add setManagingTrust and expose it on lockscreen
* commit 'ced134adf760e328d8459cfb38d1844868e4659f':
  Add setManagingTrust and expose it on lockscreen
2014-07-30 16:53:30 +00:00
Jae Seo
9e96af9848 am a6377bb1: am 4c61c0a4: am ec7accc2: TIF: Merge TvParentalControlManager into TvInputManager
* commit 'a6377bb178192f54a761325ff951a59cacd1d6e6':
  TIF: Merge TvParentalControlManager into TvInputManager
2014-07-30 16:53:00 +00:00
Wonsik Kim
369490f76b am d8b76117: am af1ea61c: am d284bd57: TIF: ensure hardware / CEC event calling sequence
* commit 'd8b76117bea4932c10edb97a6bc10d5cad8f5ce5':
  TIF: ensure hardware / CEC event calling sequence
2014-07-30 16:52:47 +00:00
Sandeep Siddhartha
7ded9c83e8 am e3f564aa: am e444b911: am 5b02e931: Notify VIS of shutdown before switching implementations
* commit 'e3f564aaf13fbe598916345f92e3c19723bc762d':
  Notify VIS of shutdown before switching implementations
2014-07-30 16:52:18 +00:00
Ye Wen
83582e3362 am 66c553b0: am 1b16479a: am 76f285ee: Merge "Implement broker pattern for imms (1/3)" into lmp-dev
* commit '66c553b0954bde0da980302292eb80ba1c69fe09':
  Implement broker pattern for imms (1/3)
2014-07-30 16:52:05 +00:00
Amith Yamasani
e2013c5dc7 am f77c4da3: am 8d072bf2: am e257f1ee: Set profile owner via an intent
* commit 'f77c4da31c808ac48eb4dc96c8f9283ac159e496':
  Set profile owner via an intent
2014-07-30 16:51:54 +00:00
Craig Mautner
4cf86f1f5a am c3c854c5: am 34a2d92a: am 6b3bade6: Eliminate memory leak in TaskPersister
* commit 'c3c854c5ab4565f9db276158c4a4681387c89084':
  Eliminate memory leak in TaskPersister
2014-07-30 16:51:27 +00:00
Jeff Davidson
8456f49a27 am d823f25a: am bf7b7ee0: am ebc1f37f: Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev
* commit 'd823f25a7899ab5203755424a80a605ac98ccd8e':
  Add NetworkScoreManager.disableScoring().
2014-07-30 16:51:12 +00:00
Jinsuk Kim
498a159aed am 152955d9: am 0c7ef24c: am 8b964025: Invoke input change listener at path change
* commit '152955d9b7f3fd334df6b56ea10b2e608d35f0c3':
  Invoke input change listener at path change
2014-07-30 16:51:07 +00:00
Yuncheol Heo
e4a1ab4c18 am 28307a99: am cd29acf7: am 6fa5476a: Make it pass CECT 11.1.3 System standby
* commit '28307a99029950f414ff346038c406c7495521c6':
  Make it pass CECT 11.1.3 System standby
2014-07-30 16:51:03 +00:00
Nicolas Prevot
29762c3dfb 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
2014-07-30 14:06:22 +00:00
Adrian Roos
8f21158fe6 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
2014-07-30 12:34:18 +00:00
Adrian Roos
7861c663fd 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
2014-07-30 12:33:33 +00:00
Jae Seo
783645e99f 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
2014-07-30 15:39:39 +09:00
Wonsik Kim
d922a546b9 TIF: ensure hardware / CEC event calling sequence
Bug: 16441047
Change-Id: Ie654b78ec91a081a1438cc036967f528e063f25b
2014-07-30 11:19:56 +09:00
Sandeep Siddhartha
8ef360f348 Notify VIS of shutdown before switching implementations
This lets the implementation cleanup before it's destroyed.

Bug: 16629417
Change-Id: Ia717d461677e9ca8fa66f02c030aacad1597692d
2014-07-29 17:23:40 -07:00
Amith Yamasani
bf3a946548 Set profile owner via an intent
priv apps can request to become a profile owner after setup has
completed. This will pop up a consent dialog (in Settings).

Also, clean up profile owner concept to be a component name.

Change-Id: I5e8532866e8018f61836c4e84fbbadb6150218ae
2014-07-29 23:43:32 +00:00
Craig Mautner
f4f8bb793f 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
2014-07-29 23:23:01 +00:00
Jinsuk Kim
43c23e273e 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
2014-07-29 22:57:52 +00:00
Yuncheol Heo
26ba7fddca 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
2014-07-30 07:55:39 +09:00
Jinsuk Kim
b2b3151a42 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
2014-07-29 22:41:57 +00:00
Christopher Tate
7dfbaf52db Make archive metadata idempotent
We want to make sure that the manifest and widget metadata
blocks are identical, including their in-stream headers, if
we regenerate the archive without underlying filesystem changes.

Bug 15968355

Change-Id: I828b264545d19e1d865d98d5723915d02fafc012
2014-07-29 21:06:29 +00:00
Jeff Davidson
1561fd3b06 Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev 2014-07-24 16:56:49 +00:00
Jeff Davidson
26fd143326 Add NetworkScoreManager.disableScoring().
Allows the active scorer app to disable itself.

Change-Id: I7bcdc3aafb95af4ea0b110b01b08ab4daf7a137f
2014-07-29 16:03:19 -07:00
Lorenzo Colitti
c6acfa29d5 Merge "Use getBoundURL for network validation." into lmp-dev 2014-07-24 16:04:26 +00:00
Lorenzo Colitti
ae6dffb697 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
2014-07-29 13:36:10 +09:00
Jim Miller
73f1856f7f Merge "Add new DevicePolicyManager API to allow fine-grained TrustAgent management" into lmp-dev 2014-07-25 21:16:23 +00:00
Jim Miller
604e7558ef 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
2014-07-28 21:32:01 -07:00
Craig Mautner
7544c82997 am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
* commit '09875ec7292b19e07c38b6127406d6aa7490e26c':
  Remove PendingActivityLaunches based on stack.
2014-07-29 01:07:59 +00:00
Craig Mautner
09875ec729 am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.
2014-07-28 23:28:59 +00:00
Craig Mautner
0fa45d93f7 Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 2014-07-28 22:45:16 +00:00
Craig Mautner
7f13ed37fd 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
2014-07-28 14:00:35 -07:00
John Spurlock
bfa5dc4c6c Zen: Classify notifications using the alarm stream.
Also:
 - include audio attributes in dump
 - workaround for recent AudioAttributes change.

Bug:16455021
Change-Id: Ib9b047a74cff3e0cc354a5aaa96bc92a400b3845
2014-07-28 23:34:31 -04:00
Craig Mautner
a9c5257a15 am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
* commit 'a0bb44efe96ca70635b64dac8922b225d1a19407':
  Finish crashed activities immediately
2014-07-25 02:19:53 +00:00
Craig Mautner
a0bb44efe9 Merge "Finish crashed activities immediately" into klp-modular-dev 2014-07-24 20:48:02 +00:00
Craig Mautner
8e5b133bf6 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
2014-07-24 13:32:37 -07:00
Prashant Malani
bc3699b1c3 am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev
* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
  Revert "Remove circular mask"
2014-07-24 18:06:03 +00:00
Ye Wen
1ac05fc61a Merge "Implement broker pattern for imms (1/3)" into lmp-dev 2014-07-24 15:37:54 +00:00
Ye Wen
d97e1fdb29 Implement broker pattern for imms (1/3)
b/16324360

Change-Id: I41dc9823820eed60406973f5edb5a71deb4b0130
2014-07-29 16:32:07 -07:00
Sandeep Siddhartha
2e14dd46e1 Use keyphrase id from the recognition event
Bug: 16516658
Change-Id: I8be773eec39e1c4c57d106e03a443cbfc5c6dc5d
2014-07-29 13:37:34 -07:00
Sandeep Siddhartha
6817337118 Read the keyphrase ID from the recognition event
Bug: 16516658
Change-Id: Ibeee81c9543aa1091bb075066cfc2269107f13c0
2014-07-29 11:24:51 -07:00
Matthew Williams
ee410da42b 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
2014-07-29 11:11:41 -07:00