143221 Commits

Author SHA1 Message Date
Deepanshu Gupta
d7f2bf067f am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
* commit 'f75489f2f1f2dc4f75205f4b242800777bf7d5ec':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:45:47 +00:00
Deepanshu Gupta
9c48ab8208 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit 'ccf7b2aac600b6069f03f7f420872b64cc5e6726':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-18 21:45:28 +00:00
Deepanshu Gupta
a3d2c7e72b am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '85c7b209c3babea164f5bec13352e7f5f262ea58':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-18 21:45:20 +00:00
Deepanshu Gupta
610341b3eb am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '95bbeb967243d453bf793cd06dd2dd914667fee9':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-18 21:45:19 +00:00
Deepanshu Gupta
964591a6e1 am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit 'c3a7763b84a6a20f07ed2b42e58ac0911fac984c':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:44:52 +00:00
Deepanshu Gupta
e83fa180a8 am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '696eb4da44097693a18e99e1f38d062ac1f0e147':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:44:11 +00:00
Deepanshu Gupta
d8d3e87cf3 am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev
* commit '4627c98da4ecb66e32a3273ea3713df528cda6b2':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-18 21:42:10 +00:00
Deepanshu Gupta
95bbeb9672 am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit 'b8e4e8e1f4fb1139368dc3f36e2d7bcf59dc32e9':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-18 21:41:18 +00:00
Deepanshu Gupta
f75489f2f1 am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
* commit 'c425c438a38f9065c4fbae76602bce66563950c0':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:39:42 +00:00
Deepanshu Gupta
ccf7b2aac6 am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-18 21:39:35 +00:00
Deepanshu Gupta
696eb4da44 am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit 'c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:39:33 +00:00
Deepanshu Gupta
85c7b209c3 am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '5efee91e12420e59214946c526f80961738a9c1d':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-18 21:39:25 +00:00
Deepanshu Gupta
b8e4e8e1f4 am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit 'd3ac01ff7616f7135b8b5044816690c93fba8548':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-18 21:38:39 +00:00
Deepanshu Gupta
c3a7763b84 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:36:29 +00:00
Deepanshu Gupta
c39916f7da am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:35:21 +00:00
Deepanshu Gupta
c425c438a3 am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:32:52 +00:00
Deepanshu Gupta
918ca12ffc am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:31:33 +00:00
Deepanshu Gupta
37f54f4c1e am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:31:26 +00:00
Guang Zhu
f59ce46880 am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
* commit 'b477fc6c2fcd04e6952a7eec856d30b64fd95e0c':
  add command to enable bt snoop log
2014-07-18 03:31:43 +00:00
Wonsik Kim
9f6799becf Merge "TIF: fix indexOfValue usage" into lmp-dev 2014-07-17 21:11:29 +00:00
Wonsik Kim
38feae971c TIF: fix indexOfValue usage
SparseArray.indexOfValue() was used in place where comparison using
equals() on value was desired, but the method actually uses == instead
of equals().

Change-Id: Id9fb3317d1e0f0cb60ce6512f6d0c0a7bcf2fb20
2014-07-21 21:43:48 +09:00
Wonsik Kim
34902f46c1 Merge "TIF: fix tvInputType attribute to match with TvInputInfo" into lmp-dev 2014-07-17 21:11:29 +00:00
Adrian Roos
edad7b24c1 Update LockPatternUtils to new alarm API
Change-Id: Idc6c2865b86e467e1e254452326f327f145177b0
2014-07-21 12:07:52 +00:00
Wonsik Kim
11145e52be TIF: fix tvInputType attribute to match with TvInputInfo
Change-Id: Ic42add6f09da7d2ad5793da41caeda6d0328ad30
2014-07-21 20:56:37 +09:00
Niels Egberts
1d44e0ccec New TtsSpan builders for money, electronic and telephone.
Change-Id: Idb6a66725395dbd665e17c00678901d54b4b1753
2014-07-21 11:17:49 +01:00
Deepanshu Gupta
4627c98da4 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
5efee91e12 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev 2014-07-17 21:09:48 +00:00
Jungshik Jang
5fe8dcf78d Merge "Add two apis for one touch record." into lmp-dev 2014-07-17 21:07:39 +00:00
Jungshik Jang
a6b2a7a59a Add two apis for one touch record.
This change introduces new two apis for one touch record.
1. setRecordRequestListener
 It's used to get notified when a recorder device initiates
 "one touch record". As return of callback, client should
 generate "record source" and return it.
2. startRecord
 It's used to initiate "one touch record" from Tv.

Along with this, add HdmiRecordSources which is a helper
class assisting buidling byte array form from the given
record source information.

Bug: 16160962

Change-Id: I403d37b752c9b7f799c6d8188a071ef420fe8ac2
2014-07-21 16:54:53 +09:00
Santos Cordon
f29511043e Change telecomm APIs from protected to public (1/3)
Bug: 16416927
Change-Id: I859c80a120fa59bba12a5c6bfca17fa57613a6aa
2014-07-21 06:19:35 +00:00
Ji-Hwan Lee
04d926cb13 Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev 2014-07-17 21:11:29 +00:00
Ji-Hwan Lee
4f9f57cede TIF: Extend multiple TV input per service for HDMI logical devices
Remove ITvInputManager.registerTvInputInfo() and let addTvInputInfo*()
cover the registration.

Bug: 15570939
Change-Id: Ic36701de96696e7fe32fc1faa0d5f6fde53f6666
2014-07-21 17:04:04 +09:00
Jinsuk Kim
75df3bf978 Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev 2014-07-17 22:03:23 +00:00
Joe Onorato
2d5720a028 Move android.bluetooth and android.telephony to framework2.jar.
Change-Id: I53cdd2a07165427c4dea037893ade3049f57f584
2014-07-21 05:30:25 +00:00
Jinsuk Kim
5ad57168da Invoke callback for HdmiControlService.deviceSelect() for internal source
The call should be always successful if device to switch to is internal
TV source as setting it as the active source doesn't require communication
with other devices. Added the missing callback invocation.

Change-Id: I9968098316a955509f4de0e7af6f4407087ad4a2
2014-07-21 13:37:49 +09:00
Santos Cordon
40075c7cdd Merge "Change incoming call intent to a TelecommManager method. (1/3)" into lmp-dev 2014-07-19 22:40:06 +00:00
Santos Cordon
96efb488af Change incoming call intent to a TelecommManager method. (1/3)
Also moves a few constants from TelecommConstants to TelecommManager.
Bug:16416927

Change-Id: I8e74feb228523ed1c186b2f06784d04cb9141f86
2014-07-20 17:41:08 -07:00
Jean-Michel Trivi
dfa871620c Merge "Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition" into lmp-dev 2014-07-18 18:24:25 +00:00
Youngsang Cho
4350a6210f TIF: update documentation of TvInputInfo.getParentId()
Change-Id: I5c0733d28621486ec0ff0f093c22eb1cc05f785d
2014-07-21 00:13:03 +00:00
Jean-Michel Trivi
9b9d72fd11 Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition
Bug 16401631

Change-Id: I522e7c7030a71b528a484d4d8ae517b4b09460bf
2014-07-20 16:53:27 -07: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
Evan Charlton
e954426494 Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev 2014-07-18 18:24:25 +00:00
Evan Charlton
8c8a062f52 Rename PhoneAccountMetadata to PhoneAccount
Change-Id: I4597b14110c1cee7f637ec125b839852ef0f34c4
2014-07-20 15:12:16 -07: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
e9111d3067 Merge "API for audio session ID generation" into lmp-dev 2014-07-19 22:40:06 +00:00
Jean-Michel Trivi
289cc8e887 API for audio session ID generation
Expose the value used by the framework to generate an audio
 session ID when a value isn't known.
Rename allocateAudioSessionId() to generateAudioSessionId()
 as this operation doesn't "allocate" anything, and there is
 no allocated resource to free after this operation.

Bug 16401631

Change-Id: I7a7bc05b39ea0b024ff225254eb755a9c85a2ad9
2014-07-20 11:25:48 -07:00
Jungshik Jang
189bff29e6 Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev 2014-07-17 21:11:29 +00:00
Jinsuk Kim
6e8abd7fd8 Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev 2014-07-17 21:07:39 +00:00
Jinsuk Kim
7474faca5b TIF: Register IHdmiInputChangeListener to physical input manager
This lets the manager receive the callback from HdmiControlService
when a CEC device requests that it shall be the active source. It will be
transformed to an intent with a channel URI associated with
the corresponding TV input.

Change-Id: I02d4b24d5d05ad7a093e3b996942cbc43fd1ce8b
2014-07-21 11:50:19 +09:00
Jesse Hall
19eb5cb80e Merge "Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A" into lmp-dev 2014-07-20 04:41:30 +00:00