Evan Charlton
4af329b585
am c248975a: am d9e0bfee: Merge "Rename setDestroy() to destroy()" into lmp-dev
...
* commit 'c248975a162abed2d1e2584ddda677d5753f9d7b':
Rename setDestroy() to destroy()
2014-07-21 12:39:25 +00:00
Santos Cordon
169e9e2f18
am d6afd919: am c27a00a0: Merge "Change incoming call intent to a TelecommManager method. (1/3)" into lmp-dev
...
* commit 'd6afd91969f1fd9425a623144523eec2a7be0ea3':
Change incoming call intent to a TelecommManager method. (1/3)
2014-07-21 12:39:21 +00:00
Jean-Michel Trivi
47a0e8294b
am b3c1aa30: am 1b6c240b: Merge "Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition" into lmp-dev
...
* commit 'b3c1aa300beeb1ff7ab544f8d991be001bde0b0d':
Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition
2014-07-21 12:39:17 +00:00
Evan Charlton
380b6724c0
am d9e0bfee: Merge "Rename setDestroy() to destroy()" into lmp-dev
...
* commit 'd9e0bfeec1c4a4b49d5c1005ea732af087fc864a':
Rename setDestroy() to destroy()
2014-07-21 12:31:44 +00:00
Santos Cordon
04d5d98730
am c27a00a0: Merge "Change incoming call intent to a TelecommManager method. (1/3)" into lmp-dev
...
* commit 'c27a00a05ee9204c8a4b330c4e00d2f3a5237d25':
Change incoming call intent to a TelecommManager method. (1/3)
2014-07-21 12:31:40 +00:00
Jean-Michel Trivi
7aa504757f
am 1b6c240b: Merge "Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition" into lmp-dev
...
* commit '1b6c240b062f20f64b1840b274d43a837d8dca1f':
Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition
2014-07-21 12:31:37 +00:00
Youngsang Cho
f68351eed4
am 854ac8f9: am bf1a3868: TIF: update documentation of TvInputInfo.getParentId()
...
* commit '854ac8f93214ce9773cc6b5ea8dbb31a31948df5':
TIF: update documentation of TvInputInfo.getParentId()
2014-07-21 12:09:23 +00:00
Youngsang Cho
3e07575769
am bf1a3868: TIF: update documentation of TvInputInfo.getParentId()
...
* commit 'bf1a3868fd6e6241aae0cfb906c19b422384d10b':
TIF: update documentation of TvInputInfo.getParentId()
2014-07-21 00:16:26 +00:00
Youngsang Cho
4350a6210f
TIF: update documentation of TvInputInfo.getParentId()
...
Change-Id: I5c0733d28621486ec0ff0f093c22eb1cc05f785d
2014-07-21 00:13:03 +00:00
Sandeep Siddhartha
c9892da1cc
am 7c88cbf4: am 20a8b531: Fix synchronization issues in AlwaysOnHotwordDetector
...
* commit '7c88cbf4ff2403dc99f05f91245285eb24198faa':
Fix synchronization issues in AlwaysOnHotwordDetector
2014-07-21 00:10:08 +00:00
Sandeep Siddhartha
fed73e12bd
am 20a8b531: Fix synchronization issues in AlwaysOnHotwordDetector
...
* commit '20a8b5310e3e562f11a9503637ac48495969edcb':
Fix synchronization issues in AlwaysOnHotwordDetector
2014-07-21 00:06:58 +00:00
Sandeep Siddhartha
110f569b47
Fix synchronization issues in AlwaysOnHotwordDetector
...
- Remove unnecessary recognition status from AlwaysOnHotwordDetector
- Remove unnecessary recognition started callback from IRecognitionStatusCallback
- Fix a bug around the fact that we weren't picking up enrollment at runtime because
we were storing the availability at instantiation time.
- Handle 0-length arrays in SoundTrigger classes while parceling/unparceling
- Fix issue in SoundTrigger helper where we were not comparing binders for start/stop calls
- Unload the previous model when starting a new recognition
- Add more debug logging
Change-Id: Icc56d7f3dd1ffa49a8cfeea49080e3ab4d342c32
2014-07-20 16:53:09 -07:00
Dianne Hackborn
767912d738
am 39285ff1: am 1648dbb4: Merge "Fix issue #16400873 : Apps that show ads as new tasks stay in recents..." into lmp-dev
...
* commit '39285ff113de9cbeb0304942f318f0f48ee697f3':
Fix issue #16400873 : Apps that show ads as new tasks stay in recents...
2014-07-20 23:06:56 +00:00
Dianne Hackborn
db8a182c78
am 1648dbb4: Merge "Fix issue #16400873 : Apps that show ads as new tasks stay in recents..." into lmp-dev
...
* commit '1648dbb414cd5f1208192cfde4b41cd61ff1d6c4':
Fix issue #16400873 : Apps that show ads as new tasks stay in recents...
2014-07-20 23:03:51 +00:00
Evan Charlton
919378159c
am d5d9a4de: am 19e236f5: Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev
...
* commit 'd5d9a4de987a8bc4ef9d55e026d44c9f478f794c':
Rename PhoneAccountMetadata to PhoneAccount
2014-07-20 22:46:45 +00:00
Evan Charlton
641951aea1
am 19e236f5: Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev
...
* commit '19e236f53a2321fdf5d8eb125a92d8822ee4f2bc':
Rename PhoneAccountMetadata to PhoneAccount
2014-07-20 22:43:42 +00:00
Jean-Michel Trivi
6e0683f4dd
am 50c7e24f: am c741502b: Merge "Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE" into lmp-dev
...
* commit '50c7e24f3a10fa4bc15f7a8b2f4bab2ae91459e0':
Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
2014-07-20 22:38:01 +00:00
John Spurlock
6eb90b6329
am 1b2ea539: am 1bc6edc5: Merge "Volume: Remove silent mode icon." into lmp-dev
...
* commit '1b2ea5397c924985d5e5ec9fd30049ec0e4e283c':
Volume: Remove silent mode icon.
2014-07-20 22:34:02 +00:00
Wonsik Kim
be59fd9461
am f860785f: am d882dca6: audio: fix too early connection to HdmiControlService
...
* commit 'f860785f51fc1aa418203fa2ac8cadbda81e5c56':
audio: fix too early connection to HdmiControlService
2014-07-20 22:33:58 +00:00
Jean-Michel Trivi
82ffc97ddf
am c741502b: Merge "Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE" into lmp-dev
...
* commit 'c741502b26b584d5689eeda3dad457f0b9e5077d':
Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
2014-07-20 22:33:25 +00:00
John Spurlock
75addf180f
am 1bc6edc5: Merge "Volume: Remove silent mode icon." into lmp-dev
...
* commit '1bc6edc57390a7d8dddc4ba65bd3549942317c3c':
Volume: Remove silent mode icon.
2014-07-20 22:29:17 +00:00
Wonsik Kim
e9118ce501
am d882dca6: audio: fix too early connection to HdmiControlService
...
* commit 'd882dca6617c85c0c2fa1aaa5eff7c7a7d15caba':
audio: fix too early connection to HdmiControlService
2014-07-20 22:29:13 +00:00
Wonsik Kim
7f4342e5b8
audio: fix too early connection to HdmiControlService
...
Connect to HdmiControlService on systemReady(), not on constructor.
Change-Id: Ic91467f040fbffa48393e876997bd320ae9500db
2014-07-20 22:13:54 +00:00
Baligh Uddin
ad000f4a91
am 271cb423: (-s ours) am 9ad52a14: (-s ours) Import translations. DO NOT MERGE
...
* commit '271cb423342beced29ab7b44c5e6b29dc2f9d1e0':
Import translations. DO NOT MERGE
2014-07-20 20:50:58 +00:00
Baligh Uddin
d6f1672a4c
am 9ad52a14: (-s ours) Import translations. DO NOT MERGE
...
* commit '9ad52a14d38966b669ef9137bd4d6148bdabedb6':
Import translations. DO NOT MERGE
2014-07-20 20:46:43 +00:00
Baligh Uddin
7226b9b62d
Import translations. DO NOT MERGE
...
Change-Id: Iad977cd9e130e353572188f6cac5c004268fc28d
Auto-generated-cl: translation import
2014-07-20 20:43:58 +00:00
Jean-Michel Trivi
3ee2e1f8ad
am 2772f208: am 9e583961: Merge "API for audio session ID generation" into lmp-dev
...
* commit '2772f208390df41843d9d1fcf6126c885b907a15':
API for audio session ID generation
2014-07-20 20:28:59 +00:00
Jean-Michel Trivi
bdd340abb1
am 9e583961: Merge "API for audio session ID generation" into lmp-dev
...
* commit '9e583961d34e6531f14436a5455a15c21f21a428':
API for audio session ID generation
2014-07-20 20:24:41 +00:00
Baligh Uddin
dccdd04bed
am 1107abcc: (-s ours) am d75f8332: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '1107abcc3c309bb8c3a4ec540c7e282f812c0503':
Import translations. DO NOT MERGE
2014-07-20 20:15:23 +00:00
Baligh Uddin
d78cf11b80
am d75f8332: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'd75f833201bda095fb7ee8fc7b5e7f95510a97c5':
Import translations. DO NOT MERGE
2014-07-20 20:10:40 +00:00
Baligh Uddin
3c8e65007a
am 7b5665ee: (-s ours) am 33b0cf1f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '7b5665eefe31a22fce5df22b49ba5d5db0e9a944':
Import translations. DO NOT MERGE
2014-07-20 19:37:07 +00:00
Baligh Uddin
589b47ee19
am 394ff738: (-s ours) am ea8de47d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '394ff738fa3f8eaa8a649ef1daf02abeb7e910e7':
Import translations. DO NOT MERGE
2014-07-20 19:37:03 +00:00
Baligh Uddin
292a315ef5
am 33b0cf1f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '33b0cf1f2bd75a436e5fc6ae354fc64d0c1014ba':
Import translations. DO NOT MERGE
2014-07-20 19:33:50 +00:00
Baligh Uddin
34af3371aa
am ea8de47d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'ea8de47deb217d53979df21f8b9f9d5156741f56':
Import translations. DO NOT MERGE
2014-07-20 19:33:47 +00:00
Sandeep Siddhartha
53b5865e07
am a0c24dc6: am 29f27297: Move sound trigger calls to VoiceInteractionManagerService
...
* commit 'a0c24dc62d5835159e78514afe66dce6e5f45116':
Move sound trigger calls to VoiceInteractionManagerService
2014-07-20 18:52:52 +00:00
Sandeep Siddhartha
c3901d01b1
am 29f27297: Move sound trigger calls to VoiceInteractionManagerService
...
* commit '29f27297588abec47cb1b7c5a37076f803f82b18':
Move sound trigger calls to VoiceInteractionManagerService
2014-07-20 18:49:48 +00:00
Sandeep Siddhartha
055897208d
Move sound trigger calls to VoiceInteractionManagerService
...
- This ensures that any data being loaded on the DSP comes from the framework
Change-Id: Ie15f0994850ba8f298ca07c49fe0b89e066d9e2b
2014-07-20 11:22:55 -07:00
Evan Charlton
885724c10e
am 144036b8: am 1bb914ea: Rename PhoneAccount to PhoneAccountHandle
...
* commit '144036b8e0dc4314442bcdd5172739797866fce7':
Rename PhoneAccount to PhoneAccountHandle
2014-07-20 18:09:33 +00:00
John Spurlock
936524a542
am 80b3614d: am 8179618c: Merge "Volume: haptic feedback entering vibrate using touch." into lmp-dev
...
* commit '80b3614d5812d11cd9e1e87cb5cfc0f13d9cc279':
Volume: haptic feedback entering vibrate using touch.
2014-07-20 18:09:26 +00:00
John Spurlock
633bf73908
am 237b2100: am 5f6ea4bf: Merge "Volume: Design followup." into lmp-dev
...
* commit '237b21006be014f3d5e95a7e8dba6ee2c83e8c4a':
Volume: Design followup.
2014-07-20 18:09:22 +00:00
David Friedman
535cbbb77c
am ceb9bbf0: am 380677d6: am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs
...
* commit 'ceb9bbf0a515938823732fd60053f6d4b87fc3ee':
Minor typos, consistency things, one grammatical error.
2014-07-20 18:09:16 +00:00
Wonsik Kim
52d820ab29
am e2d65e08: am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev
...
* commit 'e2d65e08ad9533ab5d94b52dd61d40cd6643a61f':
TIF: revise API names
2014-07-20 18:09:10 +00:00
John Spurlock
cd83c86f7e
am 36a86f03: am e4b360e7: Volume: new coat of paint.
...
* commit '36a86f03f05ea3a50342e9f324c3453e6e6d6beb':
Volume: new coat of paint.
2014-07-20 18:09:06 +00:00
Baligh Uddin
8dd8207293
am 7a9b1324: am 4aa0295b: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
...
* commit '7a9b13241ee64106d9f466c35f43bf76ea446401':
Remove deprecated locales - DO NOT MERGE
2014-07-20 18:08:16 +00:00
Adam Powell
facd9fa786
am cc19d68a: am bf5ecd02: Merge "Don\'t apply the ActionBar style to a Toolbar as a result of setActionBar" into lmp-dev
...
* commit 'cc19d68a90486ace893ad381911e9f675f1cf3d0':
Don't apply the ActionBar style to a Toolbar as a result of setActionBar
2014-07-20 18:07:54 +00:00
Chelsea Derrick
e14315882a
am 82b01b2b: am 53fd859f: Merge "Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]" into lmp-dev
...
* commit '82b01b2bf4752a03ee64d8a9a53038bf02c115d1':
Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]
2014-07-20 18:07:50 +00:00
Adam Powell
582a8cdd6e
am b2038ab7: am d073a935: Don\'t overlay the Material.Light theme\'s homeAsUpIndicator attribute
...
* commit 'b2038ab70a867e6d6d0500730784d63f87913c5d':
Don't overlay the Material.Light theme's homeAsUpIndicator attribute
2014-07-20 18:07:46 +00:00
John Spurlock
829a941c45
am 21827163: am d2494fcc: Merge "Volume: No sound effects on the ringer toggle." into lmp-dev
...
* commit '218271635378418c51bf6343f6adfd9e22156b05':
Volume: No sound effects on the ringer toggle.
2014-07-20 18:07:41 +00:00
Evan Charlton
576fc003d0
am b7e7e448: am 07e3fccb: Migrate TelecommConstants to TelecommManager
...
* commit 'b7e7e4484824dfba837c58a037addfa10ff67879':
Migrate TelecommConstants to TelecommManager
2014-07-20 18:07:35 +00:00
John Spurlock
a7aaa227ef
am 1fab88a4: am 16f6e259: Merge "Add audioAttributes to Notification." into lmp-dev
...
* commit '1fab88a4d5e79b516a382474d777a212c5989f68':
Add audioAttributes to Notification.
2014-07-20 18:07:23 +00:00