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
Yohei Yukawa
302ad73a88
am f5827ba0: Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev
...
* commit 'f5827ba050b93d1080eec336c560e22aa4713678':
Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView
2014-07-19 13:45:24 +00:00
Wonsik Kim
9504c1a440
am 71e398b4: Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev
...
* commit '71e398b4c514af1364b01be2e839badde83f5be4':
TIF: Reorder TvInputInfo types from old to new.
2014-07-19 11:45:32 +00:00
Wonsik Kim
6a9bf8201a
am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev
...
* commit 'b872b220bb1ef88a62c7765b1156d1a1615e533f':
TIF: misc fix for TvInputHal
2014-07-19 11:39:28 +00:00
Lajos Molnar
25ec02be2f
am 1717dea8: Extend MediaCodecInfo to describe usable codec limits and features
...
* commit '1717dea892e10b9a5c4797c8fdd4e8d64838e556':
Extend MediaCodecInfo to describe usable codec limits and features
2014-07-19 11:39:24 +00:00
Jeff Brown
425fd5fb2d
am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev
...
* commit '25892fe6ac568638b0420ca0e8cb388c133bc14e':
Allow dreams to wake up gently.
2014-07-19 11:39:14 +00:00
Dongwon Kang
5975edf0d7
am c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev
...
* commit 'c292f54f26b6be7e6652f44ac96e7ef59756abb2':
TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
2014-07-19 11:39:10 +00:00
Jeff Brown
c669a94615
am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
...
* commit '03fb52700991064432971f79c71cef336e2762df':
Add new Display.STATE_DOZE_SUSPEND power state.
2014-07-19 11:39:06 +00: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
Jae Seo
c73dad0e14
am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
...
* commit '0c2b6c52d626681b1ac32f79c246be4c5a82a991':
TIF: Add a way to notify whether the current program content is allowed
2014-07-19 03:27:01 +00:00
John Reck
4522fe26ae
am b09a6670: Return Animator instead of ValueAnimator
...
* commit 'b09a667056aa3fba5a05d29f7e073c3640888c26':
Return Animator instead of ValueAnimator
2014-07-19 02:03:05 +00:00
Fabrice Di Meglio
b906a36b5f
am 3a4701fa: Revert "Fix LocalePicker background"
...
* commit '3a4701fa23c9b726173deb0c0450ceed023da217':
Revert "Fix LocalePicker background"
2014-07-19 02:03:01 +00:00
John Reck
c01bd1167a
Return Animator instead of ValueAnimator
...
Change-Id: I29a7cfdc7ffbb3a4d33f9e64f9d7ca791f5c947c
2014-07-19 02:00:15 +00:00
Fabrice Di Meglio
6eed108eeb
Revert "Fix LocalePicker background"
...
This reverts commit 6bbea8cf4252839d0c6f2a3152f506a7b2b2d753.
Change-Id: I430c725c8e5987fb643528594ef3a9a83827e7be
2014-07-19 01:58:09 +00:00
Wei Wang
8d0f3233bb
am 5cb5ae18: More API modification of BLE APIs (1/2).
...
* commit '5cb5ae18a83c6e8d6e3b935ccd7e2e7e94eec721':
More API modification of BLE APIs (1/2).
2014-07-19 01:36:48 +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
Jean-Michel Trivi
f64558bb9e
am fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev
...
* commit 'fa19847302d7ecc5cf0e3342852ff40945acf309':
Add AudioAttributes to stream type conversion
2014-07-19 01:05:03 +00:00
Jean-Michel Trivi
540a32fe62
am 01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev
...
* commit '01e810001dc6f73381aaa5499cfb3a3c92b60b1e':
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
2014-07-19 00:54:59 +00:00
Quddus Chong
1807c9600e
am a7112918: am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
...
* commit 'a711291844dfba2c0452f35561192c62010d4fed':
docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
2014-07-19 00:49:03 +00:00
Deepanshu Gupta
eb13dd2485
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 resolution for styles with \'.
...
* commit '6b1ceb4260ee8cfff84123b984142a361cd9a748':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-19 00:48:58 +00:00
Deepanshu Gupta
22d5f446de
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 NOT MERGE]" into jb-mr1.1-de
...
* commit '59987f2dab94e6a832eee4a93577bdc5bc6f1a58':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-19 00:48:55 +00:00
Deepanshu Gupta
b6ed7a4ef2
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 '78bbb2a1a140d199753fd61bdad6140449d96e63':
Fix default level flags for bidi. [DO NOT MERGE]
2014-07-19 00:48:52 +00:00
Deepanshu Gupta
08aca3855e
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 'fe48ca3ec644635aa9267c97784f879bee1b984a':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-19 00:48:48 +00:00
Deepanshu Gupta
cb6a6be1d9
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 'd0eed243993e64f8b17147bbc66afe05733376a3':
Fix default level flags for bidi. [DO NOT MERGE]
2014-07-19 00:48:45 +00:00
Deepanshu Gupta
674e323199
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 '2e11bba3231078749352f371c8e9bb76e3039853':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-19 00:48:42 +00:00
Deepanshu Gupta
fe3f281162
am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
...
* commit '1ab77f9609c8966b960e2bcfbd7d5777aaa7dc24':
Fix default level flags for bidi. [DO NOT MERGE]
2014-07-19 00:48:38 +00:00
Quddus Chong
6120c4c949
am 9fc983f5: am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
...
* commit '9fc983f56af76d1abcbf95e6b3b35e506aa2fddd':
docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
2014-07-19 00:42:07 +00:00
Deepanshu Gupta
49847bbeeb
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 resolution for styles with \'.\' [DO NOT ME
...
* commit '296459ffbb9600a14be24c2cc06284ac47ea84c4':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-19 00:41:59 +00:00
Deepanshu Gupta
cd92f6a730
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 NOT MERGE]" into jb-mr1.1-dev
...
* commit '5d6322a527c81fa261642582a508f39a617a206a':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-19 00:41:52 +00:00
Deepanshu Gupta
580c3d823b
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 '90824671b6467919e7aa12a09a6c21797764bca3':
Fix default level flags for bidi. [DO NOT MERGE]
2014-07-19 00:41:48 +00:00
Deepanshu Gupta
96c280aa1d
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 '4ff3c7f0072d1c56d241b234e7f208009c86112f':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-19 00:41:43 +00:00
Deepanshu Gupta
1386fc647b
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 '276ae4eee5450674fbc7e27f638f18ddc748b7f6':
Fix default level flags for bidi. [DO NOT MERGE]
2014-07-19 00:41:39 +00:00
Deepanshu Gupta
0dfccbc911
am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev
...
* commit '0804e0aded17c1aee8cbd2c34247b390051123c3':
Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-19 00:41:35 +00:00
Deepanshu Gupta
e4e37ed5cc
am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
...
* commit 'd7f2bf067fce644ed902122fffb9e22b6596a0ff':
Fix default level flags for bidi. [DO NOT MERGE]
2014-07-19 00:41:31 +00:00
Guang Zhu
422ea1f9a0
am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
...
* commit '5a0f7e414e9a41ebc3845d0158f59afd8899d8b1':
add command to enable bt snoop log
2014-07-19 00:40:28 +00:00
Jean-Michel Trivi
e03f9227fb
am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev
...
* commit '981fcf46c2876541de3fe1e6c030899c582ae198':
Hide AudioManager.startBluetoothScoVirtualCall()
2014-07-19 00:36:05 +00:00
Guang Zhu
7d41c138d2
am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
...
* commit 'f59ce46880ebe2c2466a2c862ec2ed401f635d51':
add command to enable bt snoop log
2014-07-19 00:33:58 +00:00
Santos Cordon
632008662f
am db2f81b0: Fixing ADD_CALL (1/3)
...
* commit 'db2f81b07d0b29e2fff87be3293945fd9aeaf13d':
Fixing ADD_CALL (1/3)
2014-07-19 00:28:01 +00:00
Santos Cordon
6b45642f36
Fixing ADD_CALL (1/3)
...
Bug: 16241726
Change-Id: Ie1dd72a79c2430b10b0239dbdda5508edbc8eb26
2014-07-19 00:23:21 +00:00
Chris Craik
484f067b0e
am e25d7792: Merge "Tweaks to outline API" into lmp-dev
...
* commit 'e25d7792af090ef3c692ad157c3cbfeadf1db7b8':
Tweaks to outline API
2014-07-19 00:23:13 +00:00
Adam Powell
fdceab301a
am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev
...
* commit 'd0cb5fd810d1b9002c330435da89c1465deb8d37':
Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
2014-07-19 00:23:09 +00:00
Yorke Lee
6891ebfdb0
am c5a8e2f1: Rename voicemail permissions
...
* commit 'c5a8e2f13cc92802768aacac4ae3baa9676db422':
Rename voicemail permissions
2014-07-19 00:19:03 +00: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
Shishir Agrawal
3e30aeedf7
am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev
...
* commit '47bbd4608e423efd310a894b275724792268beba':
Adding the ability for carrier app to override SPN and carrier name.
2014-07-19 00:11:11 +00:00
Christopher Tate
79f7a50363
am 12e9b896: Fix which index goes where
...
* commit '12e9b896f1fb40489a56e7ade81ffc807eb17065':
Fix which index goes where
2014-07-19 00:06:46 +00:00
Sreeram Ramachandran
4c51dbedb6
am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev
...
* commit '4000b01f1eb14e6e1a4a9c1aa955193ced7d5d94':
Allow VPN interfaces to be put into blocking mode.
2014-07-19 00:06:43 +00:00
Christopher Tate
4a79daeaf7
Fix which index goes where
...
Change-Id: If4cf7efd4d7962eb5c10b487482653d86d92d2c6
2014-07-19 00:04:09 +00:00
Winson Chung
edaefc452a
am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev
...
* commit '51b044a29d73fc05c95ecf0e237efc531adbb3cb':
Add setting to guard the lock-to-app recents icon
2014-07-18 23:50:59 +00:00
Jay Civelli
979a32e4a0
Fix removeListener in TrustManagerService.
...
The removeListener method was not removing listeners.
Change-Id: Icd5366f03f8fc9c3d283c7b4416b9cff3c75cc59
2014-07-18 16:47:36 -07:00