OSDN Git Service
Ying Wang [Fri, 19 Apr 2013 03:44:28 +0000 (20:44 -0700)]
Ying Wang [Fri, 19 Apr 2013 03:39:48 +0000 (20:39 -0700)]
Fix doc build.
Change-Id: Ibf0d998721a2851c31529d5b44bf86b1b3df5791
Jeff Brown [Fri, 19 Apr 2013 02:20:22 +0000 (19:20 -0700)]
am
8adf5d2b: Merge "Undeprecate old UsbDeviceConnection methods." into jb-mr2-dev
* commit '
8adf5d2b0d3c59e085837159173c3228061ce3e7':
Undeprecate old UsbDeviceConnection methods.
Svetoslav Ganov [Fri, 19 Apr 2013 02:20:19 +0000 (19:20 -0700)]
am
d1f765c0: Merge "Fix restoration of virtual accessibility focus in ListView." into jb-mr2-dev
* commit '
d1f765c009ec28484792b9d847fa0c41e6b943e0':
Fix restoration of virtual accessibility focus in ListView.
Jeff Brown [Fri, 19 Apr 2013 02:19:34 +0000 (02:19 +0000)]
Merge "Undeprecate old UsbDeviceConnection methods." into jb-mr2-dev
Jeff Brown [Fri, 19 Apr 2013 02:15:17 +0000 (19:15 -0700)]
Undeprecate old UsbDeviceConnection methods.
Per api review, retain the overloads that do not accept a
buffer start offset.
Bug:
8656781
Change-Id: Ie00aca7d3a4708700c5ddf60e3309e609788a67f
Svetoslav Ganov [Fri, 19 Apr 2013 02:17:02 +0000 (02:17 +0000)]
Merge "Fix restoration of virtual accessibility focus in ListView." into jb-mr2-dev
Jeff Brown [Fri, 19 Apr 2013 02:11:44 +0000 (19:11 -0700)]
am
6f575bb3: Merge "Fix change of behavior in Looper.quit()." into jb-mr2-dev
* commit '
6f575bb34c038bfa0e3cd0e26e61712d7fdcb984':
Fix change of behavior in Looper.quit().
Jeff Brown [Fri, 19 Apr 2013 02:09:19 +0000 (02:09 +0000)]
Merge "Fix change of behavior in Looper.quit()." into jb-mr2-dev
Jeff Brown [Thu, 18 Apr 2013 22:17:48 +0000 (15:17 -0700)]
Fix change of behavior in Looper.quit().
It seems some applications rely on Looper.quit() terminating the
loop immediately without processing all messages. Rather than
risk breaking them, make the safer behavior optional.
Also take care to properly drain the message queue before quitting
so that all of the Message instances are recycled. This may
help release storage sooner in case the Looper doesn't get GC'd
promptly and its remaining queue of undelivered messages sticks
around.
Improve docs on runWithScissors.
Bug:
8596303
Change-Id: I8cbeb6f7a5f6b8e618b5109f87a03defc1486b9f
Ying Wang [Fri, 19 Apr 2013 02:00:48 +0000 (19:00 -0700)]
am
662c49e6: Update aip/current.txt to fix build.
* commit '
662c49e67190f4ff9f6bed6cc8fc55c508226346':
Update aip/current.txt to fix build.
Ying Wang [Fri, 19 Apr 2013 01:54:57 +0000 (18:54 -0700)]
Update aip/current.txt to fix build.
Change-Id: I3644995bce6102c05b356a709e517c812eca0570
Dianne Hackborn [Fri, 19 Apr 2013 01:30:02 +0000 (18:30 -0700)]
am
f06396da: Merge "Fix issue #
8656537: API review: styles, assist" into jb-mr2-dev
* commit '
f06396dae8ad9f6ac2ca2a6afb459f0e106cd786':
Fix issue #
8656537: API review: styles, assist
Dianne Hackborn [Fri, 19 Apr 2013 01:26:57 +0000 (01:26 +0000)]
Merge "Fix issue #
8656537: API review: styles, assist" into jb-mr2-dev
Svetoslav [Fri, 19 Apr 2013 01:01:34 +0000 (18:01 -0700)]
am
688a6977: Replacing accessibility service permissions with capability attributes.
* commit '
688a6977cf7673ed0542ab3d839053c4e38a4dbd':
Replacing accessibility service permissions with capability attributes.
Svetoslav [Wed, 17 Apr 2013 01:55:38 +0000 (18:55 -0700)]
Replacing accessibility service permissions with capability attributes.
Accessibility services can perform special operations such as retrieve
the screen content, enable explore by touch, etc. To ensure the user
is aware that the service will perform special operations we were using
permissions. However, the special operations cannot be performed unless
the service is really enabled by the user and it is at this point that
we want to notify the user about the service capabilities.
This change adds capability attributes to the accessibility service's
meta-data XML file. The service has to declare the capability and when
it is enabled we show the user the capabilities in the warining dialog.
bug:
8633951
Change-Id: Id3442dc71dad018e606888afdc40834682fdb037
Svetoslav Ganov [Fri, 19 Apr 2013 00:31:57 +0000 (17:31 -0700)]
am
a407994b: Merge "Reload accessibility service infos for reisntalled packages." into jb-mr2-dev
* commit '
a407994bad9f6d5c2b9a8446e7c3354b753279a1':
Reload accessibility service infos for reisntalled packages.
Svetoslav Ganov [Fri, 19 Apr 2013 00:26:02 +0000 (00:26 +0000)]
Merge "Reload accessibility service infos for reisntalled packages." into jb-mr2-dev
Dirk Dougherty [Thu, 18 Apr 2013 23:58:58 +0000 (16:58 -0700)]
am
5a02663d: Merge "Doc change: Eat some permissions group comments." into jb-mr2-dev
* commit '
5a02663d08a4a52a73a2bd181969cac4a3fb10e1':
Doc change: Eat some permissions group comments.
Dirk Dougherty [Thu, 18 Apr 2013 23:56:05 +0000 (23:56 +0000)]
Merge "Doc change: Eat some permissions group comments." into jb-mr2-dev
Dirk Dougherty [Thu, 18 Apr 2013 23:38:01 +0000 (16:38 -0700)]
Doc change: Eat some permissions group comments.
Change-Id: I6db06ed80fbc9e3d71c2a029cc50a6fa954d35b9
Jeff Tinker [Thu, 18 Apr 2013 23:23:17 +0000 (16:23 -0700)]
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
Daniel Sandler [Thu, 18 Apr 2013 23:19:47 +0000 (16:19 -0700)]
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.
Jeff Tinker [Thu, 18 Apr 2013 23:18:46 +0000 (23:18 +0000)]
Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2-dev
Daniel Sandler [Thu, 18 Apr 2013 23:15:50 +0000 (23:15 +0000)]
Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev
Dianne Hackborn [Thu, 18 Apr 2013 21:10:03 +0000 (14:10 -0700)]
Fix issue #
8656537: API review: styles, assist
Change-Id: I5542fb548805fc885b51a1dd1133a3ac226df96b
Satoshi Kataoka [Thu, 18 Apr 2013 22:28:18 +0000 (15:28 -0700)]
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.
Jeff Brown [Thu, 18 Apr 2013 22:17:53 +0000 (15:17 -0700)]
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.
Mathias Agopian [Thu, 18 Apr 2013 22:17:50 +0000 (15:17 -0700)]
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
Jeff Brown [Thu, 18 Apr 2013 22:16:04 +0000 (22:16 +0000)]
Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev
Mathias Agopian [Thu, 18 Apr 2013 22:15:22 +0000 (22:15 +0000)]
Merge "don't trigger a render when setting the rendermode" into jb-mr2-dev
Mathias Agopian [Thu, 18 Apr 2013 20:52:58 +0000 (13:52 -0700)]
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
Adam Powell [Thu, 18 Apr 2013 21:46:17 +0000 (14:46 -0700)]
am
70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev
* commit '
70e376964be45525f1f0e90f35570415dce6d1df':
Fix ActionBar#setHomeActionContentDescription(0)
Adam Powell [Thu, 18 Apr 2013 21:42:21 +0000 (21:42 +0000)]
Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev
Alon Albert [Thu, 18 Apr 2013 21:39:25 +0000 (14:39 -0700)]
am
adff8b75: Merge "Add Javadoc" into jb-mr2-dev
* commit '
adff8b7577490bbeaedcd584a19eb5310f6ccbc5':
Add Javadoc
Alon Albert [Thu, 18 Apr 2013 21:36:32 +0000 (21:36 +0000)]
Merge "Add Javadoc" into jb-mr2-dev
Alon Albert [Thu, 18 Apr 2013 21:26:51 +0000 (14:26 -0700)]
Add Javadoc
Bug:
8657225
Change-Id: Id3cc191ea67011460604a691214b9b09075c5938
Matthew Xie [Thu, 18 Apr 2013 21:03:55 +0000 (14:03 -0700)]
am
b2df0b60: Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev
* commit '
b2df0b60d0995c760fc7ee3776caa0fc7f84066a':
Remove BluetoothAdapterCallback. Simplify leScan Api
Matthew Xie [Thu, 18 Apr 2013 20:59:43 +0000 (20:59 +0000)]
Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev
Adam Powell [Thu, 18 Apr 2013 20:53:27 +0000 (13:53 -0700)]
Fix ActionBar#setHomeActionContentDescription(0)
This call should be analogous to calling
setHomeActionContentDescription(null) and not throw an exception.
Bug
8657256
Change-Id: Ifa9c7b999f4bf1a31fba43f869e234b1f1861512
Chris Craik [Thu, 18 Apr 2013 20:45:49 +0000 (13:45 -0700)]
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
Chris Craik [Thu, 18 Apr 2013 20:43:24 +0000 (20:43 +0000)]
Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev
Chris Craik [Thu, 18 Apr 2013 19:57:07 +0000 (12:57 -0700)]
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
Robert Greenwalt [Thu, 18 Apr 2013 18:49:39 +0000 (11:49 -0700)]
am
5d1a182a: Merge "Secure broadcasts." into jb-mr2-dev
* commit '
5d1a182a8a2dd9613ef3b1f2de7b6a3d690ae890':
Secure broadcasts.
Robert Greenwalt [Thu, 18 Apr 2013 18:45:53 +0000 (18:45 +0000)]
Merge "Secure broadcasts." into jb-mr2-dev
Svetoslav Ganov [Thu, 18 Apr 2013 18:36:42 +0000 (11:36 -0700)]
am
467a052e: Magnification does not work if no enabled accessibility services.
* commit '
467a052e159d5dc87b27ce94f8559576ec73040b':
Magnification does not work if no enabled accessibility services.
Satoshi Kataoka [Thu, 18 Apr 2013 17:43:37 +0000 (17:43 +0000)]
Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."
Svetoslav Ganov [Thu, 18 Apr 2013 17:35:16 +0000 (10:35 -0700)]
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
Robert Greenwalt [Thu, 18 Apr 2013 17:29:29 +0000 (10:29 -0700)]
Secure broadcasts.
Prevents 3rd party spoofing.
bug:
7622253
Change-Id: I1e1a9887afe009d060205e349c31e3aefba2ea5b
Wink Saville [Thu, 18 Apr 2013 17:10:31 +0000 (10:10 -0700)]
am
7f6fc129: Merge "Add CellInfoWcdma and related classes." into jb-mr2-dev
* commit '
7f6fc12997d67ae80a044bc0b4cc17797d887911':
Add CellInfoWcdma and related classes.
Wink Saville [Thu, 18 Apr 2013 17:06:45 +0000 (17:06 +0000)]
Merge "Add CellInfoWcdma and related classes." into jb-mr2-dev
Svetoslav Ganov [Thu, 18 Apr 2013 16:35:43 +0000 (09:35 -0700)]
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
Baligh Uddin [Thu, 18 Apr 2013 16:45:50 +0000 (09:45 -0700)]
am
9968b523: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
9968b523e53dd16a4d8fad207d435abd2eaf266f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Apr 2013 16:43:34 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Jeff Tinker [Thu, 18 Apr 2013 16:11:57 +0000 (09:11 -0700)]
am
45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-dev
* commit '
45d59a997f639662e4ce427933d81667fee39bcd':
Make MediaDrm APIs public
Jeff Tinker [Thu, 18 Apr 2013 16:08:37 +0000 (16:08 +0000)]
Merge "Make MediaDrm APIs public" into jb-mr2-dev
Daniel Sandler [Thu, 18 Apr 2013 14:51:35 +0000 (10:51 -0400)]
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
Michael Wright [Thu, 18 Apr 2013 08:19:23 +0000 (01:19 -0700)]
am
2b296319: Merge "Standardize gamepad layouts on existing controllers" into jb-mr2-dev
* commit '
2b29631953d05c5202483817f5d2b07a26ddc14c':
Standardize gamepad layouts on existing controllers
Michael Wright [Thu, 18 Apr 2013 08:15:57 +0000 (08:15 +0000)]
Merge "Standardize gamepad layouts on existing controllers" into jb-mr2-dev
Jaikumar Ganesh [Thu, 18 Apr 2013 05:21:32 +0000 (22:21 -0700)]
am
176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev
* commit '
176c245cefaf08f33043e9b67cb787efeb6ad662':
Hardware geofence API changes.
Jaikumar Ganesh [Thu, 18 Apr 2013 05:18:41 +0000 (05:18 +0000)]
Merge "Hardware geofence API changes." into jb-mr2-dev
Jaikumar Ganesh [Wed, 17 Apr 2013 19:19:10 +0000 (12:19 -0700)]
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
Matthew Xie [Thu, 11 Apr 2013 23:36:26 +0000 (16:36 -0700)]
Remove BluetoothAdapterCallback. Simplify leScan Api
App does not need to explicitly register/unregister callback
bug
8599881
Change-Id: I18cfef14d7ddb344722945e657dcb959823b412b
Satoshi Kataoka [Thu, 18 Apr 2013 03:36:12 +0000 (20:36 -0700)]
am
f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev
* commit '
f024e7ac44e00ea560f547b4e5d67645a2e6c9b4':
Fix possible NPE
Satoshi Kataoka [Thu, 18 Apr 2013 03:33:39 +0000 (03:33 +0000)]
Merge "Fix possible NPE" into jb-mr2-dev
Jeff Brown [Thu, 18 Apr 2013 03:25:36 +0000 (20:25 -0700)]
Sent hint to Wifi driver when enabling WFD.
Bug:
8521148
Change-Id: I53b4cf7a3714b28f9df457e559abe92711c02cef
Dianne Hackborn [Thu, 18 Apr 2013 02:03:09 +0000 (19:03 -0700)]
am
25b49734: Merge "Fix issue #
8540550: Screenshots should never have transparency" into jb-mr2-dev
* commit '
25b49734cac1ecd17dba2af2a1af8328490236d4':
Fix issue #
8540550: Screenshots should never have transparency
Dianne Hackborn [Thu, 18 Apr 2013 02:00:45 +0000 (02:00 +0000)]
Merge "Fix issue #
8540550: Screenshots should never have transparency" into jb-mr2-dev
Benoit Goby [Thu, 18 Apr 2013 01:56:10 +0000 (18:56 -0700)]
am
d02b00dd: Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev
* commit '
d02b00dd6efd3841708cd72ae08e5d548b8cd07b':
Fix UsbDebuggingActivity not shown in adb tcpip mode
Benoit Goby [Thu, 18 Apr 2013 01:52:55 +0000 (01:52 +0000)]
Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev
Jeff Brown [Thu, 18 Apr 2013 01:44:26 +0000 (18:44 -0700)]
am
ab15e6ab: Merge "Add a config resource to force HDMI rotation on some devices." into jb-mr2-dev
* commit '
ab15e6ab37cb29e6f3653cc5fa1872523946c50e':
Add a config resource to force HDMI rotation on some devices.
Jeff Brown [Thu, 18 Apr 2013 01:42:01 +0000 (01:42 +0000)]
Merge "Add a config resource to force HDMI rotation on some devices." into jb-mr2-dev
Mathias Agopian [Thu, 18 Apr 2013 01:32:24 +0000 (18:32 -0700)]
am
bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev
* commit '
bb7b315cdd48fdcffc07d0e98557cb88b9f58006':
add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
Mathias Agopian [Thu, 18 Apr 2013 01:29:07 +0000 (01:29 +0000)]
Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev
Dianne Hackborn [Thu, 18 Apr 2013 01:06:22 +0000 (18:06 -0700)]
Fix issue #
8540550: Screenshots should never have transparency
Make sure the thumbnail bitmap is initialized with a black
background.
Change-Id: I87c00d309b7d30b6085a751aa4ae22cf146c74f5
Michael Wright [Thu, 4 Apr 2013 23:57:20 +0000 (16:57 -0700)]
Standardize gamepad layouts on existing controllers
Bug:
8292749
Change-Id: I24bae8c9229125fcdd583d74b29f4334ddff782e
Chris Craik [Thu, 18 Apr 2013 00:34:46 +0000 (17:34 -0700)]
am
18455c30: Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev
* commit '
18455c307d8ea439dbf78aa3789380259ddd8572':
Add input/output JSON data for baseline comparison
Benoit Goby [Thu, 18 Apr 2013 00:34:30 +0000 (17:34 -0700)]
Fix UsbDebuggingActivity not shown in adb tcpip mode
Bug:
8646772
Change-Id: If34c756bece903a0a452070bbc94ebc71d325bf6
Chris Craik [Thu, 18 Apr 2013 00:32:07 +0000 (00:32 +0000)]
Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev
Jeff Brown [Thu, 18 Apr 2013 00:18:15 +0000 (17:18 -0700)]
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
Jeff Tinker [Wed, 17 Apr 2013 21:24:40 +0000 (14:24 -0700)]
Improve error handling for DRM errors reported by plugins
Change-Id: I25df78f16379b32c54189949daa3ab9c91187375
related-to-bug:
8621516
Wink Saville [Wed, 17 Apr 2013 23:40:17 +0000 (16:40 -0700)]
Add CellInfoWcdma and related classes.
Update javadoc's to define invalid values are Integer.MAX_VALUE.
Bug:
8622081
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13
Jim Miller [Wed, 17 Apr 2013 22:49:23 +0000 (15:49 -0700)]
am
9bf7be93: Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev
* commit '
9bf7be933d039ef227ca54f917c1ff6a00a2f833':
Add permission check for owner-info related LockSettings.
Chet Haase [Wed, 17 Apr 2013 22:49:17 +0000 (15:49 -0700)]
am
bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev
* commit '
bc09a364c3fd49470b936e7bc2521f6de9ba07b4':
Fixes for setClipBounds()
Jim Miller [Wed, 17 Apr 2013 22:47:06 +0000 (22:47 +0000)]
Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev
Jim Miller [Wed, 17 Apr 2013 22:23:55 +0000 (15:23 -0700)]
Add permission check for owner-info related LockSettings.
Fixes bug
8512972
Change-Id: I372ef892000e5de9075783f06b722e2911cfc90d
Jeff Tinker [Thu, 4 Apr 2013 01:11:33 +0000 (18:11 -0700)]
Make MediaDrm APIs public
bug:
8603279
Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
Chet Haase [Wed, 17 Apr 2013 22:13:50 +0000 (22:13 +0000)]
Merge "Fixes for setClipBounds()" into jb-mr2-dev
Mathias Agopian [Wed, 17 Apr 2013 22:04:47 +0000 (15:04 -0700)]
add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
Bug:
8593591
Change-Id: I152281ddca8716aee97147cb1b3fb483ed46b053
Jean-Michel Trivi [Wed, 17 Apr 2013 21:15:36 +0000 (14:15 -0700)]
am
e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev
* commit '
e1546df25a7de17195f5b38ca90cad8447c288d0':
Fix message handling in RemoteControlClient
Jean-Michel Trivi [Wed, 17 Apr 2013 21:09:43 +0000 (21:09 +0000)]
Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev
Adam Cohen [Wed, 17 Apr 2013 21:06:33 +0000 (14:06 -0700)]
am
be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev
* commit '
be8bc8392e203a661242b0637ce25bd05c292306':
DO NOT MERGE Stripping some new widget API that is yet unused
Adam Cohen [Wed, 17 Apr 2013 21:03:43 +0000 (21:03 +0000)]
Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev
Adam Cohen [Wed, 17 Apr 2013 20:48:17 +0000 (13:48 -0700)]
DO NOT MERGE Stripping some new widget API that is yet unused
Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
Jim Miller [Wed, 17 Apr 2013 20:44:23 +0000 (13:44 -0700)]
am
b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
* commit '
b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
Move owner info from Settings.Secure to LockSettings
Jim Miller [Wed, 17 Apr 2013 20:39:58 +0000 (20:39 +0000)]
Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
Amith Yamasani [Wed, 17 Apr 2013 18:30:41 +0000 (11:30 -0700)]
am
a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev
* commit '
a0042742c8941519718cc8872a84cfec10294386':
Modify restrictions bundle per api council recommendations
Amith Yamasani [Wed, 17 Apr 2013 18:26:49 +0000 (18:26 +0000)]
Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev
Dianne Hackborn [Wed, 17 Apr 2013 18:26:05 +0000 (11:26 -0700)]
am
e8d12dd6: Merge "Fix issue #
8032572: Android app permission help text "null"..." into jb-mr2-dev
* commit '
e8d12dd6b08ec5b3f2a18bee14171079c6c27e0d':
Fix issue #
8032572: Android app permission help text "null"...
Dianne Hackborn [Wed, 17 Apr 2013 18:21:04 +0000 (18:21 +0000)]
Merge "Fix issue #
8032572: Android app permission help text "null"..." into jb-mr2-dev