104102 Commits

Author SHA1 Message Date
Dirk Dougherty
e049591224 am 5a02663d: Merge "Doc change: Eat some permissions group comments." into jb-mr2-dev
* commit '5a02663d08a4a52a73a2bd181969cac4a3fb10e1':
  Doc change: Eat some permissions group comments.
2013-04-18 16:58:58 -07:00
Dirk Dougherty
5a02663d08 Merge "Doc change: Eat some permissions group comments." into jb-mr2-dev 2013-04-18 23:56:05 +00:00
Dirk Dougherty
f6878b009a Doc change: Eat some permissions group comments.
Change-Id: I6db06ed80fbc9e3d71c2a029cc50a6fa954d35b9
2013-04-18 16:55:21 -07:00
Jeff Tinker
a393c2a2f7 am c884a08e: Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2-dev
* commit 'c884a08e8c450682f3fe83576fb9e89f8337146e':
  Improve error handling for DRM errors reported by plugins
2013-04-18 16:23:17 -07:00
Daniel Sandler
6800dde2fc am 9bc3386e: Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev
* commit '9bc3386e1dfacf6544039dc9f66d07b827632f23':
  Once again, cancel all when notifications canceled for pkg.
2013-04-18 16:19:47 -07:00
Jeff Tinker
c884a08e8c Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2-dev 2013-04-18 23:18:46 +00:00
Daniel Sandler
9bc3386e1d Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev 2013-04-18 23:15:51 +00:00
Dianne Hackborn
f977201257 Fix issue #8656537: API review: styles, assist
Change-Id: I5542fb548805fc885b51a1dd1133a3ac226df96b
2013-04-18 15:35:16 -07:00
Satoshi Kataoka
f09993ca1d am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."
* commit '1a546dca77b47b86c87ddf4de7a76662ef8bd48b':
  Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
2013-04-18 15:28:18 -07:00
Andreas Huber
ba9269a585 Add some documentation to MediaCodecInfo
Change-Id: Ia94cde04af37e46b5d4b9c171dc50112134042b8
related-to-bug: 8657165
2013-04-18 15:27:20 -07:00
Jeff Brown
253bc7505c am a454c573: Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev
* commit 'a454c5732cacffdda53ae277b1e43d87b43044b1':
  Sent hint to Wifi driver when enabling WFD.
2013-04-18 15:17:53 -07:00
Mathias Agopian
9f16842589 am d2fe47fc: Merge "don\'t trigger a render when setting the rendermode" into jb-mr2-dev
* commit 'd2fe47fcbe329ada690e8e66d8d359813597c459':
  don't trigger a render when setting the rendermode
2013-04-18 15:17:50 -07:00
Jeff Brown
a454c5732c Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev 2013-04-18 22:16:05 +00:00
Mathias Agopian
d2fe47fcbe Merge "don't trigger a render when setting the rendermode" into jb-mr2-dev 2013-04-18 22:15:22 +00:00
Mathias Agopian
78bc203312 don't trigger a render when setting the rendermode
also don't cache the rendermode, to mimic the older
behaviour.

Bug: 8656076
Change-Id: Id9383852bed073927db2364f7ac30a1be28b4cd8
2013-04-18 14:47:44 -07:00
Adam Powell
61a826eff1 am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev
* commit '70e376964be45525f1f0e90f35570415dce6d1df':
  Fix ActionBar#setHomeActionContentDescription(0)
2013-04-18 14:46:17 -07:00
Adam Powell
70e376964b Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev 2013-04-18 21:42:22 +00:00
Alon Albert
d2b8cd75ed am adff8b75: Merge "Add Javadoc" into jb-mr2-dev
* commit 'adff8b7577490bbeaedcd584a19eb5310f6ccbc5':
  Add Javadoc
2013-04-18 14:39:25 -07:00
Alon Albert
adff8b7577 Merge "Add Javadoc" into jb-mr2-dev 2013-04-18 21:36:33 +00:00
Alon Albert
d35bf1f5eb Add Javadoc
Bug: 8657225
Change-Id: Id3cc191ea67011460604a691214b9b09075c5938
2013-04-18 14:28:38 -07:00
Matthew Xie
bf3e7d9efc am b2df0b60: Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev
* commit 'b2df0b60d0995c760fc7ee3776caa0fc7f84066a':
  Remove BluetoothAdapterCallback. Simplify leScan Api
2013-04-18 14:03:55 -07:00
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
17917a95f3 am d3f9ffe2: Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev
* commit 'd3f9ffe28d1599e40f8c9a7c0c32465324bb2828':
  Prevent transformed ops from merging in the first place
2013-04-18 13:45:49 -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
e3e55f2a19 am 5d1a182a: Merge "Secure broadcasts." into jb-mr2-dev
* commit '5d1a182a8a2dd9613ef3b1f2de7b6a3d690ae890':
  Secure broadcasts.
2013-04-18 11:49:39 -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
7a3e91f4f9 am 467a052e: Magnification does not work if no enabled accessibility services.
* commit '467a052e159d5dc87b27ce94f8559576ec73040b':
  Magnification does not work if no enabled accessibility services.
2013-04-18 11:36:42 -07:00
Satoshi Kataoka
1a546dca77 Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar." 2013-04-18 17:43:38 +00: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
b71ec91a32 am 7f6fc129: Merge "Add CellInfoWcdma and related classes." into jb-mr2-dev
* commit '7f6fc12997d67ae80a044bc0b4cc17797d887911':
  Add CellInfoWcdma and related classes.
2013-04-18 10:10:31 -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
ba237151d7 am 9968b523: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '9968b523e53dd16a4d8fad207d435abd2eaf266f':
  Import translations. DO NOT MERGE
2013-04-18 09:45:50 -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
4efe71ae55 am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-dev
* commit '45d59a997f639662e4ce427933d81667fee39bcd':
  Make MediaDrm APIs public
2013-04-18 09:11:57 -07: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
53b6d5106d am 2b296319: Merge "Standardize gamepad layouts on existing controllers" into jb-mr2-dev
* commit '2b29631953d05c5202483817f5d2b07a26ddc14c':
  Standardize gamepad layouts on existing controllers
2013-04-18 01:19:23 -07: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
d5af172450 am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev
* commit '176c245cefaf08f33043e9b67cb787efeb6ad662':
  Hardware geofence API changes.
2013-04-17 22:21:32 -07: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
3e3a7b3b1e am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev
* commit 'f024e7ac44e00ea560f547b4e5d67645a2e6c9b4':
  Fix possible NPE
2013-04-17 20:36:12 -07:00