Commit Graph

57274 Commits

Author SHA1 Message Date
Joseph Pirozzo
30a962aa7a Merge "PBAP client Settings profile." into nyc-dev
am: 43b5d98

* commit '43b5d980d89f4badfe89008febf5fcd6e1ae9d49':
  PBAP client Settings profile.

Change-Id: Ic9b5d151586e5e9a093d6118ddec505c6545f955
2016-03-30 21:13:27 +00:00
Joseph Pirozzo
43b5d980d8 Merge "PBAP client Settings profile." into nyc-dev 2016-03-30 21:00:54 +00:00
Seigo Nonaka
0ab71b606d Merge "Fix incorrect initial locale negotiation." into nyc-dev
am: 48d8a39

* commit '48d8a39b7114565838f0db7c7b5ef4bea0819cae':
  Fix incorrect initial locale negotiation.

Change-Id: I8363dbd7df5e79c09a3f0bc0bb3ad00165e302b6
2016-03-30 19:54:21 +00:00
Roozbeh Pournader
48d8a39b71 Merge "Fix incorrect initial locale negotiation." into nyc-dev 2016-03-30 19:44:25 +00:00
Joseph Pirozzo
563c700f70 PBAP client Settings profile.
Add content to Settings and SettingsLib to add a checkbox for PBAP
client profile, and remove the box for PBAP server profile when the
client profile is enabled.

Bug: 27642222
Change-Id: I125559904a8e017a01ae90b1f6425129a87cbee3
2016-03-30 12:20:51 -07:00
Makoto Onuki
458e8436f9 Merge "Clean up javadoc." into nyc-dev
am: 04a5473

* commit '04a5473cbe6823cf19f42b8e92aeeafa45207c8b':
  Clean up javadoc.

Change-Id: I1fe6ecc2cdf9cebf78e5521f132d5200ca6f6bdb
2016-03-30 19:16:57 +00:00
Makoto Onuki
04a5473cbe Merge "Clean up javadoc." into nyc-dev 2016-03-30 18:56:09 +00:00
Peng Xu
16842209da Merge "Several code quality improvements" into nyc-dev
am: 50c52c0

* commit '50c52c0b34566c4501801062175124f663f118ac':
  Several code quality improvements

Change-Id: I107ab5523dc0b383d576aecc185b8c24807ac5d3
2016-03-30 18:11:00 +00:00
Peng Xu
50c52c0b34 Merge "Several code quality improvements" into nyc-dev 2016-03-30 18:04:12 +00:00
Yigit Boyar
c337826536 Merge "Multiple fixes in ScrollView and HorizontalScrollView" into nyc-dev
am: 7de3b2d

* commit '7de3b2d89834028c88e7f6590e5682b02e96e32e':
  Multiple fixes in ScrollView and HorizontalScrollView

Change-Id: I00bd3b137343ffb461543beca8ea8d5c9ec1aebe
2016-03-30 18:02:31 +00:00
Rubin Xu
4b86800055 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev
am: 5b7ca24

* commit '5b7ca24f14ae4d1189ca7683fdad1ec0e62b88b8':
  Add DevicePolicyManager API to install a client cert chain.

Change-Id: I499344fa3ae5d978bec6a4f8498f1ca037bd4505
2016-03-30 17:57:50 +00:00
Yigit Boyar
7de3b2d898 Merge "Multiple fixes in ScrollView and HorizontalScrollView" into nyc-dev 2016-03-30 17:51:55 +00:00
Rubin Xu
5b7ca24f14 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev 2016-03-30 17:46:18 +00:00
Makoto Onuki
0e65d36607 Clean up javadoc.
Bug 27548047

Change-Id: I10410c969136db634bb98687710d011d159bca07
2016-03-30 10:15:55 -07:00
Clara Bayarri
3fcd1e74f4 Merge "Change default work challenge background color" into nyc-dev
am: 30fb053

* commit '30fb0534492478a3f95f6953b31bbb666ced8fe5':
  Change default work challenge background color

Change-Id: Ib9b90a9d84c0502d37fc5b53ef4c83e830a8a822
2016-03-30 16:24:03 +00:00
Clara Bayarri
30fb053449 Merge "Change default work challenge background color" into nyc-dev 2016-03-30 16:13:00 +00:00
Clara Bayarri
8d0bd7fa63 Change default work challenge background color
Requested by UX

Bug: 27829562
Change-Id: I815c06784189e68b09e464e936521e82091c93c3
2016-03-30 17:12:08 +01:00
Makoto Onuki
a3d8cdca99 Merge "ShortcutManager: Support secondary text field." into nyc-dev
am: ca0ee28

* commit 'ca0ee285bb28ee5698d7cf2680e2fa6ca337cefd':
  ShortcutManager: Support secondary text field.

Change-Id: If7e3e8cfc14b1d7225a4167a4e8dac900c62b7e3
2016-03-30 15:38:13 +00:00
Philip P. Moltmann
7f5f0de5c4 Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev
am: a393be9

* commit 'a393be93196d89a53d53097941857b539f88da96':
  Add cancelation signal to OnRequestPrinterIcon.

Change-Id: I4a46ed1c0b9ab90edaae138ecbe0c15f82403794
2016-03-30 15:30:29 +00:00
Makoto Onuki
ca0ee285bb Merge "ShortcutManager: Support secondary text field." into nyc-dev 2016-03-30 15:30:17 +00:00
Seigo Nonaka
c14dd78a2c Fix incorrect initial locale negotiation.
It turned out that calling ResourceManager.setDefaultLocalesLocked
and ResourcesManager.applyConfigurationToResourcesLocked
can be called before the locale negotiation is ready.

To fix this issue, move ResourcesManager setup flow after creating
application context.

This also introduces RuntimeException for notifying developers the
initialize order.

Bug: 27567902
Change-Id: Iab7ea384b039fb649fb52d06d45b2bfae21f9a8a
2016-03-31 00:21:35 +09:00
Philip P. Moltmann
a393be9319 Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev 2016-03-30 15:18:32 +00:00
Alan Viverette
f5d6b7faf1 Merge "Pull weekday names directly from ICU" into nyc-dev
am: a3a3f35

* commit 'a3a3f35e8d5cafcb0e872e014ec3749329202174':
  Pull weekday names directly from ICU

Change-Id: I035332c98c525f3c1aa3d672eec33b90ae48fe59
2016-03-30 13:45:44 +00:00
Alan Viverette
a3a3f35e8d Merge "Pull weekday names directly from ICU" into nyc-dev 2016-03-30 13:35:18 +00:00
David Brazdil
72ecc752ce Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev
am: b67b5b9

* commit 'b67b5b9f3c947fc6d835459f0e880eb5fcaad50b':
  Move OTA package update before fstrim, hide "Optimizing apps" dialog

Change-Id: I8dd098ffb1a28c4061135112690fd1bdfca9a1b8
2016-03-30 12:51:29 +00:00
David Brazdil
b67b5b9f3c Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev 2016-03-30 12:41:06 +00:00
David Brazdil
f5c444ffd4 Move OTA package update before fstrim, hide "Optimizing apps" dialog
This patch moves the updating of packages before performing fstrim,
which runs asynchronously anyway, and stops showing the UI dialog.

Bug: 27350503
Change-Id: I6fceda10d7696f9badb97978fb9dc7927d698a4b
2016-03-30 13:39:14 +01:00
Andrei Stingaceanu
f46e776b06 Merge "AfW custom lock screen message - API polish" into nyc-dev
am: b70ba19

* commit 'b70ba1971c29db87e405434161489e2450309050':
  AfW custom lock screen message - API polish

Change-Id: Id2ce5fced3d6b39ab2948cb6ab7ee5001fa534cf
2016-03-30 12:35:38 +00:00
Andrei Stingaceanu
b70ba1971c Merge "AfW custom lock screen message - API polish" into nyc-dev 2016-03-30 12:23:56 +00:00
Rubin Xu
b436591708 Add DevicePolicyManager API to install a client cert chain.
When installing a keypair the caller will have the option to specify a
certificate chain which will later be returned to whoever requests access
to the keypair via KeyChain.

Bug: 18239590
Change-Id: Id21ef026e31537db38d891cb9b712dd4fe7159c7
2016-03-30 11:57:58 +01:00
Chris Banes
75ff37ebed Merge "Re-dispatch nested scrolls if not implemented" into nyc-dev
am: 6b69b12

* commit '6b69b122025631290380f4350f7bd0074bad10dd':
  Re-dispatch nested scrolls if not implemented

Change-Id: Ibb88f89e0c77b2eef7dfda72c023fc19f27d77a0
2016-03-30 08:49:00 +00:00
Chris Banes
6b69b12202 Merge "Re-dispatch nested scrolls if not implemented" into nyc-dev 2016-03-30 08:43:40 +00:00
Andre Eisenbach
5e4e14c4f1 Always use Write Request for GATT descriptor writes
am: 613f430

* commit '613f43017736580a1625cda3c5a3ed1ea7c79238':
  Always use Write Request for GATT descriptor writes

Change-Id: Ibec3a7d44146b678f31a2c898f5be376d2a5e1a1
2016-03-30 06:52:52 +00:00
Andre Eisenbach
613f430177 Always use Write Request for GATT descriptor writes
According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used used
for this sub-procedure".

Change-Id: I86e4e1d3a8bfd7d78dfed8419f8abd2d7e89b2bc
2016-03-30 06:48:58 +00:00
Peng Xu
4a4baef431 Several code quality improvements
* Added GuardedBy annotation.
* Fix a misleading variable name.
* Use anonymous namespace to reduce namespace pollution.

Change-Id: Ieffbb8dfd6abbb24b705445659fb96f7ce861592
2016-03-29 23:23:11 -07:00
Andre Eisenbach
6fbbf9f7ac Fix log spam in getCharacteristicById()
am: 1591d36

* commit '1591d368d3275276b35161810d42c6a5d9e8b43f':
  Fix log spam in getCharacteristicById()

Change-Id: I7ce3de2609c7c6bca09ad6866e6d904aeb416535
2016-03-30 03:37:35 +00:00
Andre Eisenbach
1591d368d3 Fix log spam in getCharacteristicById()
Bug: 27744135
Change-Id: I43f6358484729dedd85eb52432ad9805a66ff81e
2016-03-30 03:27:20 +00:00
Pierre Imai
132ffdcfd3 Merge "Move connectivity events to frameworks/base." into nyc-dev
am: bc786b7

* commit 'bc786b74759470e52f3f5e80c3f4b5b1c0a52636':
  Move connectivity events to frameworks/base.

Change-Id: Ie6e22bf85a4c0330826f8200fc51c90717d93a33
2016-03-30 01:23:27 +00:00
Pierre Imai
bc786b7475 Merge "Move connectivity events to frameworks/base." into nyc-dev 2016-03-30 01:16:59 +00:00
Siyamed Sinir
7709c892bc Merge "Revert "TextView setText/append methods set movement method"" into nyc-dev
am: d225f87

* commit 'd225f87ebc55333c3d40295d1977ce8ac4a59c2d':
  Revert "TextView setText/append methods set movement method"

Change-Id: I29b1a0d197dc2df861d5e55eb91ba17410c42664
2016-03-30 00:22:08 +00:00
Robert Carr
d4c85e182a Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev
am: ffe3098

* commit 'ffe309816989457f71a39a84d22fb06fe5b6e8d5':
  Ensure we change SurfaceView size from UI thread.

Change-Id: I8e57aa126a601df935b6005b74ba7842f819c741
2016-03-30 00:22:03 +00:00
Jeff Sharkey
21b1b0d937 Merge "AccessibilityNodeInfo shouldn\'t touch extras." into nyc-dev
am: af64f63

* commit 'af64f6341bdbca93aff3d68264af48e74faa9e58':
  AccessibilityNodeInfo shouldn't touch extras.

Change-Id: I44ae8aebdbe0046a64971eb47c25b8720f7bfd36
2016-03-30 00:22:00 +00:00
Makoto Onuki
4fc34416fb Merge "ShortcutManager: proper work profile support" into nyc-dev
am: d5b745a

* commit 'd5b745a9e64734483bc43c781ad809b2a75bd1ba':
  ShortcutManager: proper work profile support

Change-Id: Ic31214205a5a93e37e5585829ae522bf4890b519
2016-03-30 00:21:57 +00:00
Siyamed Sinir
d225f87ebc Merge "Revert "TextView setText/append methods set movement method"" into nyc-dev 2016-03-29 23:59:15 +00:00
Rob Carr
ffe3098169 Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev 2016-03-29 23:50:47 +00:00
Makoto Onuki
e3ae7ec14a ShortcutManager: Support secondary text field.
Bug 27548047

Change-Id: I2d184bab2c26e351b7326945fa0cacf826f16d1e
2016-03-29 16:42:12 -07:00
Jeff Sharkey
af64f6341b Merge "AccessibilityNodeInfo shouldn't touch extras." into nyc-dev 2016-03-29 22:47:17 +00:00
Makoto Onuki
d5b745a9e6 Merge "ShortcutManager: proper work profile support" into nyc-dev 2016-03-29 22:45:03 +00:00
Jeff Sharkey
297017d154 AccessibilityNodeInfo shouldn't touch extras.
The extras may contain custom Parcelables which aren't in the
system's default classpath, so touching them would end up clobbering
the contents.

Update code to leave the parcelled data untouched inside the bundle
until someone tries reading the extras.

Bug: 27897919
Change-Id: I99381dd50c9a0e8887667076362ea98805f0437c
2016-03-29 16:38:55 -06:00
Adam Powell
cfc0818bdd Merge "Add contentInsetStartWithNavigation/EndWithActions" into nyc-dev
am: b3eca31

* commit 'b3eca3161d78f4ed5d5466de3d9ee59af6e271af':
  Add contentInsetStartWithNavigation/EndWithActions

Change-Id: Icfcd1296131ed26c97d766ccad230a59900d4b97
2016-03-29 22:19:21 +00:00