1632 Commits

Author SHA1 Message Date
Annie Chin
d99252358b Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev
am: d58f07f58a

Change-Id: I6a9c537b71084696915e744102a6a12f532942d5
2016-07-06 23:29:50 +00:00
Annie Chin
d58f07f58a Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev 2016-07-06 23:22:10 +00:00
smain@google.com
68d98965c5 Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev
am: 83f71845af

Change-Id: Id932ce48bb4274096b0c3f367ea0f9d0c7cabef5
2016-07-06 22:57:10 +00:00
Erik Kline
c179797f8e Merge \\"[net mgmt svc] add method to retrieve INetd reference\\" into nyc-mr1-dev am: 58ef88927d
am: e62b36bb33

Change-Id: Icf35de6a5a0dcc356cce4cf5d183aed647f35cc6
2016-07-06 13:21:51 +00:00
Erik Kline
e62b36bb33 Merge \"[net mgmt svc] add method to retrieve INetd reference\" into nyc-mr1-dev
am: 58ef88927d

Change-Id: Ide0d1043f4047593c10dcb1a1e3ca5c644c6496c
2016-07-06 13:15:47 +00:00
Erik Kline
4e37b70440 [net mgmt svc] add method to retrieve INetd reference
Bug: 21859053
Bug: 28135208
Change-Id: Idfb5ca65788ae8c7aea91f12d9d461686ad836d6
2016-07-06 19:32:01 +09:00
Annie Chin
ecb9f3e9b8 Add callbacks to VoiceInteractionManagerService
Bug: 29582254

Change-Id: I548d01bd1c7e261b2d2e0afd606d964e5553124e
2016-07-01 13:00:09 -07:00
smain@google.com
8562ab5ab8 remove "referenceonly" flag from the offline-docs build.
Add new offline-docs-referenceonly make rule.
And update online-sdk and offline-sdk to use the new site templates.

Change-Id: I1a9b8e3ff4973a147c6878092ae960a6980cb3d8
2016-06-30 19:08:11 -07:00
Allen Hair
b81ae49092 Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\" into nyc-dev am: 15783f0073 am: fb20170c0f
am: b216e80956

Change-Id: Ib7d63464ea7a042ea5461ce62928ceb8a3c01c0b
2016-06-28 17:40:56 +00:00
Allen Hair
b216e80956 Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc-dev am: 15783f0073
am: fb20170c0f

Change-Id: I23336cd7dac59a0e2510b718ede8ae3a389047ac
2016-06-28 17:33:34 +00:00
Allen Hair
fb9d75e7cd Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am: 15783f0073

Change-Id: Ie9e71eb96ad654fc1d34317177cce8013bc2dcb9
2016-06-28 17:30:28 +00:00
Allen Hair
fb20170c0f Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am: 15783f0073

Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81
2016-06-28 17:30:21 +00:00
Allen Hair
0e4f014c20 Add a flag to enable instrumentation of the framework classes.
Bug: 29777843
Change-Id: I0f3639ad1303a9b2cc612f99cde427dedff4874f
2016-06-27 17:20:24 -07:00
Yohei Yukawa
bf055ba658 Merge \\"Add InputMethodService#exposeContent()\\" into nyc-mr1-dev am: dc42d7dd13
am: d02470f5a8

Change-Id: Id551d53ae3d7c34157ddf166aa44bdef67d46853
2016-06-23 01:37:10 +00:00
Yohei Yukawa
d02470f5a8 Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev
am: dc42d7dd13

Change-Id: Icf3ca0403c7dee26a3083ca98ca1239887d471bc
2016-06-23 01:29:58 +00:00
Yohei Yukawa
25e0813e6e Add InputMethodService#exposeContent()
This is a follow up CL to my previous CLs [1][2] that introduced
InputConnection#commitContent(InputContentInfo, Bundle) API to enable
IMEs to send a content to the target application.

With this CL, IME developers are able to temporarily expose
InputContentInfo object to the target package without permanently
granting URI permission.  Although calling IMS#exposeContent() is
allowed only for the IME that is currently selected, the client is able
to request a temporary read-only access even after the current IME is
switched to any other IME as long as the client keeps InputContentInfo
object.

Here is a sample code snippet about how to use this mechanism.

  [IME]
  InputContentInfo contentInfo = new InputContentInfo(
          contentUri,
          new ClipDescription(description, new String[]{mimeType}),
          linkUrl);
  exposeContent(contentInfo, getCurrentInputEditorInfo());
  getCurrentInputConnection().commitContent(inputContentInfo, null);

  [App]
  try {
      contentInfo.requestPermission();
      // Load inputContentInfo.getContentUri() here.
  } finally {
      contentInfo.releasePermission();
  }

 [1]: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
      152944f4909c47917473293b258d266435c6ab35
 [2]: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
      adebb52588b098a1af678d4e33a234ef1ce783b2

Bug: 29450031
Change-Id: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
2016-06-22 16:31:41 -07:00
Gina Dimino
4926ee18c0 Merge \\\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\\" into nyc-dev am: d06520a488 am: b7181150c4
am: cb08f6805a

Change-Id: I65d3016319d0cc53a53f931aa62c642ac53b9520
2016-06-17 20:42:09 +00:00
Gina Dimino
cb08f6805a Merge \\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\" into nyc-dev am: d06520a488
am: b7181150c4

Change-Id: Iaa27ea956dbb521ff0fd20c2ab4ddb27608bf2f4
2016-06-16 21:13:04 +00:00
Gina Dimino
b7181150c4 Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
am: d06520a488

Change-Id: Ice3bd7016d11e4f8f50c09e7b6ba3cb613911a52
2016-06-16 21:08:17 +00:00
Gina Dimino
0bae4dcd76 Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
am: d06520a488

Change-Id: I127501113d4e290a1e8d0b3a44ba779ec36cdc1d
2016-06-16 21:08:15 +00:00
Gina Dimino
d06520a488 Merge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev 2016-06-16 21:02:14 +00:00
Dirk Dougherty
8930555a4a Merge \\\"Add API 24 to reference selector.\\\" into nyc-dev am: 398d088871 am: f44feb36b0
am: f992a2af12

Change-Id: Ie77f470408603acddb50a39738003dfa407b7183
2016-06-15 00:44:18 +00:00
Dirk Dougherty
f992a2af12 Merge \\"Add API 24 to reference selector.\\" into nyc-dev am: 398d088871
am: f44feb36b0

Change-Id: Iff60df549779cd1155a7bfeeb74aca5e546a31ad
2016-06-15 00:34:01 +00:00
Dirk Dougherty
f44feb36b0 Merge \"Add API 24 to reference selector.\" into nyc-dev
am: 398d088871

Change-Id: I922cb82b69a13913d83280d1003e292528bdfd88
2016-06-15 00:28:07 +00:00
Dirk Dougherty
8d129efa23 Merge \"Add API 24 to reference selector.\" into nyc-dev
am: 398d088871

Change-Id: I51a61188186026eac5c12f3b0d0ec52eebf60f38
2016-06-15 00:28:03 +00:00
Dirk Dougherty
5f60f7cde6 Add API 24 to reference selector.
Change-Id: I153245ef814e27bf50f9d972ad1aa34fd92e6b8a
2016-06-14 16:27:32 -07:00
Robert Greenwalt
57ea9d02e5 Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev am: 6a5c9560a3
am: c4e25b26de

* commit 'c4e25b26defa019041d2e596381be69b7a68210c':
  Add support for UNSOL PCO Data.

Change-Id: I77697380a179bd9894cfb21c71c734b9b8781016
2016-06-03 16:50:13 +00:00
Robert Greenwalt
c4e25b26de Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
am: 6a5c9560a3

* commit '6a5c9560a33337fc82362d77bc4bae633953428d':
  Add support for UNSOL PCO Data.

Change-Id: Idcf20b421f1174b3ddacaa6fde33b221a5ecbccf
2016-06-03 16:44:29 +00:00
Robert Greenwalt
37409c5747 Add support for UNSOL PCO Data.
PCO is a container in data-call responses with a range
of optional fields devoted to carrier-proprietary signalling.
This change includes a class to contain this opaque info on
its way to carrier apps.

bug:28961371
bug:28567303
Change-Id: Ibfc304800bb3d5b8706d56c08400c1d0b4453a55
2016-06-02 15:21:59 -07:00
Gina Dimino
98ad88811c Docs: Suppress errors in SystemApi Build
Bug: 28427390

Change-Id: Ifea85bf7b1fcdd30a3d7f61bd17d0efba6368aa4
2016-06-01 16:13:53 -07:00
Dirk Dougherty
4b07a03dac Merge "Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104 am: 4569e9515c am: 48d8747041" into nyc-mr1-dev-plus-aosp
am: 4a9ae46de9

* commit '4a9ae46de97476e75d2f2e38989c5b93a272349b':
  Pass -yaml to ds builds to generate _book.yaml version of reference TOC.

Change-Id: Iba70a1644719fefc08c83acb049ff826c5c98923
2016-05-02 19:48:56 +00:00
Dirk Dougherty
48d8747041 Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104
am: 4569e9515c

* commit '4569e9515c651616f7e24f563b52de98fb4bf258':
  Pass -yaml to ds builds to generate _book.yaml version of reference TOC.

Change-Id: I83d230df7e8fb620ec9ea57621492261fbb236b7
2016-05-02 19:39:03 +00:00
Dirk Dougherty
4569e9515c Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c
am: c25a9b0104

* commit 'c25a9b0104802454487ee6c428f9f070d389c02f':
  Pass -yaml to ds builds to generate _book.yaml version of reference TOC.

Change-Id: Ib8ff6165cbcb1d3fb52611e9f5e61ac69a0083b6
2016-05-02 19:34:34 +00:00
Dirk Dougherty
c25a9b0104 Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264
am: 6049306d8c

* commit '6049306d8c0f88f78dbc097bfcc971b095c6a9a3':
  Pass -yaml to ds builds to generate _book.yaml version of reference TOC.

Change-Id: I6b6a65147254b0d2ba5ec6aa52429819ddca9b77
2016-05-02 19:29:22 +00:00
Dirk Dougherty
dfa366dccf Pass -yaml to ds builds to generate _book.yaml version of reference TOC.
Change-Id: I1eced1670eb9d7892672b59f3b92833448b9949a
2016-04-29 18:06:11 -07:00
Martijn Coenen
53e7852f0b Merge "Fix API review comments, add remove callback." into nyc-dev am: d19191d am: 1b65983
am: bd7a5a1

* commit 'bd7a5a1041ea9e8a4075692cac020fd6374b5bb1':
  Fix API review comments, add remove callback.

Change-Id: I55e8eb1f6ae9308abf90d30bac434fc81ed18c7a
2016-04-28 05:49:29 +00:00
Martijn Coenen
1b65983aa9 Merge "Fix API review comments, add remove callback." into nyc-dev
am: d19191d

* commit 'd19191d4dcdefeebe0409d65740ee006c9e8a6a2':
  Fix API review comments, add remove callback.

Change-Id: I9ae9906df2f8ab3fdeb6c3e84a31ba66dcc7ca44
2016-04-28 05:43:17 +00:00
Martijn Coenen
d19191d4dc Merge "Fix API review comments, add remove callback." into nyc-dev 2016-04-28 05:34:05 +00:00
The Android Automerger
750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115 2016-04-27 22:14:50 +00:00
Dirk Dougherty
a2fcd056a9 Merge "resolve merge conflicts of 0d00d28 to nyc-dev" into nyc-dev
am: 58a252d

* commit '58a252d1f0048c8b4188f6ea87d072cb3a686a50':
  Adjust root path for translated content dirs on devsite builds.

Change-Id: I0812cf024502b32259bd4431324e91d8fcf5e792
2016-04-27 21:20:57 +00:00
Dirk Dougherty
d9036ba7ef resolve merge conflicts of 0d00d28 to nyc-dev
Change-Id: Ib922635fe200a4216ce2970660daf3105d521cc9
2016-04-27 10:44:43 -07:00
Svet Ganov
db2174dcb8 Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe am: d4bc15b
am: 0010741

* commit '0010741818127e6c9449fc49490f0bad14a76240':
  Ensure local settings caches are not stale

Change-Id: I26c4f1f72eda3b2ebfb3ca6e086a0381d357471c
2016-04-26 18:54:37 +00:00
Svet Ganov
d4bc15b66b Merge "Ensure local settings caches are not stale" into nyc-dev
am: f71d7fe

* commit 'f71d7feef22db9e0cab2f32edc7440aedb86fdfe':
  Ensure local settings caches are not stale

Change-Id: I356b9ad0b6dc1e91bfad140de1b9fc79ab6efef3
2016-04-26 18:47:52 +00:00
Svetoslav Ganov
f71d7feef2 Merge "Ensure local settings caches are not stale" into nyc-dev 2016-04-26 18:36:28 +00:00
Svet Ganov
53a441ca8e Ensure local settings caches are not stale
We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.

This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.

The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.

We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.

The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.

bug:18826179

Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
2016-04-26 11:31:55 -07:00
Dirk Dougherty
0d00d287a5 Merge "Adjust root path for translated content dirs on devsite builds." into mnc-mr-docs am: face65fe16
am: eeee5e2

* commit 'eeee5e2ec980f67b92597b7f5d8828593b3692aa':
  Adjust root path for translated content dirs on devsite builds.

Change-Id: Id3d33d84e7127bc8cab0cdd4ccbc3505bfb2c824
2016-04-26 08:51:53 +00:00
Svet Ganov
879f5ba3f7 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev am: c947ebd am: 70d720c
am: 13da561

* commit '13da5613e2fce0ca2d5682fd202234856d2206e9':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: Ibe4a6258c6437a9e86ed25e242301ca6d6635d26
2016-04-22 22:35:29 +00:00
Svet Ganov
70d720ca72 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev
am: c947ebd

* commit 'c947ebd66d397782af0870df457ccc4fe83c77cc':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: I50e4c8357bb0c5abab9c37b6a39628f6e3e0ea1b
2016-04-22 22:24:36 +00:00
Sujith Ramakrishnan
fa5a632067 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f am: a2262b3
am: c5826ee

* commit 'c5826eebc50a6ffafe8cd20633b01b6ca27e8490':
  Unbundle RemoteService on TV - part 3

Change-Id: If0dabbb8199132648fa9a791f46ee85e8970eb4b
2016-04-22 21:36:53 +00:00
Svet Ganov
ae0e03a9e0 Cleanup of the PackageInstaller API - Frameworks
The PackageInstaller app manages side-loading apps as well
as permission management. It should be updatable, hence
should rely on system APIs to talk to the platform. This
is the first step of defining an API boundary.

Change-Id: I9814eafd0b22ae03b4b847a7007cdbf14c9e5466
2016-04-22 14:18:32 -07:00