8433 Commits

Author SHA1 Message Date
Jae Seo
f21ae3cf05 am 20d13a65: am 808f4741: am 98846b0f: Merge "TIF: Make selected tracks identifiable" into lmp-dev
* commit '20d13a653802e132f311a2f9de6a147a34b9f518':
  TIF: Make selected tracks identifiable
2014-08-06 17:34:10 +00:00
Santos Cordon
7c7bc7f691 Add setConferenceable() API from ConnectionService to incall. (1/4)
Change-Id: I64fdca08d35f893d755e3b154543a261b1418343
2014-08-06 03:36:09 -07:00
Brian Carlstrom
40c89a087b Remove java.lang.reflect.ArtMethod accidentally added in ad601d76e820ba680b14b7016d2e79763b7f4663
Change-Id: Ib01118d950e7cfe91c87a34489c51777262125bf
2014-08-05 21:09:29 -07:00
Dongwon Kang
66b9e91801 TIF: make TvInputService.Session class static
This change would make the developers freely extend the Session class
out of the TvInputService class.

Change-Id: I7dc9501c771a6e4dcfcceeb1b294b95e612596eb
2014-08-06 11:15:30 +09:00
Michael Wright
3f145a2f95 Add supported refresh rate to displays
Change-Id: I51231dd6dd231d57dd1ac499349d6335121f07d5
2014-08-06 02:03:49 +00:00
Ihab Awad
5d0410fa7c Finalize implementation of Remote Connection Service (1/4)
Change-Id: I3788c9ab03a979f22ab628637adf6d520038cb6e
2014-08-05 18:21:26 -07:00
RoboErik
b37bbc6c40 am 143fcc42: am a5281929: am 23d078e3: Add display metadata and change strings to CharSequences
* commit '143fcc42a51f70ce5d9d28b1779ace4c61ddc6e0':
  Add display metadata and change strings to CharSequences
2014-08-06 12:10:38 +00:00
Michael Wright
62c06ecb66 am 0aade803: am e94f3851: am c9938987: Add resize method for virtual displays
* commit '0aade8038390179070bf94683fb20ff797db1adf':
  Add resize method for virtual displays
2014-08-06 12:10:01 +00:00
Svetoslav
39999cf026 Allow adding widgets from user profiles.
The goal of this change is to enable support for appwidget from
user profiles to the user main profile. A user profile is a user
which is associated as a child of the main user profile. For example,
a user may have a personal (parent) and corporate (child) profile.
The device policy should be able to control whether adding a widget
from a child profile and given packages is allowed. This change
assumes that all packages from managed profiles are white listed.
Another change will add the device policy changes.

(cherrypicked 8cd27c3c to work around Gerrit issue)

Change-Id: I267260b55d74c48b112a29979a9f59eef7a8194e
2014-08-06 11:01:36 +01:00
RoboErik
75847b98f3 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
2014-08-05 14:30:27 -07:00
Michael Wright
01e840ff94 Add resize method for virtual displays
Change-Id: I2632fc56c2d2cba356379e42f5c1a3e283b11d1e
2014-08-05 21:10:03 +00:00
Andrew Lee
1f6bbd2920 "Implement" formerly abstract methods VideoCallProvider.
Provide null-op methods so there is greater flexibility for classes
which extend this base class, but might not support all its methods.
In the future, if we add more methods to the *.aidl interface, this
class can work with binaries which extend this class but don't
implement all the methods since the superclass now implements those
methods.

Left onSetPreviewSurface and onSetDisplaySurface as abstract.

Bug: 16842159
Change-Id: Ie7fea6ef5d473e3924ef370392f380603a568800
2014-08-06 14:37:06 -07:00
Dongwon Kang
e377ea5de6 Merge "TIF: Rearchitecting TvInputPassthroughWrapperService." into lmp-dev 2014-08-05 00:07:36 +00:00
Sungsoo Lim
2df7e30839 Merge "TIF: Remove countryCode in TvContentRating" into lmp-dev 2014-08-05 00:07:36 +00:00
Svetoslav
976e8bd201 Allow adding widgets from user profiles.
The goal of this change is to enable support for appwidget from
user profiles to the user main profile. A user profile is a user
which is associated as a child of the main user profile. For example,
a user may have a personal (parent) and corporate (child) profile.
The device policy should be able to control whether adding a widget
from a child profile and given packages is allowed. This change
assumes that all packages from managed profiles are white listed.
Another change will add the device policy changes.

Change-Id: I267260b55d74c48b112a29979a9f59eef7a8194e
2014-08-05 20:57:20 +00:00
Jae Seo
dfab517fb2 Merge "TIF: Make selected tracks identifiable" into lmp-dev 2014-08-04 23:42:57 +00:00
Jae Seo
10d285ac06 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
2014-08-05 12:06:49 -07:00
Chris Craik
0bd972295c am b7cded34: am cfaffb15: am 1a922899: Make outline alpha APIs public
* commit 'b7cded34efe8d8bf8e7a94bb336dbf640e658128':
  Make outline alpha APIs public
2014-08-04 23:41:05 +00:00
Chris Craik
13ed2178c4 Make outline alpha APIs public
bug:16140822
Change-Id: Ie21e2a75b462319fb49c5696f0c019e1ea803bc1
2014-08-04 23:28:34 +00:00
Tom Taylor
2cd2bb9e43 am fb79ed97: am 9b7596e1: am f36cba5f: Merge "Allow MmsConfig override per request (1/3)" into lmp-dev
* commit 'fb79ed970485fa5d870adc0bf58b1e47fbfed60b':
  Allow MmsConfig override per request (1/3)
2014-08-04 19:31:45 +00:00
Sungsoo Lim
732be11cef TIF: Remove countryCode in TvContentRating
In the standard TV content rating systems, there are no cases that
a TV content rating system is used for multiple countries.
Moreover, since we allow the case that the country code is null for
a custom rating system (e.g. YT), the country code should be removed.

Change-Id: I79472dbd491aa7efb40f3e081f90b45e13a91505
2014-08-04 16:46:42 +09:00
Dongwon Kang
bd2fa2c02d 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
2014-08-04 11:44:45 +09:00
John Spurlock
d8afe3c41e 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
2014-08-01 17:47:50 -04:00
Tom Taylor
0e32f6bde4 Merge "Allow MmsConfig override per request (1/3)" into lmp-dev 2014-08-01 13:51:29 +00:00
Ye Wen
63c00c4379 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
2014-08-01 13:57:31 -07:00
Sandeep Siddhartha
2c0273e50a Add a flag for multiple triggers with same recognition session
Also annotate the flags with @IntDef to make things clearer and safer

Add more debug logging

Revert to start/stop being synchronous since telephony and microphone will
need to be handled internally.

Bug: 16731586
Bug: 16514535
Bug: 16549061
Change-Id: I83695d52e9547269c95d443e4d921c9238b7401e
2014-08-01 17:46:27 -07:00
Sandeep Siddhartha
73d991e258 am 118b91bf: am 01d13015: am 966134c7: Merge "Add a flag for multiple triggers with same recognition session" into lmp-dev
* commit '118b91bf8e37dfe48551be72790680690eb0a40d':
  Add a flag for multiple triggers with same recognition session
2014-08-02 01:41:38 +00:00
Wei Wang
b8c6c2f56a am 06e7b060: am b89e6747: am 8508d7ff: Merge "Revert "Revert "Service data and manufacturer data can be repeated fields.""" into lmp-dev
* commit '06e7b0604d3a1f5ae66ec6c715947d7acf4da688':
  Revert "Revert "Service data and manufacturer data can be repeated fields.""
2014-08-01 21:02:02 +00:00
Eric Laurent
eb73cb395d am 48180bc8: am d5ec806a: am 991bd713: Merge "unhide AudioFormat getters" into lmp-dev
* commit '48180bc8de1a9e4c1272bceea76c99843d125567':
  unhide AudioFormat getters
2014-08-01 21:01:37 +00:00
Fergus Henderson
8fa71053c9 am 5604c46c: am 73193a76: am e55aaa30: Merge "Simplify generics, and make Builder concrete." into lmp-dev
* commit '5604c46c303e4a4d70476bd709d7533f9a5d19fa':
  Simplify generics, and make Builder concrete.
2014-08-01 20:50:44 +00:00
Chris Wren
a3b59dbfc2 am 7d902825: am 4ba63196: am 949c6e3a: Expose headsUpContentView so developers can customize it.
* commit '7d902825399fbba5c84a62292305e844ca0ad9a5':
  Expose headsUpContentView so developers can customize it.
2014-08-01 20:50:34 +00:00
Sungsoo Lim
3f8ddc51fc am bf1c5722: am 6d376986: am eb77c228: Merge "TIF: Use XML file for representing TvContentRating" into lmp-dev
* commit 'bf1c5722801bcecfcf030ff4c80e694d1814b325':
  TIF: Use XML file for representing TvContentRating
2014-08-01 20:50:25 +00:00
Sungsoo Lim
087a6fe30e am d1ea6778: am 2df78bef: am 05df1176: Merge "Revert "Service data and manufacturer data can be repeated fields."" into lmp-dev
* commit 'd1ea67785d6b6d2c9b86f5037257d523252bf4e6':
  Revert "Service data and manufacturer data can be repeated fields."
2014-08-01 20:49:54 +00:00
Wei Wang
12f013dfa1 am bc61cadd: am 61e6c1e0: am 1d5fcf03: Merge "Service data and manufacturer data can be repeated fields." into lmp-dev
* commit 'bc61cadd12b6bc2a4ea396d97a23efe9fae4aa37':
  Service data and manufacturer data can be repeated fields.
2014-08-01 20:49:45 +00:00
Sandeep Siddhartha
47607d07ea am f6a30eb6: am b8265920: am b8ffb28e: Merge "Tighten the checks around a detector being invalidated" into lmp-dev
* commit 'f6a30eb6f86a16d5dae1ad392c5a08292e7f446a':
  Tighten the checks around a detector being invalidated
2014-08-01 20:49:35 +00:00
Jeff Sharkey
96f0c8dd4f am 2b7fc490: am cc2e3136: am 2e7a3cb7: Merge "Persist install sessions, more lifecycle." into lmp-dev
* commit '2b7fc490a7a2844ea2978b174eab34cb83e64b8b':
  Persist install sessions, more lifecycle.
2014-08-01 20:49:25 +00:00
George Mount
23785adfe9 am b3bd029b: am dab97bb2: am 044a7d67: Add differentiating transitions for returning/reentering.
* commit 'b3bd029b5ab2df8c86ab903bc597f858298be157':
  Add differentiating transitions for returning/reentering.
2014-08-01 20:49:16 +00:00
Wei Wang
6bf513d32d Revert "Revert "Service data and manufacturer data can be repeated fields.""
This reverts commit 14c797702543bb5ced989565d90abcfa55c7db46.
2014-08-01 11:12:37 -07:00
Chris Wren
97c0b90f89 Expose headsUpContentView so developers can customize it.
Bug: 13510114
Change-Id: I645c204e366fefab58224d2e67d00e701dc661aa
2014-08-01 10:57:05 +00:00
Eric Laurent
9aa499ac42 Merge "unhide AudioFormat getters" into lmp-dev 2014-08-01 02:00:00 +00:00
Eric Laurent
0498269c00 unhide AudioFormat getters
Bug: 12378680.
Change-Id: Ibe49c6386b12159e705f49f323cae27b6e2d749a
2014-07-31 17:12:53 -07:00
George Mount
68f96d8db5 Add differentiating transitions for returning/reentering.
Bug 16550363

Change-Id: I85f9a8bcbc92ce048d06b36579bb05893534f7f8
2014-07-31 21:58:06 +00:00
Fergus Henderson
732af43eb1 Merge "Simplify generics, and make Builder concrete." into lmp-dev 2014-07-31 19:45:19 +00:00
Niels Egberts
2a236a6466 Simplify generics, and make Builder concrete.
Change-Id: I3e14966527c254d2c15dddefc2ef60cdde30421f
2014-08-01 11:46:16 +01:00
Jae Seo
484da7eb5f am e05ae199: am 6d682881: am b3e54101: TIF: Make TvTrackInfo methods more explicit.
* commit 'e05ae199c403c1ea399e81fbeed1d4bc9b7854e1':
  TIF: Make TvTrackInfo methods more explicit.
2014-07-31 13:41:59 +00:00
Bernhard Bauer
8989964ee3 Add a method to DevicePolicyManager to silently install a certificate / private key pair.
BUG=15065444

Change-Id: Id3d255e1fce2c608501c3a038633a93c7f191426
2014-07-31 09:30:13 +01:00
Jae Seo
d5ce975952 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
2014-07-31 16:15:51 +09:00
Lorenzo Colitti
87dffdd02b am 9200a867: am 6f088df9: am 44551060: Allow using third-party HTTP/... stacks for per-network URLs.
* commit '9200a867a71b02c0147b0a9670f1e141d398aa43':
  Allow using third-party HTTP/... stacks for per-network URLs.
2014-07-31 03:11:12 +00:00
Lorenzo Colitti
5b37fa2ed5 Allow using third-party HTTP/... stacks for per-network URLs.
Also switch to double-checked locking for
mNetworkBoundSocketFactory and OkHttpClient.

Change-Id: Ic52776ee760036ad5623b7496156b8909dc282fa
2014-07-31 02:17:28 +00:00
Shishir Agrawal
81f10dbd01 am b169a41e: am 1d678b52: am 20832529: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev
* commit 'b169a41e409ee6e62dc3c9403fd5a7129f921a23':
  Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
2014-07-31 01:22:35 +00:00