Commit Graph

8051 Commits

Author SHA1 Message Date
John Spurlock
999b83af8b am 4704c806: am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.
* commit '4704c8067743f36df6fc9622090f422e6bdec2c5':
  Zen mode filtering should use new usage constants.
2014-07-21 18:24:58 +00:00
Wonsik Kim
5bf37c2276 am cbb951f6: am a7279448: am 71e398b4: Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev
* commit 'cbb951f6bb4435c2cfca260ac3aef34876986013':
  TIF: Reorder TvInputInfo types from old to new.
2014-07-21 18:24:48 +00:00
Lajos Molnar
c2c127f841 am ea788337: am cebc7989: am 1717dea8: Extend MediaCodecInfo to describe usable codec limits and features
* commit 'ea788337e49ffac2a7ff3f3826ffdd77b83cd525':
  Extend MediaCodecInfo to describe usable codec limits and features
2014-07-21 18:24:38 +00:00
Jeff Brown
e53b1eb276 am 5fbc6cae: am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev
* commit '5fbc6cae0c643be46de3c7c720c8e26a182514fa':
  Allow dreams to wake up gently.
2014-07-21 18:24:33 +00:00
Dongwon Kang
a06aba8f47 am 3dff1c6d: am c90b613c: am c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev
* commit '3dff1c6dc2e73e99437bccdb47d10eb5155ed03c':
  TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
2014-07-21 18:24:27 +00:00
Jeff Brown
1d95978423 am 22193893: am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
* commit '22193893f7a79f1351caf157a8d6932e7ec3c825':
  Add new Display.STATE_DOZE_SUSPEND power state.
2014-07-21 18:24:21 +00:00
Jae Seo
dbff278e83 am e3576308: am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
* commit 'e3576308987b508384c8689940ec71fbfb39b580':
  TIF: Add a way to notify whether the current program content is allowed
2014-07-21 18:24:15 +00:00
John Reck
f206ef5a58 am e5469d04: am 761e298b: am b09a6670: Return Animator instead of ValueAnimator
* commit 'e5469d0478c4319b05f569c24e21c2f0821390e4':
  Return Animator instead of ValueAnimator
2014-07-21 18:24:07 +00:00
Wei Wang
399212445e am 9d2698b3: am 6e065374: am 5cb5ae18: More API modification of BLE APIs (1/2).
* commit '9d2698b3a34618852bd88a30a54f6e608b18f14d':
  More API modification of BLE APIs (1/2).
2014-07-21 18:23:56 +00:00
Jean-Michel Trivi
9f54221372 am 11724dc5: am bece8116: am 01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev
* commit '11724dc595bb0550de376212d27909409a112cbb':
  Unhide AudioTrack constructor with AudioAttributes, AudioFormat
2014-07-21 18:23:46 +00:00
Jean-Michel Trivi
7e8bcc07b2 am c9476fe0: am abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev
* commit 'c9476fe02e66ae121c0994637a62ea0b6b546c52':
  Hide AudioManager.startBluetoothScoVirtualCall()
2014-07-21 18:23:03 +00:00
Chris Craik
d5a3e217bd am 0a3bcdcc: am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev
* commit '0a3bcdccb14aa7247463aa91de1cc7e3e1ea148f':
  Tweaks to outline API
2014-07-21 18:22:53 +00:00
Adam Powell
91d67f9c7d am bd90f0ce: am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev
* commit 'bd90f0ce2d052d2e0d753e0cc7b10a1f658b496e':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
2014-07-21 18:22:48 +00:00
Yorke Lee
c1a7bec766 am d4c489a8: am c5989521: am c5a8e2f1: Rename voicemail permissions
* commit 'd4c489a867b95431fbab388bbc4cd4da57165e84':
  Rename voicemail permissions
2014-07-21 18:22:44 +00:00
Shishir Agrawal
f05423f492 am 0924a642: am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev
* commit '0924a6422b3dad4bad0701c1f834cc6b5451ca44':
  Adding the ability for carrier app to override SPN and carrier name.
2014-07-21 18:22:38 +00:00
Sreeram Ramachandran
5854dfed88 am 35de9295: am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev
* commit '35de92955536b6f050e4657ece2028fab67d7f7e':
  Allow VPN interfaces to be put into blocking mode.
2014-07-21 18:22:28 +00:00
Ihab Awad
927776c486 am 9961a6d8: am b8c46e3a: am 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev
* commit '9961a6d8e1a7738e68d64e77871210bfd832c780':
  Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
2014-07-20 02:27:21 +00:00
Yin-Chia Yeh
76f28e03ad am ff06075b: am 372461a1: am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev
* commit 'ff06075b8820715e62c9edbd73d13eeb4ed1095e':
  Camera2: add highSpeedVideoConfig wrapper and APIs
2014-07-20 02:26:49 +00:00
Niels Egberts
0665d26aff am 8acfe168: am 860e2f9f: am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev
* commit '8acfe168f249073a327c835eb6d42d2b8a6b0314':
  Add money as a new TtsSpan type.
2014-07-20 02:26:35 +00:00
Adam Lesinski
78ee481583 am 30bf2ec8: am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API
* commit '30bf2ec83da4cdcafabbdb46c89647a82aa1b857':
  First iteration of a public UsageStats API
2014-07-20 02:26:30 +00:00
Sailesh Nepal
2c22f13b40 am 7841e663: am d0e9c227: am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev
* commit '7841e663348fe6272182c10dbd6472fa25842f3b':
  Add Connection.startActivityFromInCall
2014-07-20 02:26:16 +00:00
Jean-Michel Trivi
e27dedff59 am 8ff973b4: am 4298999e: am 115bf42b: Unhide Virtualizer.getVirtualizationMode()
* commit '8ff973b4f5a975a50f880e1cb45f4bf564a070b1':
  Unhide Virtualizer.getVirtualizationMode()
2014-07-20 02:26:11 +00:00
Jim Miller
0827369def am 327d056d: am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev
* commit '327d056dca4cc804db27ae9591e20c7026cf1bd2':
  Add DevicePolicyManager flag for fingerprint.
2014-07-20 02:26:01 +00:00
Ye Wen
fd3db01621 am 8535b51d: am 1100f339: am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev
* commit '8535b51d0de6f3ac3bfa566fff2b386291f1dfc0':
  Unhide MMS APIs for MSIM (1/2)
2014-07-20 02:25:56 +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
Lajos Molnar
b58dc31322 Extend MediaCodecInfo to describe usable codec limits and features
Bug: 11990470
Bug: 12065651
Bug: 16131974
Change-Id: I841b8507e823f1ddf14754e34029a9bed4f402d8
2014-07-19 02:14:00 -07:00
Jeff Brown
5dc219142a Add new Display.STATE_DOZE_SUSPEND power state.
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
2014-07-18 21:28:18 -07:00
John Reck
c01bd1167a Return Animator instead of ValueAnimator
Change-Id: I29a7cfdc7ffbb3a4d33f9e64f9d7ca791f5c947c
2014-07-19 02:00:15 +00:00
Wei Wang
685c175890 More API modification of BLE APIs (1/2).
Changed include:

1) Add serviceDataUuid to filter so it matches sanRecord and
AdvertiseData.
2) Add raw bytes to ScanRecord and make ScanResult take a ScanRecord
instead of raw bytes.
3) Change from setServiceUuid(List) to addServiceUuid(ParcelUuid).
4) Added include device name
5) Removed service not registered and added ADVERTISE_DATA_TOO_LARGE.
6) Fixed a few comments.

Change-Id: Ibbe07183b1293835c4a84728d1cd2d61e5d627d3
2014-07-18 18:31:00 -07:00
Yorke Lee
a19d7bfacf Rename voicemail permissions
Rename READ_ALL_VOICEMAIL to READ_VOICEMAIL, and MANAGE_VOICEMAIL
to WRITE_VOICEMAIL

Bug: 16400686
Change-Id: I4c87a7e2fb3aa71d7de3865301f110bcfb29221b
2014-07-18 17:11:50 -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
Jean-Michel Trivi
a3ee6642d8 Unhide Virtualizer.getVirtualizationMode()
Unhide Virtualizer.getVirtualizationMode() method.
Added note in javadoc about the returned value.
Declared exceptions that can be thrown by the checkStatus(int)
  helper function.

Change-Id: I4da82d1db1e39ca9dae489559bf1fb5de112c26a
2014-07-18 21:34:39 +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
Jean-Michel Trivi
7cdc0b58d6 Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev 2014-07-18 18:24:25 +00:00
Jean-Michel Trivi
7f6ee760b0 Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide AudioFormat.Builder
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide the missing two channels that enable a 7.1 configuration

Change-Id: I60899548da1c688ebe561c25212877e0f3eedb34
2014-07-18 17:07:04 -07:00
Ihab Awad
7522bbd652 Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
Change-Id: I91c0d6be76030117ed3cf6d6d5f7514b4d4802ad
2014-07-18 16:03:22 -07:00
Yin-Chia Yeh
8f8141e24f Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 2014-07-18 18:24:25 +00:00
Yin-Chia Yeh
12da140082 Camera2: add highSpeedVideoConfig wrapper and APIs
- Add wrapper class for highSpeedVideoConfiguration.
- Add APIs to query high speed video recording configurations in
  StreamConfigurationMap
- Fix ColorSpaceTransform unit test in CameraMetadataTest
- Fix a bug in HashCodeHelper

Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2
2014-07-18 16:00:53 -07:00
Jean-Michel Trivi
044a5f51e5 Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev 2014-07-17 21:58:28 +00:00
Jean-Michel Trivi
0daab220b2 Hide AudioManager.startBluetoothScoVirtualCall()
Not intended for public consumption.

Bug 16401631

Change-Id: I299a4719fef57a66a428ccf1902aefaf59d7e064
2014-07-18 16:47:25 -07:00
Chris Craik
f251bde890 Merge "Tweaks to outline API" into lmp-dev 2014-07-17 21:58:28 +00:00
Chris Craik
31ba192dd2 Tweaks to outline API
b/15283203
b/16142564

Remove boolean return value chaining, as it's redundant with
the data in the Outline itself.

Change-Id: I3116e57cd1b35c98b74e95195117edd7e39fb2df
2014-07-19 00:13:59 +00:00
Adam Powell
b7fae17a03 Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev 2014-07-17 21:58:28 +00:00
Adam Powell
e49d939378 Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
This allows the calling app to supply a set of alternative extras to
be sent along with the target intent if the user chooses specific
items from the full set available on the device. When replacement
extras have the same key as extras in the initial intent, the
replacement extras dominate.

Change-Id: I5d64c80447386f22402b71291bb289a74015d619
2014-07-18 16:27:11 -07:00
Shishir Agrawal
5552cc5c9d Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev 2014-07-17 21:58:28 +00:00
Shishir Agrawal
86578cca38 Adding the ability for carrier app to override SPN and carrier name.
The change allows system apps (holding MODIFY_PHONE_STATE permission) or
carrier apps to override the "carrier branding" on a per ICCID basis. The
override affects the service provider name as well as the network operator
name. The override is also saved as a SharedPreference and will persist for
the iccId across reboots.

Change-Id: I985ba247e10e2501e3d0d21567ccadc46f365879
2014-07-17 16:31:37 -07:00
Sreeram Ramachandran
64126bc3c3 Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev 2014-07-17 21:58:28 +00:00
Sreeram Ramachandran
cc26b4cc09 Allow VPN interfaces to be put into blocking mode.
New API with stub implementation to be filled out later.

Bug: 12879610
Change-Id: Iff711994dec4598c74fe11447c8c670004c1188c
2014-07-18 16:46:13 -07:00
Jim Miller
43096b2bba Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 2014-07-17 21:58:28 +00:00