2244 Commits

Author SHA1 Message Date
John Spurlock
eaeac08489 am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.
* commit '3897183d7bd884c4a01b22dccce75df48e93ab4a':
  Zen mode filtering should use new usage constants.
2014-07-20 18:04:06 +00:00
Wonsik Kim
8f199a44fd am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev
* commit '1042ee6be6294ad07ccda31571641996abc88bde':
  TIF: misc fix for TvInputHal
2014-07-20 18:03:49 +00:00
Jeff Brown
3ab509a29b am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev
* commit '958361e92371fd7d3b40fbbd91077ec4d7abe374':
  Allow dreams to wake up gently.
2014-07-20 18:03:35 +00:00
Jeff Brown
253aa5d458 am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
* commit '610014e6501d3543f33aedcc7f302288afcc4df4':
  Add new Display.STATE_DOZE_SUSPEND power state.
2014-07-20 18:03:26 +00:00
Jae Seo
aa75604f2c 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
2014-07-20 18:03:09 +00:00
Christopher Tate
a1fd6bc661 am 32523262: am 12e9b896: Fix which index goes where
* commit '32523262b62c4598ffd50873d290c1c601b9f842':
  Fix which index goes where
2014-07-20 17:59:46 +00:00
Prashant Malani
f47665c1be am af5f3b92: am c61f26fa: Make the booting flag update unconditional
* commit 'af5f3b92a7acec0301067ed1cdad857056326e3b':
  Make the booting flag update unconditional
2014-07-20 02:18:41 +00:00
Adam Lesinski
c2332a4d00 am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API
* commit 'b11e7d48398c8e6e57578dabcf71eeef6a4e8bfd':
  First iteration of a public UsageStats API
2014-07-20 02:17:49 +00:00
Robert Greenwalt
3052ccee23 am 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life.
* commit '8a717ee8b26cdd6d916818451add978c1776bd6e':
  Quit NetworkMonitors at end of life.
2014-07-20 02:17:01 +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
Jeff Brown
5dc219142a Add new Display.STATE_DOZE_SUSPEND power state.
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
2014-07-18 21:28:18 -07: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
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
Youngsang Cho
5bebd95959 am 2ec6fb80: am e94cfccd: Merge "TIF: Add unblock content" into lmp-dev
* commit '2ec6fb8085f78dceda26d1f1634f6e27b630166a':
  TIF: Add unblock content
2014-07-18 19:00:10 +00:00
Youngsang Cho
e670d86ff9 am 7c8bbd53: am c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev
* commit '7c8bbd53c6622248377794a7ea6289b1c952a2f6':
  TIF: Add onInputAdded and onInputRemoved
2014-07-18 19:00:05 +00: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
Youngsang Cho
427f74293b Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 2014-07-18 18:24:25 +00:00
Christoph Studer
7c053de8ba 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
2014-07-18 11:45:17 +00:00
Jaewan Kim
8e6b51b0fb TIF: Add onInputAdded and onInputRemoved
Bug: 16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
2014-07-18 15:35:25 +09:00
Youngsang Cho
c13eacf40e 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
2014-07-18 03:39:59 +00:00
Jae Seo
4d9ed9ccb9 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
2014-07-18 03:35:32 +00:00
Jae Seo
353bdd484f am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
* commit 'b719bf5720ea501fa6324d866e49e65b59b1a182':
  TIF: Add TvParentalControlManager
2014-07-18 03:30:41 +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
Wonsik Kim
b0026ccd29 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
2014-07-18 03:09:45 +00:00
Michael Wright
e4da19a9f1 am e9f933cd: am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev
* commit 'e9f933cd6bdecb96212d5edf9ba54c7c12c46f03':
  Add MediaProjection APIs.
2014-07-18 00:32:13 +00:00
Ben Murdoch
3aa88cd61a am 5ba41787: am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev
* commit '5ba4178783a48d3269e3404a1ba62263afd5932e':
  Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
2014-07-17 23:48:26 +00:00
destradaa
eccc5480a6 am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
* commit 'e23838004e5db510c6e86919b2dcf16e67e3339b':
  Fix exceptions in ActivityRecognition platform stack.
2014-07-17 23:48:08 +00:00
Andres Morales
f9f7474687 am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition
* commit '77bf359b2d6b81fc18efe9ab888699df27ab81f9':
  Permit settings to "wipe" the persistent partition
2014-07-17 23:47:52 +00:00
Youngsang Cho
6f306e21f4 Merge "TIF: Add unblock content" into lmp-dev 2014-07-17 21:58:28 +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
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
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
Craig Mautner
68ad9d762d am 64dc5b09: am 20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev
* commit '64dc5b09f1d398541486dd7beb777c71c1a4f0ec':
  Restore calling identity before checking permission
2014-07-17 21:29:32 +00: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
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
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
Amith Yamasani
74b5b4005b 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
2014-07-17 20:59:12 +00:00
Jeff Sharkey
33e5a6be31 am 37f7e245: am 375d5b90: Merge "Support cluster-style installs for bundled apps." into lmp-dev
* commit '37f7e24584b0a85adc6d699818e3e863c261e4ed':
  Support cluster-style installs for bundled apps.
2014-07-17 20:58:31 +00:00
Craig Mautner
25dd00a519 am 73c69b27: am c2d339a6: Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev
* commit '73c69b2727b311d12f1ca8ad197db7cbe83d162c':
  Additional cleanup after stack deletion.
2014-07-17 20:58:17 +00:00
Craig Mautner
1e4603547a 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
2014-07-17 20:57:42 +00:00
Alexandra Gherghina
02e130fccf 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
2014-07-17 20:57:31 +00:00
Kenny Guy
a44b14da0c am 0dfd3e04: am 41482465: Merge "Allow app restrictions for uninstalled packages." into lmp-dev
* commit '0dfd3e04f5da364e3500d3848ba3d21b3215716e':
  Allow app restrictions for uninstalled packages.
2014-07-17 20:57:19 +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
Christoph Studer
329a85ba90 Merge "Cancel notification group children when summary is canceled" into lmp-dev 2014-07-17 19:55:10 +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