19 Commits

Author SHA1 Message Date
Jim Miller
91aa1bdb57 am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
  Remove TrustAgent whitelisting API
2015-02-25 18:17:13 +00:00
Jim Miller
bc4f2ccf6c Remove TrustAgent whitelisting API
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
2015-02-24 20:15:02 -08:00
Adam Powell
97e0ba6912 am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
* commit 'b73e029fea53fd5aeaf01ad7ba15560329d8de1c':
  Add DENSITY_280
2015-02-12 02:25:29 +00:00
Adam Powell
0ec652cf72 Merge "Add DENSITY_280" into lmp-mr1-dev 2015-02-12 02:08:04 +00:00
Adam Powell
f6d4045d6c Add DENSITY_280
Bug 19350604

Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
2015-02-11 13:34:43 -08:00
Nick Vaccaro
f5021f6818 Update API to contain new wrist tilt sensor type and string.
Convert the wrist tilt sensor from being a vendor-defined sensor
type to being an official android sensor type.

Change-Id: I39807bdca4f4c853fa0f7e88e6d98c02245f2a8b
2015-02-10 20:43:44 +00:00
Andre Eisenbach
8f31fa81e0 am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
* commit '3ca77ccf873f12e116a66d1c1a417fe89f75af85':
  Add API to check if a Bluetooth connection is encrypted (1/2)
2015-02-10 00:34:43 +00:00
Andre Eisenbach
2b8696e3a9 Add API to check if a Bluetooth connection is encrypted (1/2)
Bug: 19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c
2015-02-09 11:31:06 -08:00
Bryce Lee
53b9fbd161 Expose userActivityTimeout through @SystemApi getter/setter.
This reverts commit 0dad5720902fad041bc8e2221953aab6dd1d2d8f.
System api documentation is not updated under PDK builds.

Change-Id: I851bcd66e0b764265e69ac104d5604bf316d5d10
2015-02-06 12:06:34 -08:00
Bryce Lee
e847b5baef Make THEATER_MODE_ON a System API.
Bug: 19043538
Change-Id: Ibf0d6b45868ca90eb792a40c5d1b1395774486b8
(cherry picked from commit cdfebd60fad097fa58d45f13104990cd323be61b)
2015-02-06 02:41:09 +00:00
Filip Gruszczynski
9fedc72a0b Add wallpaper controlling system apis.
Change-Id: Ibaa8009e9b9d2e58254a4d9107a316c7f1de2211
2015-02-05 12:29:42 -08:00
Tyler Gunn
8a2b1199a6 Fixing conference merge where only one party is added to conference.
- Adding "onConferenceStarted" listener for Connections.
- This is necessary so that an ImsCall can report the fact that it has
went from being a single party call to a multiparty call.  This was not
previously necessary since the multiparty bit change would be detected
when one of the connections being merged changed state.  Since we now must
defer the establishment of the conference until all connections have been
merged, we need a means of detecting when the call becomes multiparty.

Bug: 18960042
Change-Id: I3ba138cb546e3efdf89b29d6676d00257a5e00cd
2015-01-29 11:47:24 -08:00
Bryce Lee
1061652a37 Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 2015-01-28 17:50:39 +00:00
Bryce Lee
034dc3839f Revert "Make THEATER_MODE_ON setting a system api."
This reverts commit 35dafda1b0357eb0f2eef766427a2b473967a918.

Change-Id: I76e72592791682e0dbee719fbd518962a1bdcd11
2015-01-28 17:45:35 +00:00
Bryce Lee
d8cb404035 Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 2015-01-28 17:03:57 +00:00
Nancy Chen
c059271ca4 Update system-api for new getLine1Number() method.
Add new method in TelecomManager to system-current.txt.

Bug: 19087382
Change-Id: Id6db61fed45301cc1a15ded6e362d7858f24a273
2015-01-26 12:35:35 -08:00
Bryce Lee
35dafda1b0 Make THEATER_MODE_ON setting a system api.
This will allow an unbundled home to continue accessing this property.

Bug: 19043538
Change-Id: I845a8726e617ca7b6f7f7347a0ac5aa0620d6658
2015-01-26 08:21:10 -08:00
Jinsuk Kim
3379c1cb62 Fix broken build
Updated system-current.txt

Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
2015-01-23 17:13:50 +09:00
Ying Wang
02937eba32 Check in "current" system API files.
The API files were generated by running "make showcommands update-system-api".

Bug: 18960664
Change-Id: Ibb4756d98be3cbf67f6103f5d5d8ff060b3c34c9
2015-01-20 16:30:47 -08:00