drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
283,359 Commits 1 Branch 0 Tags
Commit Graph

1362 Commits

Author SHA1 Message Date
smain@google.com
bf7ab6a90c resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp 
am: 151833ab14

Change-Id: Icbde16bb62da630836fe908fa7ca088fe95701ba
 2016-09-01 01:26:48 +00:00
smain@google.com
151833ab14 resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp 
Change-Id: Ied5ddc04e6da65cba62698cd18ba78496f5fb646
 2016-08-31 08:42:09 -07:00
smain@google.com
c9ec419c9c replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0) 
am: dde8deb950

Change-Id: Ide293756b6b7a75a434ff9ed3cf15cd40fbd3452
 2016-08-31 03:40:37 +00:00
smain@google.com
dde8deb950 replace the N Preview landing page with the redirect to the package index 
also update version metadata (no longer preview, now 7.0)

Change-Id: I84af003daa9bae3bc932c8b87921ed82f813e1cf
 2016-08-30 20:42:12 +00:00
Mitchell Wills
722de5f9d0 DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp 
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
 2016-08-29 17:46:44 -07:00
The Android Automerger
f287780643 Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp 2016-08-30 00:26:21 +00:00
TreeHugger Robot
357773aa62 Merge "Add KeyAttestationApplicationIdProviderService to SystemServer" 2016-08-29 16:18:51 +00:00
Etan Cohen
00abb43588 [NAN] Renamed listeners to callback per API guidelines 
The interfaces had multiple functions and are hence callback
and not a listener.

Note: purely a rename operation.

(cherry-pick of 0d0f0c7faf530a0fa5595dd539c3f56afeb6603a,
 Change-Id: Ib12711f56a64052455843859125d72268c465fc0)

Bug: 27122760
Change-Id: Ie1905a5d907e5b09d449af52814b1aacb6426477
(cherry picked from commit 4e1af1b80735f5d61f089432a63a23937c994546)
 2016-08-26 13:18:55 -07:00
Etan Cohen
b29bbcc54c [NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config 
Simplify configuration and consolidate structures whose difference
wasn't very clear.

(cherry-pick of e4c50de75273efaec4e9e8db6174e0bfc07d3105,
 Change-Id: I0651cade71eb146d9ea9219baf6d2253588db3de)

Bug: 27122760
Change-Id: I6320bd4c960e4473b4bf3c28e54a7ba492fa2cf9
(cherry picked from commit 581a4f7b31e3ccefce6c022582fd99ba0313b73c)
 2016-08-26 13:18:54 -07:00
Janis Danisevskis
8ff1e193ac Add KeyAttestationApplicationIdProviderService to SystemServer 
Add getKeyAttestationApplicationId and the Parcelables
KeyAttestationPackageInfo and KeyAttestationApplicationId,
needed by keystore.

Bug: 22914603
Change-Id: I89a88cd9cd80e9b132ca67fc452e9cae8b8ad241
 2016-08-19 13:50:55 +01:00
Dirk Dougherty
a4a2358706 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. am: b042ab1eb6 am: d66ec65b77 am: 7e7ea76356 
am: c05521b401

Change-Id: I6341a4d027654329209241d1955b90efd02f910e
 2016-08-18 01:13:32 +00:00
Dirk Dougherty
1d7e5a6998 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. 
am: b042ab1eb6

Change-Id: I1c8026a7ff09cfce9049383123a143b845dcede6
 2016-08-17 23:25:38 +00:00
Dirk Dougherty
c05521b401 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. am: b042ab1eb6 am: d66ec65b77 
am: 7e7ea76356

Change-Id: I6a9043c277e624dd3c96be9122454c937931b461
 2016-08-17 23:16:03 +00:00
Dirk Dougherty
d66ec65b77 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. 
am: b042ab1eb6

Change-Id: I725ff3bce89572d06f76dd9f1860365514d27d56
 2016-08-17 22:59:23 +00:00
Dirk Dougherty
b042ab1eb6 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. 
Change-Id: I7d26fabfca74d8e706fd99cbeaa1761907c31dbf
 2016-08-16 16:28:20 -07:00
Todd Kennedy
8d69e9c93b Move EphemeralResolverService am: 31b95e0265 am: fa67fad84e 
am: 8c073e0aad

Change-Id: I2fb2add1e4431c2c802430990f99807934878e84
 2016-08-05 17:58:25 +00:00
Todd Kennedy
8c073e0aad Move EphemeralResolverService am: 31b95e0265 
am: fa67fad84e

Change-Id: Ieabd373b5557e03c6a189f070c8f79998e7a5a0a
 2016-08-05 17:52:00 +00:00
Todd Kennedy
31b95e0265 Move EphemeralResolverService 
It should not have been under com.android.internal

Fixes: 30673742
Change-Id: I2277aa4a4799fa59bf68af7c4cfcb4e1216aeb8d
 2016-08-05 07:17:52 -07:00
smain@google.com
3b2a713f92 Merge \\\"update the version number used in docs and update the offline docs landing page\\\" into nyc-dev am: 6623f4177c am: 38b71c5741 
am: 5eac2b0d88

Change-Id: I63b57594c6d2eb833a577ff8b51c01e9d2e31d39
 2016-07-18 15:22:05 +00:00
Scott Main
5eac2b0d88 Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am: 6623f4177c 
am: 38b71c5741

Change-Id: Ice045bb360e2de70af6cc3cc721d6ec5f55e8f58
 2016-07-18 15:15:14 +00:00
smain@google.com
38b71c5741 Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev 
am: 6623f4177c

Change-Id: Iedcaed7bc842c353bbf2dc3f66dfa5054613d1e8
 2016-07-18 15:08:13 +00:00
smain@google.com
e8c3590a77 Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev 
am: 6623f4177c

Change-Id: I60626863804f787bf5e1435003d730427f1254df
 2016-07-18 15:07:55 +00:00
smain@google.com
39426fd8f6 update the version number used in docs 
and update the offline docs landing page

Change-Id: I36388e0a125d6349518d9c4d5368fb76fb85cf7a
 2016-07-13 16:08:25 -07:00
Selim Cinek
d1c50f66f6 resolve merge conflicts of 6e57aae to master 
Change-Id: I929929ad41df4439996755b605d084bfdcf3428a
 2016-07-11 11:20:32 -07:00
Jorim Jaggi
6e57aae680 Merge \"Improve initial unlock delay (1/2)\" into nyc-mr1-dev 
am: 165b011a74

Change-Id: Ib7bfefcd59288d144a22434e5a99124c66fa4826
 2016-07-08 22:08:37 +00:00
Jorim Jaggi
e8fde5d966 Improve initial unlock delay (1/2) 
When checking for the credentials, we add a new callback
onEarlyVerified which gets called as soon as we know that the
credential was correct.

In KeyguardUpdateMonitor, we track the unlocked state of the user,
and if it's still locked, we slow down all the transitions to allow
for a more gradual unlock experience.

Bug: 29007436

Change-Id: I406d228f9f3e41e07fe3292a61df175a7f579e4d
 2016-07-08 11:50:54 -07:00
smain@google.com
7e1ea947f6 Merge \"Merge \\"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\\" into nyc-mr1-dev am: 925a5ffa5e\" into nyc-mr1-dev-plus-aosp 
am: 3fa5eaa997

Change-Id: I965b36238ad7cc02a6b7f7f9257938edce665209
 2016-07-07 01:47:49 +00:00
smain@google.com
c1108c3927 Merge \"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\" into nyc-mr1-dev 
am: 925a5ffa5e

Change-Id: I91587d97a6fa86135646e937c241deca1f10275e
 2016-07-07 01:31:58 +00:00
smain@google.com
c526ad0e89 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: Iee22aa299a11517f6c0efb73b57d5d256c8148c1
 2016-07-07 01:25:11 +00:00
Annie Chin
f83ada9e8a Merge \\"Add callbacks to VoiceInteractionManagerService\\" into nyc-mr1-dev am: d58f07f58a 
am: d99252358b

Change-Id: I809b459045a0606abc6ea5d4ad2d186f752b8bfb
 2016-07-06 23:35:03 +00:00
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