103197 Commits

Author SHA1 Message Date
Matthew Xie
b2df0b60d0 Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev 2013-04-18 20:59:43 +00:00
Adam Powell
2eeb419e55 Fix ActionBar#setHomeActionContentDescription(0)
This call should be analogous to calling
setHomeActionContentDescription(null) and not throw an exception.

Bug 8657256

Change-Id: Ifa9c7b999f4bf1a31fba43f869e234b1f1861512
2013-04-18 13:56:22 -07:00
Adam Cohen
128f276323 Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)
Change-Id: I4acf02dad6bd8347727ca4322d19e15b130a6621
2013-04-18 13:55:25 -07:00
Chris Craik
d3f9ffe28d Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev 2013-04-18 20:43:25 +00:00
Chris Craik
ee5b2c6de7 Prevent transformed ops from merging in the first place
bug:8649215

Previously we prevented ops with non-translate transforms from
merging, but missed the case of the first op in a merging batch
containing a non-translate transform.

This fulfills the assumption of drawText's non-immediate mode that
merged ops will have pure translate transforms.

Change-Id: I6f6db341aff3f7e84e74b4c3ccf970d585a2db1a
2013-04-18 12:57:07 -07:00
Robert Greenwalt
5d1a182a8a Merge "Secure broadcasts." into jb-mr2-dev 2013-04-18 18:45:53 +00:00
Geremy Condra
b7787a317f DO NOT MERGE Merge commit '8225df00' into bp
Add a delimiter between scheme and host

Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47
2013-04-18 11:40:09 -07:00
Svetoslav Ganov
467a052e15 Magnification does not work if no enabled accessibility services.
This is a regression in which the input filter of the accessibility
manager service is not set if magnification is enabled but accessibility
is not - i.e. no accessibility serivces are enabled. Fixed the logic to
install the input filter if magnification is on but services are not
enabled in addition to services being enabled.

bug:8652765

Change-Id: Ia73e1064035f95ba0f246f4cabcc42d58c12a11f
2013-04-18 10:42:30 -07:00
Robert Greenwalt
68b13ba12f Secure broadcasts.
Prevents 3rd party spoofing.

bug:7622253
Change-Id: I1e1a9887afe009d060205e349c31e3aefba2ea5b
2013-04-18 10:34:13 -07:00
Wink Saville
7f6fc12997 Merge "Add CellInfoWcdma and related classes." into jb-mr2-dev 2013-04-18 17:06:46 +00:00
Svetoslav Ganov
0ecfa017de Reload accessibility service infos for reisntalled packages.
When something that affects the state of accessibility in the sysytem
changes, we run a reolve method that reloads all relevant information and
if it changed we call a method that makes everyting right. One of the
interesting properties we read is the isntalled accessibliity services.

We are using equals to figure out whether these services have changed
but this is not correct since AccessibilityServiceInfo does not use all
internal members for equals and using all memthis is not reasible since
some of these internal members do not support equals propertly, for
example ResolveInfo.

Therefore, when a package is reinstalled we remove all installed services
from the list of ones we know about which forces them to be reloaded,
thus capturing the current state of a reinstalled package.

bug:8621960

Change-Id: Ie1ef4bf1036d8d6e033cd9528ea2292ce24e5320
2013-04-18 09:47:48 -07:00
Baligh Uddin
9968b523e5 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-18 16:43:35 +00:00
Jeff Tinker
45d59a997f Merge "Make MediaDrm APIs public" into jb-mr2-dev 2013-04-18 16:08:37 +00:00
Daniel Sandler
32e698b12f Once again, cancel all when notifications canceled for pkg.
Right now this only works if you go through the front door
(using setNotificationsEnabledForPackage()); if you set the
AppOps for a package otherwise the existing notifications
will not be cleared (but new ones will be blocked). Since
there's no UI for modifying AppOps today this shouldn't be a
problem.

Bug: 8489214
Change-Id: I84f8c76a0d03959127e9076ab2b7d37dbdaebb17
2013-04-18 11:31:52 -04:00
Daniel Sandler
6396c7205a Restore dock home support for car docks.
While it's still not generally appropriate for the home key
to do anything other than take you home, a car is a somewhat
different context: because of the user's reduced ability to
interact with the device, it's especially useful to
temporarily replace the launcher with a car-optimized
variant. While it would be ideal for the entire system
(particularly the user's everyday Launcher) to dynamically
reconfigure their UIs upon entering car mode, it's not the
case today, and car home apps are a useful compromise.

Quick test:

	$ adb shell am broadcast \
		-a android.intent.action.DOCK_EVENT \
		--ei android.intent.extra.DOCK_STATE 2

This reverts commit 7c135205f2f4c192299ad0215276e9e481bccaa5.

Bug: 8234767
Change-Id: I17588fff46e7f5e3773d3ad202601a5642943444
2013-04-18 08:21:49 -04:00
Michael Wright
2b29631953 Merge "Standardize gamepad layouts on existing controllers" into jb-mr2-dev 2013-04-18 08:15:58 +00:00
Jaikumar Ganesh
176c245cef Merge "Hardware geofence API changes." into jb-mr2-dev 2013-04-18 05:18:41 +00:00
Jaikumar Ganesh
da6508954a Hardware geofence API changes.
b/8631678

1.GeofenceRequest object created.
2.MonitorState moved to a new callback
3.getTypeAndStatus separated to 2 calls.
4.Binder death implemented
5.geofenceChange callback name changed.
6.Parameters rearranged in some calls.

Change-Id: I8fe9621186aeb49efeb0eef1821a2556afe03cfc
2013-04-17 22:18:01 -07:00
Matthew Xie
cdd94e3647 Remove BluetoothAdapterCallback. Simplify leScan Api
App does not need to explicitly register/unregister callback
bug 8599881

Change-Id: I18cfef14d7ddb344722945e657dcb959823b412b
2013-04-17 20:49:33 -07:00
Satoshi Kataoka
f024e7ac44 Merge "Fix possible NPE" into jb-mr2-dev 2013-04-18 03:33:39 +00:00
Jeff Brown
f110a3701b Sent hint to Wifi driver when enabling WFD.
Bug: 8521148
Change-Id: I53b4cf7a3714b28f9df457e559abe92711c02cef
2013-04-17 20:25:36 -07:00
Stephen Hines
42028a8756 Add new error code for Debug Context work.
Bug: 7343201

This error type is less severe when running under the debug context,
allowing developers to use RSErrorHandler to respond to errors like
out-of-bounds native accesses.

Change-Id: I79c87d1956c94833546f0f638ffa1aafecae49cd
2013-04-17 19:22:01 -07:00
Dianne Hackborn
25b49734ca Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev 2013-04-18 02:00:46 +00:00
Benoit Goby
d02b00dd6e Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev 2013-04-18 01:52:55 +00:00
Jeff Brown
ab15e6ab37 Merge "Add a config resource to force HDMI rotation on some devices." into jb-mr2-dev 2013-04-18 01:42:01 +00:00
Mathias Agopian
bb7b315cdd Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 2013-04-18 01:29:07 +00:00
Dianne Hackborn
ca46b87118 Fix issue #8540550: Screenshots should never have transparency
Make sure the thumbnail bitmap is initialized with a black
background.

Change-Id: I87c00d309b7d30b6085a751aa4ae22cf146c74f5
2013-04-17 18:06:22 -07:00
Michael Wright
f9c2ada62f Standardize gamepad layouts on existing controllers
Bug: 8292749
Change-Id: I24bae8c9229125fcdd583d74b29f4334ddff782e
2013-04-17 18:00:06 -07:00
Benoit Goby
29a4b7277e Fix UsbDebuggingActivity not shown in adb tcpip mode
Bug: 8646772
Change-Id: If34c756bece903a0a452070bbc94ebc71d325bf6
2013-04-17 17:34:30 -07:00
Chris Craik
18455c307d Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev 2013-04-18 00:32:08 +00:00
Eric Laurent
c18c9138ce AudioService: SCO audio backward compatibility
After commit 25fc29b3, AudioManager.startBluetoothSco()
does not use virtual voice call mode anymore when starting the
SCO audio connection to the headset.
To help backward compatibility, this change makes that virtual voice call
is used if the request comes from an application targeting a SDK version
before JB MR2. For applications targeted to JB MR2 and above a raw SCO
audio connection is established.

Bug 8157702

Change-Id: If1ded2fd99b7ed76d2435d95ee03659e78a7882a
2013-04-17 17:19:56 -07:00
Jeff Brown
c82c89edc7 Add a config resource to force HDMI rotation on some devices.
If the hardware composer HAL does not provide full support for
multiple displays, it may be necessary to force the HDMI rotation
when not docked.  (When docked, we can use the dock's orientation.)

This configuration is not expected to be used on newer devices
with the requisite HAL support and may be removed in the future.

Bug: 8511721
Change-Id: I1ff50f00ee7fe621aceff94bd938ecf6385c3f38
2013-04-17 17:18:15 -07:00
Jeff Tinker
f7568b5ee9 Improve error handling for DRM errors reported by plugins
Change-Id: I25df78f16379b32c54189949daa3ab9c91187375
related-to-bug: 8621516
2013-04-17 16:46:49 -07:00
Wink Saville
e3a9cbc052 Add CellInfoWcdma and related classes.
Update javadoc's to define invalid values are Integer.MAX_VALUE.

Bug: 8622081
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13
2013-04-17 16:40:17 -07:00
Jim Miller
9bf7be933d Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev 2013-04-17 22:47:06 +00:00
Jim Miller
158fe19ff8 Add permission check for owner-info related LockSettings.
Fixes bug 8512972

Change-Id: I372ef892000e5de9075783f06b722e2911cfc90d
2013-04-17 15:26:10 -07:00
Jeff Tinker
e1c76bebef Make MediaDrm APIs public
bug: 8603279

Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
2013-04-17 15:24:48 -07:00
Chet Haase
bc09a364c3 Merge "Fixes for setClipBounds()" into jb-mr2-dev 2013-04-17 22:13:50 +00:00
Mathias Agopian
9ddf32aa8a add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
Bug: 8593591
Change-Id: I152281ddca8716aee97147cb1b3fb483ed46b053
2013-04-17 15:04:47 -07:00
Jean-Michel Trivi
e1546df25a Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev 2013-04-17 21:09:44 +00:00
Adam Cohen
be8bc8392e Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 2013-04-17 21:03:43 +00:00
Adam Cohen
33f3aab220 DO NOT MERGE Stripping some new widget API that is yet unused
Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
2013-04-17 13:48:45 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00
Amith Yamasani
a0042742c8 Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 2013-04-17 18:26:49 +00:00
Dianne Hackborn
e8d12dd6b0 Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev 2013-04-17 18:21:04 +00:00
Dianne Hackborn
84c7111c4b Fix issue #8032572: Android app permission help text "null"...
...for "Microphone / Record audio"

Change-Id: Ie839b055771950e1078fa66506a007203338cfb5
2013-04-17 11:18:10 -07:00
Christopher Tate
effb153aba Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 2013-04-17 18:08:19 +00:00
Amith Yamasani
7e99bc02c8 Modify restrictions bundle per api council recommendations
Use a Bundle for persisting and passing to the application, but use a
list to return data back from an application that's exposing restrictions.

Changed the xml reading/writing code to store the value type in the Bundle
so that it can be reproduced when reading. Earlier we were assuming only
String and String[].

Bug: 8633967

Change-Id: I523d5553728edcf28a1e9d432f490b4956f34215
2013-04-17 10:44:44 -07:00
Christopher Tate
1b64598602 Lengthen the AM timeout reading crash reports slightly
We're missing some (small fraction of) native crash reports from
debuggerd.  It looks like under high system load the debuggerd
reporting code just isn't quite timely enough for the very short
timeouts initially deployed, so lengthen those a bit.

Bug 8552010

Change-Id: Icbc5b6517de3bb98fff1af2ea42ffd208ef20412
2013-04-17 10:40:02 -07:00
Victoria Lease
25df1a82a8 Merge "use appropriate fallback chain for style" into jb-mr2-dev 2013-04-17 16:23:38 +00:00