OSDN Git Service

android-x86/frameworks-base.git
11 years agoAdd logging to track down bug
Robert Greenwalt [Wed, 13 Mar 2013 23:33:14 +0000 (16:33 -0700)]
Add logging to track down bug

bug:8377625
Change-Id: Ifd0c4081a2f1238dbbc39c6904b993e2fb95455a

11 years agoFailing Text-To-Speech CTS tests fix.
Przemyslaw Szczepaniak [Wed, 13 Mar 2013 15:45:28 +0000 (15:45 +0000)]
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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 13 Mar 2013 15:00:19 +0000 (15:00 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Hide VOICE_ASSIST intent DO NOT MERGE" into jb-mr2-dev
Bjorn Bringert [Wed, 13 Mar 2013 13:28:00 +0000 (13:28 +0000)]
Merge "Hide VOICE_ASSIST intent DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Prevent momentary switch of keyguard to landscape" into jb-mr2-dev
Jim Miller [Wed, 13 Mar 2013 02:03:27 +0000 (02:03 +0000)]
Merge "Prevent momentary switch of keyguard to landscape" into jb-mr2-dev

11 years agoPrevent momentary switch of keyguard to landscape
Jim Miller [Wed, 13 Mar 2013 01:45:28 +0000 (18:45 -0700)]
Prevent momentary switch of keyguard to landscape

This fixes a bug where keyguard was created without setting
the preferred orientation.  The result is it would temporarily
assume the orientation of the device after being hidden.

The fix sets the flag when the keyguard view hierarchy is created
rather than when visibility changes.

Fixes bug 8124979

Change-Id: Ic54a185e4f51f79f2bb7fbc5ffc6992641e89132

11 years agoAdd a minimum size for the event pools.
Justin Koh [Wed, 13 Mar 2013 01:03:53 +0000 (18:03 -0700)]
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

11 years agoRemove spurious @Override.
Jaikumar Ganesh [Wed, 13 Mar 2013 00:00:27 +0000 (17:00 -0700)]
Remove spurious @Override.

Change-Id: Idd468be5c05bcdf397c6ba02a902c4ef7719fca8

11 years agoMerge "Fixed 32 bit characteristic value assignment" into jb-mr2-dev
Matthew Xie [Tue, 12 Mar 2013 17:58:03 +0000 (17:58 +0000)]
Merge "Fixed 32 bit characteristic value assignment" into jb-mr2-dev

11 years agoMerge "Remove unused interface IInputConnectionCallback" into jb-mr2-dev
Michael Wright [Tue, 12 Mar 2013 23:09:38 +0000 (23:09 +0000)]
Merge "Remove unused interface IInputConnectionCallback" into jb-mr2-dev

11 years agoMerge "Implement limited shared libraries in apks." into jb-mr2-dev
Dianne Hackborn [Tue, 12 Mar 2013 21:41:16 +0000 (21:41 +0000)]
Merge "Implement limited shared libraries in apks." into jb-mr2-dev

11 years agoMerge "Add new sensor types." into jb-mr2-dev
Shawn Pearce [Tue, 12 Mar 2013 23:01:53 +0000 (23:01 +0000)]
Merge "Add new sensor types." into jb-mr2-dev

11 years agoam 00707306: am 37fc02be: am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates...
kmccormick [Tue, 12 Mar 2013 22:36:59 +0000 (15:36 -0700)]
am 00707306: am 37fc02be: am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.

* commit '00707306e28bbe8aac52dc07154d658a322a4985':
  Doc change: updates to Gestures training class.

11 years agoam 37fc02be: am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures...
kmccormick [Tue, 12 Mar 2013 22:34:26 +0000 (15:34 -0700)]
am 37fc02be: am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.

* commit '37fc02be989e880314c05390eca01398ddee996a':
  Doc change: updates to Gestures training class.

11 years agoam 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
kmccormick [Tue, 12 Mar 2013 22:32:46 +0000 (15:32 -0700)]
am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.

* commit '61f13cd877405f8bb72c2ad33c717ba3f02acf74':
  Doc change: updates to Gestures training class.

11 years agoam ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
kmccormick [Tue, 12 Mar 2013 22:31:14 +0000 (15:31 -0700)]
am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.

* commit 'ae657a05db910936a92340ffe721351d259d434b':
  Doc change: updates to Gestures training class.

11 years agoam e23f97ba: Doc change: updates to Gestures training class.
kmccormick [Tue, 12 Mar 2013 22:29:21 +0000 (15:29 -0700)]
am e23f97ba: Doc change: updates to Gestures training class.

* commit 'e23f97ba6ee5214679fff61e33deda075cfd741d':
  Doc change: updates to Gestures training class.

11 years agoMerge "audio service: fix regression in startBluetoothSco" into jb-mr2-dev
Eric Laurent [Tue, 12 Mar 2013 22:16:02 +0000 (22:16 +0000)]
Merge "audio service: fix regression in startBluetoothSco" into jb-mr2-dev

11 years agoMerge "Add TaskManager API" into jb-mr2-dev
Romain Guy [Tue, 12 Mar 2013 22:07:03 +0000 (22:07 +0000)]
Merge "Add TaskManager API" into jb-mr2-dev

11 years agoDoc change: updates to Gestures training class.
kmccormick [Tue, 12 Mar 2013 21:46:07 +0000 (14:46 -0700)]
Doc change: updates to Gestures training class.

Change-Id: I5328a82736472e4a7507709380875ba0c9ef6f8e

11 years agoMerge "Remove old show/hide messages on new ime (DO NOT MERGE)" into jb-mr2-dev
Shawn Pearce [Tue, 12 Mar 2013 21:58:17 +0000 (21:58 +0000)]
Merge "Remove old show/hide messages on new ime (DO NOT MERGE)" into jb-mr2-dev

11 years agoAdd TaskManager API
Romain Guy [Tue, 12 Mar 2013 03:48:31 +0000 (20:48 -0700)]
Add TaskManager API

This API can be used to run arbitrary tasks on a pool of worker
threads. The number of threads is calculated based on the number
of CPU cores available.

The API is made of 3 classes:

TaskManager
      Creates and manages the worker threads.

Task
      Describes the work to be done and the type of the output.
      A task contains a future used to wait for the worker thread
      to be done computing the result of the task.

TaskProcessor
      The processor dispatches tasks to the TaskManager and is
      responsible for performing the computation required by
      each task. A processor will only be asked to process tasks
      sent to the manager through the processor.

A typical use case:

class MyTask: Task<MyType>

class MyProcessor: TaskProcessor<MyType>

TaskManager m = new TaskManager();
MyProcessor p = new MyProcessor(m);
MyTask t = new MyTask();
p.add(t);

// Waits until the result is available
MyType result = t->getResult();

Change-Id: I1fe845ba4c49bb0e1b0627ab147f9a861c8e0749

11 years agoMerge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev
Lorenzo Colitti [Tue, 12 Mar 2013 22:04:52 +0000 (22:04 +0000)]
Merge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev

11 years agoUnit test routes with interfaces in LinkProperties
Lorenzo Colitti [Sat, 9 Mar 2013 03:11:40 +0000 (19:11 -0800)]
Unit test routes with interfaces in LinkProperties

Change-Id: Ie41a56bc9863ee72f4d7a8f72e436fc57e57b1af

11 years agoRemove old show/hide messages on new ime (DO NOT MERGE)
Craig Mautner [Tue, 12 Mar 2013 21:12:39 +0000 (14:12 -0700)]
Remove old show/hide messages on new ime (DO NOT MERGE)

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: Iee60dbd1d58542f73aedeac5ccb54cddeb5d5dfe

11 years agoaudio service: fix regression in startBluetoothSco
Eric Laurent [Tue, 12 Mar 2013 01:52:57 +0000 (18:52 -0700)]
audio service: fix regression in startBluetoothSco

Commit 2a57ca93 introduced a regression in startBluetoothSco()
where the calling pid was cleared before creating the entry for
the client app. The pid in the entry was always the system server pid
and the SCO client verification logic was broken preventing the activation
of the BT SCO connection.

Change-Id: I4e024b22fceb350f829ff0d8664703faeef7af48

11 years agoam bd5ee4d3: am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"
John Reck [Tue, 12 Mar 2013 21:34:29 +0000 (14:34 -0700)]
am bd5ee4d3: am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"

* commit 'bd5ee4d39c8d7d1fc2c1f94980875f1900880880':
  Fix NPE when pasting non-text from Clipboard

11 years agoam 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"
John Reck [Tue, 12 Mar 2013 21:29:48 +0000 (14:29 -0700)]
am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"

* commit '733329a2745ce703029b40afaa5dd78c7a5b620c':
  Fix NPE when pasting non-text from Clipboard

11 years agoam f3e3a7fd: am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to Priva...
Kenny Root [Tue, 12 Mar 2013 20:27:13 +0000 (13:27 -0700)]
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.

11 years agoam 39099fee: am 1bc1699c: Merge ""[+>" more icon was never shown in PhoneStatusBar"
Daniel Sandler [Tue, 12 Mar 2013 20:27:10 +0000 (13:27 -0700)]
am 39099fee: am 1bc1699c: Merge ""[+>" more icon was never shown in PhoneStatusBar"

* commit '39099feeece6d76b0c68727506609331e7a6b64c':
  "[+>" more icon was never shown in PhoneStatusBar

11 years agoam 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."
Kenny Root [Tue, 12 Mar 2013 20:25:35 +0000 (13:25 -0700)]
am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."

* commit '7ad514094c8abbea0cc61b72fcaf0e23d6124b0d':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.

11 years agoam 1bc1699c: Merge ""[+>" more icon was never shown in PhoneStatusBar"
Daniel Sandler [Tue, 12 Mar 2013 20:25:32 +0000 (13:25 -0700)]
am 1bc1699c: Merge ""[+>" more icon was never shown in PhoneStatusBar"

* commit '1bc1699c313a07693826a8d8b451a2ed72137957':
  "[+>" more icon was never shown in PhoneStatusBar

11 years agoMerge "Fix NPE when pasting non-text from Clipboard"
John Reck [Tue, 12 Mar 2013 20:24:13 +0000 (20:24 +0000)]
Merge "Fix NPE when pasting non-text from Clipboard"

11 years agoMerge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."
Kenny Root [Tue, 12 Mar 2013 20:05:09 +0000 (20:05 +0000)]
Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."

11 years agoImplement limited shared libraries in apks.
Dianne Hackborn [Tue, 12 Mar 2013 00:48:43 +0000 (17:48 -0700)]
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

11 years agoMerge ""[+>" more icon was never shown in PhoneStatusBar"
Daniel Sandler [Tue, 12 Mar 2013 19:51:32 +0000 (19:51 +0000)]
Merge ""[+>" more icon was never shown in PhoneStatusBar"

11 years ago"[+>" more icon was never shown in PhoneStatusBar
Mats H Carlsson [Wed, 10 Oct 2012 11:37:38 +0000 (13:37 +0200)]
"[+>" more icon was never shown in PhoneStatusBar

"[+>" more icon was never show in status bar because
the member variable for this icon was not initialized
from resources. This fix enables "[+>" icon to appear
in status bar when the number of indications in status
bar becomes large.

Bug: 8368569
Change-Id: Ieb3412eed831052d69c0cf63c9b4230c38171e4a

11 years agoHide VOICE_ASSIST intent DO NOT MERGE
Bjorn Bringert [Tue, 12 Mar 2013 19:35:57 +0000 (19:35 +0000)]
Hide VOICE_ASSIST intent DO NOT MERGE

Bug: 8289964
Change-Id: I49874f379647ff4e85402a298b4181923212a0aa

11 years agoRemove unused interface IInputConnectionCallback
Michael Wright [Tue, 12 Mar 2013 02:57:10 +0000 (19:57 -0700)]
Remove unused interface IInputConnectionCallback

Bug: 8276952
Change-Id: I3755df557388bee55f0cc4780adc300672cbe9a1

11 years agoFixed 32 bit characteristic value assignment
Andre Eisenbach [Sat, 9 Mar 2013 02:42:24 +0000 (18:42 -0800)]
Fixed 32 bit characteristic value assignment

Also fixed link in comment.

Change-Id: I27223b8aadae2fc7c8037abc6396760e23f6f161

11 years agoAdd new sensor types.
Jaikumar Ganesh [Wed, 13 Feb 2013 00:31:32 +0000 (16:31 -0800)]
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

11 years agoSwitch TLS Channel ID API from ECPrivateKey to PrivateKey.
Alex Klyubin [Tue, 12 Mar 2013 17:30:59 +0000 (10:30 -0700)]
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

11 years agoam 22bcc39b: am 5c748fa5: am 5cb405bc: am 679fe25b: am a15afd2b: resolve a few doc...
Scott Main [Tue, 12 Mar 2013 17:15:40 +0000 (10:15 -0700)]
am 22bcc39b: am 5c748fa5: am 5cb405bc: am 679fe25b: am a15afd2b: resolve a few doc issues from external reports

* commit '22bcc39be8e7f7ef2b6b40714ae956fbaa5ff5b0':
  resolve a few doc issues from external reports

11 years agoam 5c748fa5: am 5cb405bc: am 679fe25b: am a15afd2b: resolve a few doc issues from...
Scott Main [Tue, 12 Mar 2013 17:12:25 +0000 (10:12 -0700)]
am 5c748fa5: am 5cb405bc: am 679fe25b: am a15afd2b: resolve a few doc issues from external reports

* commit '5c748fa5fca06922279d17496ff61d16d3ba3c04':
  resolve a few doc issues from external reports

11 years agoam 5cb405bc: am 679fe25b: am a15afd2b: resolve a few doc issues from external reports
Scott Main [Tue, 12 Mar 2013 17:09:35 +0000 (10:09 -0700)]
am 5cb405bc: am 679fe25b: am a15afd2b: resolve a few doc issues from external reports

* commit '5cb405bcc71fb741f0feb70c71d6ae1fc5e810df':
  resolve a few doc issues from external reports

11 years agoam 679fe25b: am a15afd2b: resolve a few doc issues from external reports
Scott Main [Tue, 12 Mar 2013 17:07:36 +0000 (10:07 -0700)]
am 679fe25b: am a15afd2b: resolve a few doc issues from external reports

* commit '679fe25b416f9e558922ea4f1eaa68e0ad0c81f6':
  resolve a few doc issues from external reports

11 years agoam a15afd2b: resolve a few doc issues from external reports
Scott Main [Tue, 12 Mar 2013 17:06:03 +0000 (10:06 -0700)]
am a15afd2b: resolve a few doc issues from external reports

* commit 'a15afd2bc4b103146497b521c09c73722a8e3725':
  resolve a few doc issues from external reports

11 years agoMerge "Keyguard remote control display artwork size" into jb-mr2-dev
Jean-Michel Trivi [Tue, 12 Mar 2013 16:42:48 +0000 (16:42 +0000)]
Merge "Keyguard remote control display artwork size" into jb-mr2-dev

11 years agoMerge "Support multiple IRemoteControlDisplay" into jb-mr2-dev
Jean-Michel Trivi [Tue, 12 Mar 2013 16:40:22 +0000 (16:40 +0000)]
Merge "Support multiple IRemoteControlDisplay" into jb-mr2-dev

11 years agoresolve a few doc issues from external reports
Scott Main [Tue, 12 Mar 2013 16:25:22 +0000 (09:25 -0700)]
resolve a few doc issues from external reports

Change-Id: Ic4ca327bf2ac92ed259fbd3c51fe5a4453afb479

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 12 Mar 2013 16:11:05 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ice2858fac7d254735d28f22bc1df95e684deefe8
Auto-generated-cl: translation import

11 years agoMerge "Accumulate updates to notifications before archiving." into jb-mr2-dev
Daniel Sandler [Tue, 12 Mar 2013 15:53:44 +0000 (15:53 +0000)]
Merge "Accumulate updates to notifications before archiving." into jb-mr2-dev

11 years agoFix NPE when pasting non-text from Clipboard
Nils Holmström [Tue, 8 Jan 2013 14:42:01 +0000 (15:42 +0100)]
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

11 years agoMerge "Update RSTest_v14 for stride changes." into jb-mr2-dev
Stephen Hines [Tue, 12 Mar 2013 03:27:42 +0000 (03:27 +0000)]
Merge "Update RSTest_v14 for stride changes." into jb-mr2-dev

11 years agoMerge "Precache paths from a worker thread" into jb-mr2-dev
Romain Guy [Tue, 12 Mar 2013 01:43:20 +0000 (01:43 +0000)]
Merge "Precache paths from a worker thread" into jb-mr2-dev

11 years agoMerge changes I674b9804,If2d2e37b into jb-mr2-dev
Michael Wright [Tue, 12 Mar 2013 01:03:23 +0000 (01:03 +0000)]
Merge changes I674b9804,If2d2e37b into jb-mr2-dev

* changes:
  Add touch navigation input source
  Add InputDevice#isFromSource convenience method

11 years agoAdd touch navigation input source
Michael Wright [Fri, 8 Mar 2013 23:19:19 +0000 (15:19 -0800)]
Add touch navigation input source

Bug: 8276741
Change-Id: I674b9804bf9ae76d694ae7073b54a7d43474a43c

11 years agoMerge "Remove redundant parameter to modifyRoute" into jb-mr2-dev
Lorenzo Colitti [Tue, 12 Mar 2013 00:06:41 +0000 (00:06 +0000)]
Merge "Remove redundant parameter to modifyRoute" into jb-mr2-dev

11 years agoPrecache paths from a worker thread
Romain Guy [Sat, 9 Mar 2013 01:44:20 +0000 (17:44 -0800)]
Precache paths from a worker thread

Change-Id: I3e7b53d67e0e03e403beaf55c39350ead7f1e309

11 years agoam 49c6ff0a: am a9cac9aa: am e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import...
quddusc [Mon, 11 Mar 2013 23:10:28 +0000 (16:10 -0700)]
am 49c6ff0a: am a9cac9aa: am e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745

* commit '49c6ff0a037065563e2a3e1c9146c5b86eb1d3f0':
  docs: Fixed import statements for licensing docs. Bug: 8360745

11 years agoam a9cac9aa: am e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import statements...
quddusc [Mon, 11 Mar 2013 23:07:56 +0000 (16:07 -0700)]
am a9cac9aa: am e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745

* commit 'a9cac9aa4322a2969c9614aa01f63c13e5f0189e':
  docs: Fixed import statements for licensing docs. Bug: 8360745

11 years agoam e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing...
quddusc [Mon, 11 Mar 2013 23:05:18 +0000 (16:05 -0700)]
am e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745

* commit 'e1c2a62a75fa0e4c899e66220b2b20f4b41ac19c':
  docs: Fixed import statements for licensing docs. Bug: 8360745

11 years agoam 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug:...
quddusc [Mon, 11 Mar 2013 23:03:03 +0000 (16:03 -0700)]
am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745

* commit '1267cfc38dcabfe9cdfa7388c7b0b306926e06cc':
  docs: Fixed import statements for licensing docs. Bug: 8360745

11 years agoAdd InputDevice#isFromSource convenience method
Michael Wright [Fri, 8 Mar 2013 22:58:14 +0000 (14:58 -0800)]
Add InputDevice#isFromSource convenience method

Change-Id: If2d2e37bc3fff5a862ea3652c7ef9778018e7ecc

11 years agoam 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745
quddusc [Mon, 11 Mar 2013 23:01:28 +0000 (16:01 -0700)]
am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745

* commit '616908fee48c44a2115d5d63583ccf04e401b3da':
  docs: Fixed import statements for licensing docs. Bug: 8360745

11 years agoMerge "Remove unnecessary userid check" into jb-mr2-dev
Jim Miller [Mon, 11 Mar 2013 22:58:33 +0000 (22:58 +0000)]
Merge "Remove unnecessary userid check" into jb-mr2-dev

11 years agoMerge "audio service: fix BT SCO intent permission" into jb-mr2-dev
Eric Laurent [Mon, 11 Mar 2013 22:40:47 +0000 (22:40 +0000)]
Merge "audio service: fix BT SCO intent permission" into jb-mr2-dev

11 years agoRemove redundant parameter to modifyRoute
Lorenzo Colitti [Mon, 11 Mar 2013 22:39:59 +0000 (07:39 +0900)]
Remove redundant parameter to modifyRoute

modifyRoute takes both an interface name and a LinkProperties.
This is redundant because all callers get the interface name
from the LinkProperties. Make modifyRoute get the interface
name from the LinkProperties instead.

Change-Id: I41ba8e0a10241c2f1107204fcaca2be74556042b

11 years agodocs: Fixed import statements for licensing docs.
quddusc [Mon, 11 Mar 2013 22:36:03 +0000 (15:36 -0700)]
docs: Fixed import statements for licensing docs.
Bug: 8360745

Change-Id: Ic72adc7c571c8a36d784afd997418307fb7b2a9f

11 years agoam a45bafc2: am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for...
Elliott Hughes [Mon, 11 Mar 2013 22:35:36 +0000 (15:35 -0700)]
am a45bafc2: am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time."

* commit 'a45bafc2f025d2ef513f3e3dcac162ba6a95d575':
  Fix DateFormat k and h, and implement K and H for the first time.

11 years agoam c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time."
Elliott Hughes [Mon, 11 Mar 2013 22:27:52 +0000 (15:27 -0700)]
am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time."

* commit 'c9e0cd2ac7b1df3e60f0ca8bab6a7240bade07d9':
  Fix DateFormat k and h, and implement K and H for the first time.

11 years agoMerge "Fix DateFormat k and h, and implement K and H for the first time."
Elliott Hughes [Mon, 11 Mar 2013 22:03:18 +0000 (22:03 +0000)]
Merge "Fix DateFormat k and h, and implement K and H for the first time."

11 years agoFix DateFormat k and h, and implement K and H for the first time.
Elliott Hughes [Mon, 11 Mar 2013 21:49:44 +0000 (14:49 -0700)]
Fix DateFormat k and h, and implement K and H for the first time.

Bug: 8359981
Change-Id: I52ef937a77e9e28f2719c2ee6f59e4b74514f0b2

11 years agoMerge "Java API for MediaMuxer" into jb-mr2-dev
ztenghui [Mon, 11 Mar 2013 21:45:19 +0000 (21:45 +0000)]
Merge "Java API for MediaMuxer" into jb-mr2-dev

11 years agoam 7c1e8dbd: am 21d3f294: Merge "use Calendar in DateUtils format method"
Elliott Hughes [Mon, 11 Mar 2013 21:21:17 +0000 (14:21 -0700)]
am 7c1e8dbd: am 21d3f294: Merge "use Calendar in DateUtils format method"

* commit '7c1e8dbd3159c88df27d24aa2699358ee139d49b':
  use Calendar in DateUtils format method

11 years agoam 21d3f294: Merge "use Calendar in DateUtils format method"
Elliott Hughes [Mon, 11 Mar 2013 21:19:14 +0000 (14:19 -0700)]
am 21d3f294: Merge "use Calendar in DateUtils format method"

* commit '21d3f294831f7a15c5e746b3dae3e6ec0de883a8':
  use Calendar in DateUtils format method

11 years agoRemove unnecessary userid check
Jim Miller [Mon, 11 Mar 2013 20:54:38 +0000 (13:54 -0700)]
Remove unnecessary userid check

This removes code used to verify the userid's were consistent, which
is no longer needed.

Fixes bug 8167800

Change-Id: I592e4bc1158fb7775bd31ae8a26c1782b60f0fa0

11 years agoMerge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev
Jeff Sharkey [Mon, 11 Mar 2013 20:25:47 +0000 (20:25 +0000)]
Merge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev

11 years agoHandle corrupt RegisteredServicesCache XML.
Jeff Sharkey [Mon, 11 Mar 2013 20:22:16 +0000 (13:22 -0700)]
Handle corrupt RegisteredServicesCache XML.

Avoid getting stuck in infinite loop.

Bug: 8360183
Change-Id: I81728dcfbc35b456c9166cf5c5175d0a376df56f

11 years agoMerge "use Calendar in DateUtils format method"
Elliott Hughes [Mon, 11 Mar 2013 20:11:20 +0000 (20:11 +0000)]
Merge "use Calendar in DateUtils format method"

11 years agoMerge "Unbreak documentation build." into jb-mr2-dev
Lorenzo Colitti [Mon, 11 Mar 2013 19:33:31 +0000 (19:33 +0000)]
Merge "Unbreak documentation build." into jb-mr2-dev

11 years agoJava API for MediaMuxer
ztenghui [Wed, 13 Feb 2013 22:07:02 +0000 (14:07 -0800)]
Java API for MediaMuxer

Implement the Java API for MediaMuxer.

bug:7991013

Change-Id: Ibf3aa256cc1d89f1c7636b74c9fb53073d173636

11 years agoUnbreak documentation build.
Lorenzo Colitti [Mon, 11 Mar 2013 19:30:47 +0000 (04:30 +0900)]
Unbreak documentation build.

Change-Id: I1e904b111e23d221dcb5f917201d4c27f0c1c05b

11 years agoam 31bb1dec: am 5b543775: Merge "update preloaded-classes"
Elliott Hughes [Mon, 11 Mar 2013 18:29:26 +0000 (11:29 -0700)]
am 31bb1dec: am 5b543775: Merge "update preloaded-classes"

* commit '31bb1dec27c1f8e5c96e52d0a7655a231412376f':
  update preloaded-classes

11 years agouse Calendar in DateUtils format method
Sungmin Choi [Thu, 28 Feb 2013 11:17:15 +0000 (20:17 +0900)]
use Calendar in DateUtils format method

The DatePickerDialog is using DateUtils to format the dialog's title
and the DateUtils class does not work with dates outside to the
specified range.
For example, if user selects 2038-03-07, DatePickerDialog shows
1902-01-30 on Title.
The reason for the DateUtils class not being able to format dates
outside the range of 1902 and 2036 is because internally it is using
the Time class which does not support such dates.
To fix it, use Calendar class in DataUilts format method.

Steps to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time
3. Set Date
4. choose any date before 1902 or after 2037
5. update wrong date on Title

Bug: https://code.google.com/p/android/issues/detail?id=13050
Change-Id: I003266765751b5c340426af84daef271f39f771e

11 years agoMerge "Fix reconnect/reassociate handling" into jb-mr2-dev
Irfan Sheriff [Mon, 11 Mar 2013 18:19:32 +0000 (18:19 +0000)]
Merge "Fix reconnect/reassociate handling" into jb-mr2-dev

11 years agoam 5b543775: Merge "update preloaded-classes"
Elliott Hughes [Mon, 11 Mar 2013 17:32:08 +0000 (10:32 -0700)]
am 5b543775: Merge "update preloaded-classes"

* commit '5b5437752fb2318142a41b6320b00a000575503f':
  update preloaded-classes

11 years agoMerge "Always specify an interface for host routes." into jb-mr2-dev
Lorenzo Colitti [Mon, 11 Mar 2013 17:22:25 +0000 (17:22 +0000)]
Merge "Always specify an interface for host routes." into jb-mr2-dev

11 years agoMerge "RouteInfo changes." into jb-mr2-dev
Lorenzo Colitti [Mon, 11 Mar 2013 17:18:59 +0000 (17:18 +0000)]
Merge "RouteInfo changes." into jb-mr2-dev

11 years agoMerge "update preloaded-classes"
Elliott Hughes [Mon, 11 Mar 2013 16:59:49 +0000 (16:59 +0000)]
Merge "update preloaded-classes"

11 years agoupdate preloaded-classes
Sungmin Choi [Sat, 9 Mar 2013 06:19:47 +0000 (15:19 +0900)]
update preloaded-classes

Remove some preloaded-classes and fix typo for deleting log messages
as the followings during booting.

W/Zygote  (  163): Class not found for preloading: android.bluetooth.
BluetoothAudioGateway
W/Zygote  (  163): Class not found for preloading: android.bluetooth.
HeadsetBase
W/Zygote  (  163): Class not found for preloading: undroid.content.Ab
stractThreadedSyncAdapter$SyncThread

Change-Id: Id02e0cccaeb150f48e12d67b2d691df828842e4c

11 years agoMerge "Add additional message methods." into jb-mr2-dev
Wink Saville [Mon, 11 Mar 2013 16:46:05 +0000 (16:46 +0000)]
Merge "Add additional message methods." into jb-mr2-dev

11 years agoAdd additional message methods.
Wink Saville [Wed, 6 Mar 2013 21:41:23 +0000 (13:41 -0800)]
Add additional message methods.

Change-Id: Iac96815f7b72bcb3b9c658a24c24e0733e0ea1b0

11 years agoMerge "Add a delimiter between scheme and host" into jb-mr2-dev
Selim Gurun [Mon, 11 Mar 2013 16:25:38 +0000 (16:25 +0000)]
Merge "Add a delimiter between scheme and host" into jb-mr2-dev

11 years agoFix reconnect/reassociate handling
Irfan Sheriff [Mon, 11 Mar 2013 15:46:06 +0000 (08:46 -0700)]
Fix reconnect/reassociate handling

We are dropping incorrectly when in disconnected state

Bug: 8357624
Change-Id: I8919dcd679da6b5fc6c7f671e243f08e42b91ff3

11 years agoMerge "Updating search asset for action bar" into jb-mr2-dev
Michael Jurka [Mon, 11 Mar 2013 11:04:44 +0000 (11:04 +0000)]
Merge "Updating search asset for action bar" into jb-mr2-dev

11 years agoMerge "Handle onPause in ImageProcessing." into jb-mr2-dev
Jason Sams [Sat, 9 Mar 2013 01:09:12 +0000 (01:09 +0000)]
Merge "Handle onPause in ImageProcessing." into jb-mr2-dev

11 years agoAlways specify an interface for host routes.
Lorenzo Colitti [Fri, 8 Mar 2013 20:30:44 +0000 (12:30 -0800)]
Always specify an interface for host routes.

Change-Id: I05b4d87e7d7e8237c6f4a70f1fedae00f416f581

11 years agoRouteInfo changes.
Lorenzo Colitti [Fri, 8 Mar 2013 19:30:39 +0000 (11:30 -0800)]
RouteInfo changes.

- Add the interface name.
- Fix a bug where a default route would match an address of
  another protocol (e.g., 0.0.0.0/0 would match 2001::).
- Tweak the hashCode method.
- Write a unit test.

Change-Id: Ida8266de440a9b1d9eaa132f182b9f1ce8978c44

11 years agoHandle onPause in ImageProcessing.
Jason Sams [Sat, 9 Mar 2013 00:35:29 +0000 (16:35 -0800)]
Handle onPause in ImageProcessing.

Change-Id: I538ce0ac7b9da2f4ec6cd7bd35aa84fd710e063f