144474 Commits

Author SHA1 Message Date
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
a28bfb5b55 am bf99d8c3: am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev
* commit 'bf99d8c31160cf61a25371759068592461cbc71a':
  Add AudioAttributes to stream type conversion
2014-07-21 18:23:51 +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
Quddus Chong
7bde416fb6 am fc91979d: am 92f7993e: am a7112918: am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
* commit 'fc91979d1dddcd0df677e4b1e1a51d29ad7e75d5':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
2014-07-21 18:23:42 +00:00
Deepanshu Gupta
1c43d1faa0 am 6d989248: am 2895133f: am 6b1ceb42: am 296459ff: am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style reso
* commit '6d9892480be9f7deb8dbb94dbf3ad18b89fb65b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-21 18:23:37 +00:00
Deepanshu Gupta
42bfaa9d28 am f861385f: am 4ed3d208: am 59987f2d: am 5d6322a5: (-s ours) am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NO
* commit 'f861385fa987545b21bbd94eacebc86f626db63b':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-21 18:23:33 +00:00
Deepanshu Gupta
2191234c3c am b053d188: (-s ours) am 05900237: am 78bbb2a1: am 90824671: (-s ours) am 98b24366: am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit 'b053d188833e5ed106e67cf336f7cf3b656128c3':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-21 18:23:29 +00:00
Deepanshu Gupta
dc67ecef52 am 32c2b20c: (-s ours) am 583b6898: am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '32c2b20cb78258b995cecf8cbb5e38fe44895944':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-21 18:23:25 +00:00
Deepanshu Gupta
f67347b809 am 3ed46147: (-s ours) am 13ebecfe: am d0eed243: am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '3ed4614798855cf135625c98b6a247a263981e2c':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-21 18:23:20 +00:00
Deepanshu Gupta
c5fde2ce9c am 9b907157: (-s ours) am d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev
* commit '9b90715728ee06300c1a8729c553563388301734':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-21 18:23:16 +00:00
Deepanshu Gupta
23a2f5bc43 am 25d0097f: (-s ours) am 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
* commit '25d0097f2bf43f5748a36e074d1a68b5bc14a403':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-21 18:23:12 +00:00
Guang Zhu
e065ee93e5 am f7ab7f0a: am 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
* commit 'f7ab7f0affdae345d0a162002aabfda4742536a8':
  add command to enable bt snoop log
2014-07-21 18:23:08 +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
Santos Cordon
5a9bb606a4 am 28003199: am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3)
* commit '280031995f0770e84073a894253b936e4af23566':
  Fixing ADD_CALL (1/3)
2014-07-21 18:22:59 +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
Christopher Tate
24f448d7b3 am 0eebcfd7: am 32523262: am 12e9b896: Fix which index goes where
* commit '0eebcfd7582d576110a42acb799b8a8c639f693f':
  Fix which index goes where
2014-07-21 18:22:33 +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
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