Sailesh Nepal
1f4c966710
Merge "resolve merge conflicts of 2cff241 to master"
2016-08-23 15:13:04 +00:00
Julius D'souza
1e62337cea
Merge "Add dynamic illuminance hysteresis support"
2016-08-23 15:10:31 +00:00
Sailesh Nepal
607c51aadb
resolve merge conflicts of 2cff241 to master
...
Change-Id: Ide7a24bb36c51a24bd4107c3042efc3117ea76f6
2016-08-23 08:10:12 -07:00
Julius D'souza
428aed01e1
Add dynamic illuminance hysteresis support
...
Bug: 18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
2016-08-23 07:32:51 -07:00
Sailesh Nepal
2cff2417cd
resolve merge conflicts of ad31603 to cw-f-dev
...
am: bbfb97461d
2016-08-23 14:15:31 +00:00
Sailesh Nepal
bbfb97461d
resolve merge conflicts of ad31603 to cw-f-dev
...
Change-Id: I970fe17c234f9b99142980f685c3c4efee4767fc
2016-08-23 07:04:30 -07:00
Doris Liu
c6b92a5979
Merge "Fix out of order listener callback for animator set containing empty sets"
2016-08-22 23:34:25 +00:00
TreeHugger Robot
6dcbcc9f9b
Merge "Remove EXTRA_SHOW_FILESIZE."
2016-08-22 21:43:16 +00:00
Doris Liu
f66d2f6f31
Fix out of order listener callback for animator set containing empty sets
...
BUG: 31016584
CTS test for this fix is added at:
https://googleplex-android-review.git.corp.google.com/#/c/1348858/
Change-Id: I9427a6791f4e0aafc33f5cc9fac16c3518d1cdbe
2016-08-22 14:30:48 -07:00
Steve McKay
0a38e2318b
Remove EXTRA_SHOW_FILESIZE.
...
DocumentsUI will always show size.
Bug: 31016724
Change-Id: I19150332529c4699f00f7f239f775e89025f1c3f
2016-08-22 20:09:11 +00:00
Kevin Gabayan
52745e12a9
DO NOT MERGE ANYWHERE: Restore AnyMotionDetector angle threshold of 0.1 degree on Wear
...
Bug: 26385112
This threshold has previously been 0.1 degrees and somehow has taken
on the phone threshold of 2.0 degrees, likely by over-merging.
Change-Id: I6201cfa74b7901a958a1cd9d7d35a5b6f56d9870
2016-08-22 11:29:50 -07:00
Bo Liu
ad94857d90
Merge "WebView: Use static factory method to create provider"
2016-08-22 16:25:10 +00:00
Chris Banes
b62db80a04
Fix NPE in ForwardingListener - fw edition
...
Caused by a postDelayed() and lack of
null check
BUG: 29992695
Change-Id: If2f43736505e0f738e9d0cf941a1f2d828cd8d5d
2016-08-22 10:16:21 +00:00
Bo Liu
4827385ae7
WebView: Use static factory method to create provider
...
This gives the implementation the flexibility to choose different
provider instances. Fallback to constructor if static initializer
factory method doesn't exist.
Change-Id: I72fa0c51c64d0dbdeb6234a0ab4fdd0a389b09fc
2016-08-20 16:13:25 -07:00
Felipe Leme
c233963e03
Added missing @Test
...
BUG: 28791717
Change-Id: I64f336652a2a32b091b17a1c9684453940bd62bd
2016-08-20 09:49:45 -07:00
TreeHugger Robot
27a395c06d
Merge "Clean up style issues in ArraySet."
2016-08-20 04:15:21 +00:00
TreeHugger Robot
3a5b710684
Merge "Added a uidPoliciesToString() method."
2016-08-20 02:29:41 +00:00
Aurimas Liutikas
f2a45b269d
Clean up style issues in ArraySet.
...
Clean up style issues in preparation to copying ArraySet
implementation to support library.
Fixed:
- Missing spaces around operators, casting
- Added curly braces around if statements that span multiple lines
- Renamed static variables to follow sFoo instead of mFoo
- Moved = to the previous line
Bug: 19109652
Change-Id: Id9a985723b158f51811b3cd796613d0e26fd7e61
2016-08-19 16:36:19 -07:00
Etan Cohen
5782aae1be
[NAN] Udpate NAN API documentation, clean-up visibility
...
am: 2e37b06dde
2016-08-19 23:21:52 +00:00
Philip P. Moltmann
00156a5f58
Only have a single call into pdfium at a time. am: 366262dc78
...
am: 20823b77da
2016-08-19 23:21:26 +00:00
Phil Weaver
31f764496f
Dispatch a11y events in separate thread. am: c34649411d
...
am: d4847f282d
2016-08-19 23:08:51 +00:00
Philip P. Moltmann
20823b77da
Only have a single call into pdfium at a time.
...
am: 366262dc78
2016-08-19 23:08:41 +00:00
Phil Weaver
d4847f282d
Dispatch a11y events in separate thread.
...
am: c34649411d
2016-08-19 22:46:13 +00:00
Etan Cohen
c6a6a0e7ba
Merge "resolve merge conflicts of 6ffbcb3 to master"
2016-08-19 22:07:26 +00:00
Todd Kennedy
84cc3282db
Merge "remove mention of file: URIs for package installs"
2016-08-19 21:36:29 +00:00
Etan Cohen
2e37b06dde
[NAN] Udpate NAN API documentation, clean-up visibility
...
Change-Id: I951340eebab35c10efe98dab86b58fe8efada169
2016-08-19 12:31:31 -07:00
Iliyan Malchev
7a54282c72
Merge "Link against libhidl for HidlSupport/svcmgr."
2016-08-19 19:17:43 +00:00
Ta-wei Yen
ad31603b80
Add carrier regex config values for VisualVoicemailSmsFilter
...
Verizon requires all SMS that starts with "//VZWVVM" to be treated
as a VVM SMS.
EXTRA_VOICEMAIL_SMS_MESSAGE_BODY is also added to VociemailContract
to send the message body of a SMS that matches the carrier regex but
is not parsable.
Bug: 30954955
Change-Id: Ib5449164a5290b132648cc28b1e1d3d9ddd5fea0
2016-08-19 11:43:15 -07:00
Etan Cohen
ccb0b65be6
resolve merge conflicts of 6ffbcb3 to master
...
Change-Id: I23af5223f0e9810aa90fda4594ff6ccfc69b4053
2016-08-19 11:22:06 -07:00
Etan Cohen
6ffbcb3f73
Merge "[NAN] Provide calling package name to service" into mm-wireless-dev
2016-08-19 17:23:15 +00:00
André Lago
13a5df3b31
Merge changes from topic 'Different sound settings for work profile'
...
* changes:
[media] Separate ringtones for managed profiles
[Settings] Added setting SYNC_PARENT_SOUNDS
2016-08-19 17:02:05 +00:00
Felipe Leme
b146f7678f
Added a uidPoliciesToString() method.
...
BUG: 28791717
Change-Id: Ib26e08332d011ca5414406810cec4b4936841068
2016-08-19 09:52:16 -07:00
Phil Weaver
c34649411d
Dispatch a11y events in separate thread.
...
Moves the IPCs into a separate thread, where they should affect
jank a lot less.
Bug: 30183085
Change-Id: Ib76159d158e7a867e76cdd5c8ea3a318949fcc5b
2016-08-19 09:22:10 -07:00
Andreas Huber
8dcbf8ba43
Merge "Support one-way methods in java support for hardware binder."
2016-08-19 15:53:13 +00:00
Martijn Coenen
d2b42ccec0
Link against libhidl for HidlSupport/svcmgr.
...
Bug: 30839546
Change-Id: I52609576aa7f10da608725ef4ea78b778f127eef
2016-08-19 14:23:42 +02:00
Bill Yi
02799d57d7
Import translations. DO NOT MERGE
...
Change-Id: I89cc90bed937b12a939bd4c43f0a6ee834ce088a
Auto-generated-cl: translation import
2016-08-19 04:31:46 -07:00
Bill Yi
6964d85972
Import translations. DO NOT MERGE
...
Change-Id: I5c20231be7a5400894384c92ad7ae08293f02e24
Auto-generated-cl: translation import
2016-08-19 03:16:29 -07:00
Bill Yi
3f12495742
Import translations. DO NOT MERGE
...
Change-Id: I6f508568c01e18b729b1e3158c625684c6ffc1d1
Auto-generated-cl: translation import
2016-08-18 22:59:03 -07:00
Todd Kennedy
9cc589a3a0
remove mention of file: URIs for package installs
...
they're not supported
Change-Id: Id274ee6065ba531c01ad720ac0a53fb97e0fc687
Fixes: 6517618
2016-08-18 16:23:17 -07:00
Ajay Panicker
4d657f1e67
Merge "Protect various Bluetooth broadcasts" am: 53ff75bb68 am: 779a1f096c am: 2bad652e56
...
am: 6c1035e0c5
2016-08-18 22:48:48 +00:00
Andy Hung
1d02dc4841
AudioSystem: Verify audio port array information am: 737d9fb181 am: 79d51bf46e
...
am: 2b971b3498
2016-08-18 22:43:46 +00:00
Ajay Panicker
6c1035e0c5
Merge "Protect various Bluetooth broadcasts" am: 53ff75bb68 am: 779a1f096c
...
am: 2bad652e56
2016-08-18 22:42:18 +00:00
George Mount
05051ef82b
Fix NPE during Activity transition using wrong Activity. am: a3edbf6a5d
...
am: 34abaebd3b
2016-08-18 22:37:21 +00:00
Andy Hung
2b971b3498
AudioSystem: Verify audio port array information am: 737d9fb181
...
am: 79d51bf46e
2016-08-18 22:37:12 +00:00
Ajay Panicker
2bad652e56
Merge "Protect various Bluetooth broadcasts" am: 53ff75bb68
...
am: 779a1f096c
2016-08-18 22:37:06 +00:00
Ajay Panicker
779a1f096c
Merge "Protect various Bluetooth broadcasts"
...
am: 53ff75bb68
2016-08-18 22:32:09 +00:00
George Mount
34abaebd3b
Fix NPE during Activity transition using wrong Activity.
...
am: a3edbf6a5d
2016-08-18 22:32:08 +00:00
Andy Hung
79d51bf46e
AudioSystem: Verify audio port array information
...
am: 737d9fb181
2016-08-18 22:31:53 +00:00
George Mount
2613fb543a
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
2016-08-18 22:27:31 +00:00
Andy Hung
47c7a8c19a
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev
2016-08-18 22:25:20 +00:00
