184041 Commits

Author SHA1 Message Date
Mike Lockwood
f2cd802402 MidiDeviceInfo meta-data improvements:
Add property for user visible device name
Add names for input and output ports
Rename "model" to "product" to match USB specification.

Change-Id: I8dc50da935f26825ffc73de456d34e7933aa987c
2015-03-12 12:05:47 -07:00
Jason Monk
78981e0393 Merge "Make QS use SettingsLib's BT code" 2015-03-12 14:23:51 +00:00
Leon Scroggins III
af66416e4b Merge "Make Bitmap_createFromParcel check the color count." 2015-03-12 12:24:11 +00:00
Clara Bayarri
f84a9724f1 Move the "Replace" popup option to the Text Selection ActionMode.
As a first step in unifying the cut/copy/paste ActionMode in Editor
with the paste/replace popup, I'm moving the replace option to
the CAB ActionMode. Paste is already there, so for now all options
are together.

Missing things to address in upcoming CLs:
- Invoke the ActionMode in all cases where the popup shows up now,
ensuring only the options that are currently available show up.
- Get rid of the current popup
- Make the ActionMode a floating toolbar (pending feature completion)
- Define a keyboard shortcut for replace?

Note that since the ActionMode still shows up in the ActionBar and
replace has no icon it now appears as text and takes up lots of
space. This will improve when we can switch to using a floating
toolbar.

Change-Id: Ib6b60bae9b58e4db96b9c4cee556e19d3f1bb466
2015-03-12 10:31:11 +00:00
Jim Miller
216ce5d7b2 Merge "Add rename support to FingerprintManager" 2015-03-12 01:20:05 +00:00
Jim Miller
99d6019bea Add rename support to FingerprintManager
Bug 19592835

Change-Id: I656b3932caf2cfdb9a330522d171a59af2c7a2d1
2015-03-11 18:17:55 -07:00
Greg Hackmann
d5e97f93f0 Fix 64-bit MessageQueue JNI build
Change-Id: I75b3788e7dcece4a2d64d969a10d28e7a9593cd6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-11 16:54:37 -07:00
Christopher Tate
871e96ab8b Merge "Don't run full backups on stopped packages" 2015-03-11 23:36:49 +00:00
Christopher Tate
b538d3c06f Don't run full backups on stopped packages
We already decline to run key/value backup passes for (participating)
apps that are in the 'stopped' state.  Now we also properly avoid
full-data backup passes on such apps.

Bug 19684052

Change-Id: Ieafc07b5531a91a243d57238c53db41ad3459140
2015-03-11 16:35:12 -07:00
Craig Mautner
9c1353ee6c am 20553036: am 68694780: Merge "[ActivityManager] Fix index OOB when resetting removed task"
* commit '20553036af92a6369b3e53f54a1f4f0ccaf8e981':
  [ActivityManager] Fix index OOB when resetting removed task
2015-03-11 23:02:44 +00:00
Jeff Brown
a34a3bdcbf Update ParcelFileDescriptor to use non-blocking I/O.
Avoids spinning up a thread just to watch a file descriptor.

Bug: 10349083
Change-Id: I814cb252f075d7a162e1286bbfd1dbec28d17796
2015-03-11 15:37:21 -07:00
Jeff Brown
dc3eb4bf91 Add support for non-blocking I/O with Looper.
Bug: 10349083
Change-Id: I4a94b1eac53df57c05103913bd593d92b1e062d7
2015-03-11 15:00:35 -07:00
Jeff Brown
803c2affcb Expose some useful methods on Looper and clean up docs.
Change-Id: I40796c3ba07d3c50043da56e835f11fbf9852d30
2015-03-11 15:00:35 -07:00
Jeff Brown
3d4e7efe37 Move sync barrier methods into MessageQueue.
The methods were previously defined on Looper but on reflection
they actually make more sense on the MessageQueue instead since
the Looper class is primarily concerned with thread lifecycle
rather than the actual messages themselves.

Change-Id: Iff356b94754fc9960774fa17e3eec9604229cba6
2015-03-11 15:00:34 -07:00
Jeff Brown
6c7b41adf9 Rename Looper::isIdling() to isPolling() to resolve confusion.
The loop isn't technically idle at this time, it's just checking
whether any file descriptors have pending events.  However it's
still a good signal as to whether the loop is alive.

Added a real isIdle() function.

Bug: 19532373
Change-Id: Idd273e8774f469ccafb00d560818cf279dfd6ba6
2015-03-11 15:00:34 -07:00
Raph Levien
044644c717 Merge "Fix XML parsing crash in SettingsProvider" 2015-03-11 21:50:02 +00:00
Raph Levien
174fa280d1 Fix XML parsing crash in SettingsProvider
A previous change added more whitespace to settings_global.xml to
improve human readability, but the parser is overly picky in ignoring
whitespace. This patch makes it accept all whitespace strings.

Bug: 19696812
Change-Id: I3ebb8f6df2e25f4e6b6841da743be3f3a91e2442
2015-03-11 14:37:45 -07:00
Alan Viverette
cd3c33e6bc Merge "Fix dialog overlay theme background color, add theme attr" 2015-03-11 21:24:46 +00:00
Alan Viverette
c0653dad13 Fix dialog overlay theme background color, add theme attr
Bug: 19524852
Change-Id: Id3188d5c0ac9ef985bb17831c46a8aff20f89bc1
2015-03-11 14:21:14 -07:00
Alan Viverette
1130363f18 Merge "Various fixes for popup monkey testing" 2015-03-11 21:04:28 +00:00
Chet Haase
31f2b619fb Merge "Fix artifacts in clip reveal animations" 2015-03-11 20:57:31 +00:00
Shawn Willden
0314fa2840 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-03-11 20:10:03 +00:00
Roozbeh Pournader
6c2f4484e3 Merge "Add a check for invalid spans being set by SpellChecker." 2015-03-11 20:09:38 +00:00
Dimitry Ivanov
b8d342da4e am 3b9cfe30: am a6ed1b95: am 6e116429: Merge "Generate gnu hash for arm only"
* commit '3b9cfe30ed4ae34d06a8f005c8ada593c314316b':
  Generate gnu hash for arm only
2015-03-11 20:09:17 +00:00
Mark Renouf
41cd70e364 am 91239a0b: am cc2212d2: Merge "Adds system property for developer option for force-enable burn-in protection" into lmp-mr1-modular-dev
* commit '91239a0b738a503ab0f4ed4111e1b5f81d927e38':
  Adds system property for developer option for force-enable burn-in protection
2015-03-11 20:09:08 +00:00
Mike Lockwood
57baee2e12 Merge "MidiManager: Add MIDI device status notifications" 2015-03-11 19:43:49 +00:00
Mike Lockwood
70bea13774 Merge "MidiDevice: Add support for making direct connections between ports" 2015-03-11 19:43:31 +00:00
John Reck
5fcf44b10e Merge "Cleanups & simplifications" 2015-03-11 19:42:29 +00:00
Alan Viverette
8fd949e680 Various fixes for popup monkey testing
Ensures PopupMenu works correctly when multiple calls are made to show
and dismiss. Ensure PopupWindow works correctly when multiple calls are
made to showAsDropDown and dismiss (fixes multiple clicks on Spinner).

Bug: 19672907
Bug: 19671831
Change-Id: Ib92accd8fd70a1ff1f8cda27155347b007a4d25b
2015-03-11 12:21:30 -07:00
Mark Renouf
c12569110d resolved conflicts for merge of 91239a0b to master
Change-Id: Ib30f0631278602f0363181021f1ad364e4ec2f8d
2015-03-11 14:52:47 -04:00
Raph Levien
60cd30d99e Merge "Fix android.text.cts.StaticLayoutTest#testGetEllipsisCount" 2015-03-11 18:33:59 +00:00
John Reck
b36016c65f Cleanups & simplifications
Change-Id: I5ad5e3b8fe55b1528f2e20c63e5abe51d9e40ff1
2015-03-11 11:29:13 -07:00
Roozbeh Pournader
4cdeeadd42 Add a check for invalid spans being set by SpellChecker.
One of the exit conditions of the loop immediately above the code is
when a BreakIterator finishes its input and emits BreakIterator.DONE,
which we were then mistakenly then using as a parameter for setting
spans.

Bug: 12936072
Bug: 5555929
Change-Id: Ib4aba113f2e7838cd040076160c1dd0fb90adb1a
2015-03-11 11:09:34 -07:00
Raph Levien
ce4155a204 Fix android.text.cts.StaticLayoutTest#testGetEllipsisCount
The "moreChars" predicate (which is used in ellipsis computation) was
slightly incorrect, sometimes being computed as false when the line
break is at the end of a paragraph but not the end of the buffer.
This patch makes the behavior consistent with shipping versions.

Bug: 19676414
Change-Id: I72e16794e895c2eb765b21feaf59fcdccc4857f1
2015-03-11 11:02:33 -07:00
Leon Scroggins III
ec419e0b73 Make Bitmap_createFromParcel check the color count.
When reading from the parcel, if the number of colors is invalid, early
exit.

Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.

Also use an auto-deleter to handle deletion of the SkBitmap.

BUG=19666945

Change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6
2015-03-11 17:34:51 +00:00
Selim Gurun
78568bfa1f Merge "Implement PostMessage API for Webview" 2015-03-11 17:32:35 +00:00
Selim Gurun
4c8093afe3 Implement PostMessage API for Webview
Bug: 10237116

This CL implements the postmessage API for webview. It provides
a way for java applications to post messages to JS frames and
establish message channels, and then do full-duplex communication
after that.

Change-Id: Idbc2918552a4c9fd28ae1ddf19bd360e71f8a4a2
2015-03-11 10:21:59 -07:00
Mike Lockwood
5ff9e2a171 MidiManager: Add MIDI device status notifications
MidiManager clients can be notified of device status changes via a new MidiDeviceStatus object.
MidiDeviceStatus contains the busy status of the device's input ports and number of
connections to the output ports.
MidiDeviceService now has an optional callback for receiving notifications when its ports change as well.

Change-Id: I1600df4464d82724bc026c27b9633ae9c412d3f0
2015-03-11 10:19:45 -07:00
Mike Lockwood
46326e59a0 MidiDevice: Add support for making direct connections between ports
The output port of one device can be connected to the input port of another
device using the new MidiDevice.connectPorts() method.
This allows an application to direct the output of one device directly
to the input port of another without having to copy data from one to another.

Change-Id: I4d361c4e0950b9b9516b0c2f0c158677b1aca208
2015-03-11 10:19:37 -07:00
Geoff Mendal
4771577a34 Import translations. DO NOT MERGE
Change-Id: I217bbbfd12e4a19163c37fb7035f61628a67423d
Auto-generated-cl: translation import
2015-03-11 07:33:53 -07:00
Craig Mautner
20553036af am 68694780: Merge "[ActivityManager] Fix index OOB when resetting removed task"
* commit '686947801e7c35eb60bf25385f46e45db66bee69':
  [ActivityManager] Fix index OOB when resetting removed task
2015-03-11 13:59:04 +00:00
Craig Mautner
686947801e Merge "[ActivityManager] Fix index OOB when resetting removed task" 2015-03-11 13:46:38 +00:00
Mike Lockwood
22e78c65be Merge "Add MidiReceiver.send() and MidiReceiver.getMaxMessageSize()" 2015-03-11 10:55:43 +00:00
Mike Lockwood
0c7342f015 Add MidiReceiver.send() and MidiReceiver.getMaxMessageSize()
Change-Id: I10d4f5e2400fcaf41f455e56ca25bbc0c781a042
2015-03-11 03:51:38 -07:00
Alan Treadway
38bcb8c9ab Merge "Fix for managed-profile users needing to "install" packages twice." 2015-03-11 09:42:54 +00:00
riddle_hsu
1d7919a7eb [ActivityManager] Fix index OOB when resetting removed task
Assume task T has an activity X lives in process P.
When P is died and before death recipient being called,
start activity with flag RESET_TASK_IF_NEEDED to bring the
existed task T.

Then scheduleResumeActivity IPC will fail and trigger start
a new process that removes task T.

That results resetTaskIfNeededLocked cannot find the task
when continuing the start flow.

Detail:
https://code.google.com/p/android/issues/detail?id=159558

Change-Id: Icc400c7a6c481a3f78657e9fb83cf0c3a17dde68
2015-03-11 17:09:50 +08:00
Tor Norbye
4998467ce1 Merge "Fix @ColorInt javadoc" 2015-03-11 03:43:13 +00:00
Guang Zhu
11cce7989b Fix build
Change-Id: I530793e9090d780a5cb2581ee185badc51e14902
2015-03-10 19:15:23 -07:00
Tor Norbye
5b00941a6f Fix @ColorInt javadoc
Change-Id: Icea3a3b4013b4a6b5f9809eec082ea93bc26b079
2015-03-10 19:14:03 -07:00
Vishwath Mohan
4e9e0047a2 Merge "Prevent integer overflow in ResourceTypes" 2015-03-11 00:41:38 +00:00