18514 Commits

Author SHA1 Message Date
Wonsik Kim
61acf46d6a Merge "TIF: revise API names" into lmp-dev 2014-07-17 21:07:39 +00:00
Sungsoo Lim
9bf671f8ee TIF: revise API names
- TvInputManager: TvInputCallback -> TvInputListenter
- TvParentalControlManager: ParentalControlCallback -> ParentalControlListener
- TvView: unblockContent -> requestUnblockContent

Change-Id: I58220e86a4e59ee7d8f28fab833f09cd603b1e38
2014-07-19 21:22:16 +09:00
Wonsik Kim
610ccd9117 TIF: misc fix for TvInputHal
- Fixed synchronization issues
- Add a few debugging logs
- Removed unused types from TvInputHal.

Change-Id: Ia5eb8a496cc3e98cb2c2ed0f77a6a313d33bf6c9
2014-07-19 19:01:00 +09:00
Jeff Brown
f6d466895b 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
2014-07-18 21:56:08 -07:00
Jeff Brown
5dc219142a Add new Display.STATE_DOZE_SUSPEND power state.
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
2014-07-18 21:28:18 -07:00
Jae Seo
31380e8424 Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev 2014-07-18 18:24:25 +00:00
Jae Seo
bbcd206a79 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
2014-07-18 17:13:07 -07:00
Adam Lesinski
0debc9aff4 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
2014-07-18 15:24:20 -07:00
Robert Greenwalt
1fd9aeef08 Quit NetworkMonitors at end of life.
We were creating and orphaning a thread for each network.
Cleanup after ourselves.

bug:16119890
Change-Id: I8c8a9fe471e43f31f712844915992084074e8047
2014-07-18 21:14:04 +00:00
Christopher Tate
4a79daeaf7 Fix which index goes where
Change-Id: If4cf7efd4d7962eb5c10b487482653d86d92d2c6
2014-07-19 00:04:09 +00:00
Prashant Malani
84b08adcbb 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
2014-07-18 23:10:08 +00:00
John Spurlock
7b41467704 Zen mode filtering should use new usage constants.
Refactor stream-based calls to usage-based calls.

Bug:15279516
Change-Id: I3f7757d8123c14670e2ad5f8e6aa4e9803efe7ec
2014-07-19 11:57:51 -04:00
Christopher Tate
1787d9c51e Merge "Tear down agents properly at EOD in full restore" into lmp-dev 2014-07-17 21:58:28 +00:00
Christopher Tate
89101f7fe8 Tear down agents properly at EOD in full restore
The restore engine wasn't tearing down the bound agent after reaching
the end of data for the app, and furthermore was allowing the restore
operation to resume running the queue before all data had been delivered
to the current target.

Also make LocalTransport deliver data in 2K chunks rather than 32K,
as a first step towards making its timing characteristics more like
we'll see in networked situations.

Finally, added a bunch of MORE_DEBUG output for finding odd bugs
like this.

Change-Id: Icdbe6a070af6cc7c708a938ad044108d40ebce9a
2014-07-17 19:12:09 -07:00
Christopher Tate
5f7f252b45 Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Don't just drop the error return on the floor and retry (forever!).

Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
2014-07-17 23:01:04 +00:00
Youngsang Cho
6f306e21f4 Merge "TIF: Add unblock content" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
427f74293b Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 2014-07-18 18:24:25 +00:00
Jaewan Kim
903d6b72cd 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
2014-07-18 11:11:38 -07:00
Jaewan Kim
8e6b51b0fb TIF: Add onInputAdded and onInputRemoved
Bug: 16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
2014-07-18 15:35:25 +09:00
Michael Wright
c7a845de4a Merge "Add MediaProjection APIs." into lmp-dev 2014-07-17 21:15:46 +00:00
Michael Wright
c39d47a8e7 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
2014-07-17 14:30:19 -07:00
Youngsang Cho
c66ca1267c Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev 2014-07-17 21:58:28 +00:00
Jae Seo
b375805f3b 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
2014-07-17 20:25:01 -07:00
Youngsang Cho
e821d711db TIF: Add a notification for surface change from TvView to TvInputService
Bug: 15447352
Change-Id: I3e91609c5eb03be84cc7c88507457b9e74750de8
2014-07-17 17:30:36 -07:00
Ben Murdoch
dc00a84af1 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
2014-07-17 21:18:40 +00:00
destradaa
6ccb5f894e Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 2014-07-17 18:11:21 +00:00
Andres Morales
963295ea10 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
2014-07-17 20:42:04 +00:00
Jae Seo
54a4634983 Merge "TIF: Add TvParentalControlManager" into lmp-dev 2014-07-17 18:11:21 +00:00
Jae Seo
6057102dbb 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
2014-07-17 16:29:36 -07:00
destradaa
3b0224dc3c Fix exceptions in ActivityRecognition platform stack.
b/16348349

Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
2014-07-17 11:09:46 -07:00
Jeff Sharkey
69eef8a0d2 Merge "Support cluster-style installs for bundled apps." into lmp-dev 2014-07-17 18:05:14 +00:00
Jeff Sharkey
1e9189a276 Support cluster-style installs for bundled apps.
Bug: 16319961
Change-Id: I499b904dfd56f236a1b574c29a44272ed814be0f
2014-07-17 11:07:12 -07:00
Sandeep Siddhartha
f8cf71d753 Support model deletion
the updateKeyphrase call is also used to clear out a sound model currently,
this happens when the sound model passed in has no keyphrases.

We can revisit if we need another deleteSoundModel method

- Also fix an issue with the way we were writing keyphrase to the DB
  and when updating keyphrase, we actually addOrUpdate

Change-Id: Ib7250c2fdafef6bc40387912a79366c334d73292
2014-07-17 11:01:25 -07:00
Christoph Studer
329a85ba90 Merge "Cancel notification group children when summary is canceled" into lmp-dev 2014-07-17 19:55:10 +00:00
Sandeep Siddhartha
d167224510 Merge "Test hotword flow" into lmp-dev 2014-07-17 21:15:46 +00:00
Sandeep Siddhartha
7444c906fa Test hotword flow
- Also fix a few StrictMode violations in DatabaseHelper

Change-Id: I93f27407dae34cc0dca5e9f891d4ca718d6010a5
2014-07-17 18:44:12 -07:00
Wonsik Kim
187423c0bc 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
2014-07-18 09:38:59 +09:00
Craig Mautner
b3325cbb26 Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +00:00
Craig Mautner
aa9b0f1575 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
2014-07-17 10:50:18 -07:00
Justin Koh
0a93106964 am 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev
* commit '65d7c332d7b613f23a26066051cc7496e0efa994':
  Additional cleanup after stack deletion.
2014-07-17 10:56:16 +00:00
Justin Koh
75f317403f 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
2014-07-17 10:55:56 +00:00
Craig Mautner
e2e280ec59 Merge "Restore calling identity before checking permission" into lmp-dev 2014-07-17 17:59:02 +00:00
Craig Mautner
85c11a8831 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
2014-07-17 12:38:18 -07:00
Amith Yamasani
bb4d6a20bd Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 2014-07-17 02:34:24 +00:00
Amith Yamasani
390989da19 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
2014-07-17 12:14:52 -07:00
Adam Connors
c8fa3ae2ce Merge "Create DPM APIs for cross profile callerId" into lmp-dev 2014-07-17 00:15:07 +00:00
Adam Connors
210fe21e95 Create DPM APIs for cross profile callerId
Contact information in the managed profile is shown
in the incoming call UI unless blocked using this API.

TODO: Actually plumb this into the caller-id logic.

Bug: 16301261
Change-Id: If03adc907d9558baa0a45a1833b857206b7bf96a
2014-07-17 16:28:52 +01:00
Craig Mautner
45374c9afa Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +00:00
Alexandra Gherghina
999d394ade Ads per-user APIs to manage accounts through the AccountManager
Bug: 16056552
Bug: 14642886
Change-Id: I17ff6c2515285e63c84cecf2f861d10666c393c5
2014-07-17 17:08:49 +00:00
Craig Mautner
efc81e7d5e resolved conflicts for merge of 75f31740 to lmp-dev
Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java

Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b
2014-07-17 10:05:07 -07:00