Commit Graph

31007 Commits

Author SHA1 Message Date
Mathias Agopian
9904be3570 am f2362ceb: am b1fa4f92: Merge "fix CloseGuard usage in Surface" into jb-mr2-dev
* commit 'f2362ceb50209dfb72899f9ab1b839e9238ef9a6':
  fix CloseGuard usage in Surface
2013-03-14 02:36:55 +00:00
Robert Greenwalt
bbaa7c1296 am f0cf1ead: am ad7a1d56: Merge "Add logging to track down bug" into jb-mr2-dev
* commit 'f0cf1ead7157d1de98c84922711aea65619e28f1':
  Add logging to track down bug
2013-03-14 02:34:40 +00:00
Jaikumar Ganesh
e7ed3aa268 am 5f3b22d6: am 980ef31f: Merge changes I1aab1dbc,I83c92971,I47337efd into jb-mr2-dev
* commit '5f3b22d691e7388c172d8f9635d153c9c73a8699':
  Revert "Add new sensor types."
  Revert "Remove spurious @Override."
  Revert "Add a minimum size for the event pools."
2013-03-14 02:34:27 +00:00
Dianne Hackborn
fc68ed14ff am f1ebd1bd: am 5d122d96: Better documentation on permission checking in ContentProvider.call().
* commit 'f1ebd1bd6799f4e2c5734ab372a9c78cd724b27e':
  Better documentation on permission checking in ContentProvider.call().
2013-03-14 02:34:21 +00:00
Craig Mautner
a59d0c81d5 am 35d45010: am dc50ba18: Merge "Put debug back in for b/b8263462." into jb-mr2-dev
* commit '35d450107716d5ea950a19ffe09065ad4cb8b1fc':
  Put debug back in for b/b8263462.
2013-03-14 02:34:00 +00:00
Przemyslaw Szczepaniak
5f51a1e1dd am decc6cb1: am 24943bf1: Failing Text-To-Speech CTS tests fix.
* commit 'decc6cb1a74153e6d3cd5b02f1877d6c16bf8603':
  Failing Text-To-Speech CTS tests fix.
2013-03-14 02:33:50 +00:00
Mathias Agopian
b1fa4f92dc Merge "fix CloseGuard usage in Surface" into jb-mr2-dev 2013-03-14 02:13:13 +00:00
Mathias Agopian
86e1bc7305 fix CloseGuard usage in Surface
Bug: 8375415
Change-Id: I03e9f318c2ad586f4bd93b280557ada66121d275
2013-03-13 18:21:11 -07:00
Robert Greenwalt
ad7a1d564d Merge "Add logging to track down bug" into jb-mr2-dev 2013-03-13 23:59:00 +00:00
Robert Greenwalt
5ddeb9ed70 Add logging to track down bug
bug:8377625
Change-Id: Ifd0c4081a2f1238dbbc39c6904b993e2fb95455a
2013-03-13 16:38:46 -07:00
Jaikumar Ganesh
980ef31f95 Merge changes I1aab1dbc,I83c92971,I47337efd into jb-mr2-dev
* changes:
  Revert "Add new sensor types."
  Revert "Remove spurious @Override."
  Revert "Add a minimum size for the event pools."
2013-03-13 23:20:31 +00:00
Dianne Hackborn
5d122d96a5 Better documentation on permission checking in ContentProvider.call().
Change-Id: I4a85fd17362c2a32e2b1365fcc07ef0336521616
2013-03-13 15:48:12 -07:00
Jaikumar Ganesh
1aab1dbca5 Revert "Add new sensor types."
This reverts commit bc03a348d7.
2013-03-13 15:00:21 -07:00
Jaikumar Ganesh
83c9297139 Revert "Remove spurious @Override."
This reverts commit 6e544fd4ca.
2013-03-13 15:00:04 -07:00
Jaikumar Ganesh
47337efd63 Revert "Add a minimum size for the event pools."
This reverts commit c0ce7eeb48.
2013-03-13 14:59:57 -07:00
Craig Mautner
dc50ba187e Merge "Put debug back in for b/b8263462." into jb-mr2-dev 2013-03-13 21:20:22 +00:00
Craig Mautner
6efb4c746f Put debug back in for b/b8263462.
Previous CL did not fix.

Change-Id: Ief9e8f519480fa41248d53e5b0187c9657f00b79
2013-03-13 11:12:26 -07:00
Przemyslaw Szczepaniak
24943bf19d Failing Text-To-Speech CTS tests fix.
Fix for failing android.speech.tts.cts.TextToSpeechServiceTest#testSynthesizeToFile.
In test env, ParcelFileDescriptor instance may be EXACTLY the same one that client uses.
And if it's closed by a client, then service is prevented from writing anything to the output.

Bug: 8377754
Change-Id: I7f95aae1b877e543ab02d3c548b29537aa852a89
2013-03-13 15:50:00 +00:00
Bjorn Bringert
133e2db873 Merge "Hide VOICE_ASSIST intent DO NOT MERGE" into jb-mr2-dev 2013-03-13 13:28:01 +00:00
Justin Koh
23a1680449 am c631feed: am c0ce7eeb: Add a minimum size for the event pools.
* commit 'c631feed18cd408992d0874a0a8b59a851857d87':
  Add a minimum size for the event pools.
2013-03-13 01:52:18 +00:00
Justin Koh
c0ce7eeb48 Add a minimum size for the event pools.
Add a minimum size for the event pools for devices which don't have sensors.
Otherwise the system server crash loops on boot.

Change-Id: Ic51c6fc26c8779d9f435f358d4274148a2ddbfb3
2013-03-12 18:06:35 -07:00
Jaikumar Ganesh
df23f8cb91 am f667b7a7: am 6e544fd4: Remove spurious @Override.
* commit 'f667b7a7f93cc60faaf007086dcb4020d7568d96':
  Remove spurious @Override.
2013-03-13 00:08:18 +00:00
Jaikumar Ganesh
6e544fd4ca Remove spurious @Override.
Change-Id: Idd468be5c05bcdf397c6ba02a902c4ef7719fca8
2013-03-12 17:00:27 -07:00
Matthew Xie
fa22a0410e am 86b00416: am d6c87ccd: Merge "Fixed 32 bit characteristic value assignment" into jb-mr2-dev
* commit '86b00416e812a342209de4d5391acf30d0faa5a4':
  Fixed 32 bit characteristic value assignment
2013-03-12 23:21:12 +00:00
Michael Wright
1636c2a4d3 am d1bb4d4b: am 999c2a69: Merge "Remove unused interface IInputConnectionCallback" into jb-mr2-dev
* commit 'd1bb4d4be20f3538d1a7ed4ec2736c10ca1a565e':
  Remove unused interface IInputConnectionCallback
2013-03-12 23:17:46 +00:00
Matthew Xie
d6c87ccde6 Merge "Fixed 32 bit characteristic value assignment" into jb-mr2-dev 2013-03-12 23:16:02 +00:00
Dianne Hackborn
dc37c5f2e3 am 0c42b580: am 53149acf: Merge "Implement limited shared libraries in apks." into jb-mr2-dev
* commit '0c42b58041dc0ede9865335fa48637fb6b677cd3':
  Implement limited shared libraries in apks.
2013-03-12 23:10:38 +00:00
Michael Wright
999c2a69b4 Merge "Remove unused interface IInputConnectionCallback" into jb-mr2-dev 2013-03-12 23:09:39 +00:00
Shawn Pearce
6c08f4dbab am c129d78e: am d665b495: Merge "Add new sensor types." into jb-mr2-dev
* commit 'c129d78edadfd9f9e2af1d4bc0f6af4907e08780':
  Add new sensor types.
2013-03-12 23:07:07 +00:00
Dianne Hackborn
53149acf7b Merge "Implement limited shared libraries in apks." into jb-mr2-dev 2013-03-12 23:03:59 +00:00
Shawn Pearce
d665b49518 Merge "Add new sensor types." into jb-mr2-dev 2013-03-12 23:01:53 +00:00
Lorenzo Colitti
440662c481 am 7a1d77d2: am 8818d84a: Merge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev
* commit '7a1d77d217e42ec02d5c9f79924b1009fd2219c2':
  Unit test routes with interfaces in LinkProperties
2013-03-12 22:07:36 +00:00
Lorenzo Colitti
1994bc14ab Unit test routes with interfaces in LinkProperties
Change-Id: Ie41a56bc9863ee72f4d7a8f72e436fc57e57b1af
2013-03-12 15:01:05 -07:00
John Reck
6d2679cd3b am 389a543d: am 93f99846: am bd5ee4d3: am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"
* commit '389a543d61e109ba03dd3d736d4a3e719906342a':
  Fix NPE when pasting non-text from Clipboard
2013-03-12 21:39:11 +00:00
John Reck
93f99846df am bd5ee4d3: am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"
* commit 'bd5ee4d39c8d7d1fc2c1f94980875f1900880880':
  Fix NPE when pasting non-text from Clipboard
2013-03-12 14:34:29 -07:00
John Reck
bd5ee4d39c am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"
* commit '733329a2745ce703029b40afaa5dd78c7a5b620c':
  Fix NPE when pasting non-text from Clipboard
2013-03-12 14:29:48 -07:00
Kenny Root
a4fd2fbfae am 358c6ffd: am ae19d2ca: am f3e3a7fd: am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."
* commit '358c6ffdd43df805f5fb19c8d935c1e9220b95e5':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
2013-03-12 20:32:17 +00:00
Kenny Root
ae19d2cac8 am f3e3a7fd: am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."
* commit 'f3e3a7fd3cc386b69ae3275b829ddd0d137fcac5':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
2013-03-12 13:27:13 -07:00
Kenny Root
f3e3a7fd3c am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."
* commit '7ad514094c8abbea0cc61b72fcaf0e23d6124b0d':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
2013-03-12 13:25:35 -07:00
John Reck
733329a274 Merge "Fix NPE when pasting non-text from Clipboard" 2013-03-12 20:24:14 +00:00
Kenny Root
7ad514094c Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey." 2013-03-12 20:05:09 +00:00
Dianne Hackborn
c895be7bc6 Implement limited shared libraries in apks.
You can now declare shared libraries in apks that are
on the system image.  This is like the existing mechanism
of using raw jar files as shared libraries, but since they
are contained in an apk the library can actually be updated
from the Play Store.  And this even (mostly) works.

There are some deliberate limitations on this feature.  A
new shared library *must* be declared by an apk on the system
image.  Installing an update to a system image apk does not
allow you to add new shared libraries; they must be defined
by everything on the base system image.  This allows us to
get rid of a lot of ugly edge cases (shared libraries that were
there disappearing after an update is uninstalled for example)
and give some brakes on apps that happen to be pre-installed
on devices from being able to throw in new shared libraries
after the fact.

In working on this, I ran into a recently introduced bug where
uninstalling updated to system apps would fail.  This was done
to allow for the new restricted users that don't have all
system apps, but conflicts with the existing semantics for
uninstalling system apps.  To fix this I added a new uninstall
flag that lets you switch on the new mode if desired.

Also to implement the desired logic for limitations on declaring
new shared libraries in app updates, I needed to slightly tweak
the initial boot to keep the Package object for hidden system
packages associated with their PackageSetting, so we can look at
it to determine which shared libraries are allowed.  I think
this is probably more right than it was before -- we already
need to parse the package anyway, so we have it, and when you
install an update to a system app we are in this same state
until you reboot anyway.

And having this fixed also allowed me to fix another bug where
we wouldn't grant a new permission to an updated app if its
system image version is updated to request the permission but
its version is still older than whatever is currently installed
as an update.  So that's good.

Also add new sample code showing the implementation of an apk
shared library and a client app using it.

Change-Id: I8ccca8f3c3bffd036c5968e22bd7f8a73e69be22
2013-03-12 12:51:38 -07:00
Bjorn Bringert
964e7d2549 Hide VOICE_ASSIST intent DO NOT MERGE
Bug: 8289964
Change-Id: I49874f379647ff4e85402a298b4181923212a0aa
2013-03-12 19:35:57 +00:00
Craig Mautner
b11b1f2679 Remove old show/hide messages on new ime
The previous show/hide messages in the queue were still trying
to be honored even after a new ime was attached.

Fixes bug 8263462.

Change-Id: Ie85369346cd3f843389a8e7837f5d97b56885309
2013-03-12 11:25:54 -07:00
Michael Wright
e8cc96b8f8 Remove unused interface IInputConnectionCallback
Bug: 8276952
Change-Id: I3755df557388bee55f0cc4780adc300672cbe9a1
2013-03-12 11:01:14 -07:00
Andre Eisenbach
3f36660a60 Fixed 32 bit characteristic value assignment
Also fixed link in comment.

Change-Id: I27223b8aadae2fc7c8037abc6396760e23f6f161
2013-03-12 10:53:56 -07:00
Jaikumar Ganesh
bc03a348d7 Add new sensor types.
1. Add uncalibrated gyros and magnetic field sensor.
2. Change max number of events from 3 to 16.
3. Add new APIs for trigger sensors.

Change-Id: I1957d723de2b65c31dadaee7386fd8d51ea2f7e5
2013-03-12 10:50:41 -07:00
Alex Klyubin
ac5eb03a7c Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
This is to accept both the "transparent" and "opaque" ECC private
keys. "Transparent" keys provide structured access to their key
material -- these are instances of ECPrivateKey. "Opaque" private
keys are not required to provide structured (or even any) access to
their key material -- these are instances of PrivateKey.

Change-Id: Ib22e18b45b638b429f994ed965416c753226c4ee
2013-03-12 10:33:13 -07:00
Nils Holmström
df337f30e9 Fix NPE when pasting non-text from Clipboard
When copying a link from a bookmark and then pasting it into
a textfield a NullPointerException will occur.
A ClipData.Item is not guaranteed to always contain a text string
and therefore getText() can be set to null.

Using method coerceToText() instead of getText() makes sure that
a text string is always returned.

Change-Id: I81343c0371835a3a7a52045dcd1760e69e59a967
2013-03-12 20:49:14 +09:00
Jean Chalard
92291eea07 Merge changes I3109a482,Ia5e25738
* changes:
  Final small cleanup.
  Actually change the place where updateSelection is called
2013-03-12 06:20:59 +00:00