OSDN Git Service
Mark Renouf [Mon, 24 Mar 2014 15:27:45 +0000 (15:27 +0000)]
am
a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
* commit '
a63cd9f424d70a3f8ca059aa8f76b28be1f9fa07':
Run finalizers before counting for StrictMode.
Mark Renouf [Mon, 24 Mar 2014 15:22:55 +0000 (15:22 +0000)]
Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
Craig Mautner [Mon, 24 Mar 2014 14:38:33 +0000 (14:38 +0000)]
am
103ed355: am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
103ed3558764f1fd41c9a5399e2030baa4110bfb':
Set ScreenshotSurface secure if any secure content is shown.
Craig Mautner [Mon, 24 Mar 2014 14:34:59 +0000 (07:34 -0700)]
am
557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '
557a93e104f1fec69ed05b2d0ff26c78bca4c5d6':
Set ScreenshotSurface secure if any secure content is shown.
Craig Mautner [Mon, 24 Mar 2014 14:31:38 +0000 (14:31 +0000)]
Merge "Set ScreenshotSurface secure if any secure content is shown."
Jinsuk Kim [Mon, 24 Mar 2014 12:26:51 +0000 (12:26 +0000)]
am
c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '
c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
Add HdmiCecManager
Jinsuk Kim [Sun, 23 Mar 2014 23:24:44 +0000 (23:24 +0000)]
Merge "Add HdmiCecManager" into klp-modular-dev
Jinsuk Kim [Fri, 21 Mar 2014 07:25:13 +0000 (16:25 +0900)]
Add HdmiCecManager
Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).
Change-Id: I39da071a328074a4b7b049947943688bd7779c26
quddusc [Sat, 22 Mar 2014 09:30:56 +0000 (09:30 +0000)]
am
5b2e92e3: am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
5b2e92e37b41b1497b240d41df471081c9dfdc56':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 09:30:42 +0000 (09:30 +0000)]
am
9c1eaeb0: am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
9c1eaeb0b4f942b2163175c846e1c08ed4b14cbf':
docs: Added Javadoc for Gcore Jarlsberg release.
quddusc [Sat, 22 Mar 2014 04:09:04 +0000 (04:09 +0000)]
am
529d47ac: am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
529d47ace907c9d961e2c1fb2e4e68ff24833e72':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 04:08:59 +0000 (04:08 +0000)]
am
ff2599f9: am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
ff2599f9b2f25179cad9631181216f2d24255901':
docs: Added Javadoc for Gcore Jarlsberg release.
quddusc [Sat, 22 Mar 2014 00:01:20 +0000 (00:01 +0000)]
am
e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
* commit '
e9863dbe0665d5ce6dd46d673034a488b7637aff':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
quddusc [Sat, 22 Mar 2014 00:01:16 +0000 (00:01 +0000)]
am
0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
* commit '
0802b4fb391eecf37626d3d57f5e07eeb32a3185':
docs: Added Javadoc for Gcore Jarlsberg release.
quddusc [Fri, 21 Mar 2014 23:55:42 +0000 (23:55 +0000)]
Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
quddusc [Fri, 21 Mar 2014 23:55:34 +0000 (23:55 +0000)]
Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
quddusc [Thu, 20 Mar 2014 21:31:35 +0000 (14:31 -0700)]
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
Change-Id: Idc5dc716aa92c752b8dcd1967958d9d46521dfa6
Selim Cinek [Fri, 21 Mar 2014 22:52:52 +0000 (22:52 +0000)]
am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
04ea3ca000312f4eccc44347c37c49471081b852':
Disable Set Wallpaper button while loading image
Selim Cinek [Fri, 21 Mar 2014 22:46:33 +0000 (22:46 +0000)]
am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
50ac19e9b8d3435eab44cacbb62c5081f44df910':
Disable Set Wallpaper button while loading image
Selim Cinek [Fri, 21 Mar 2014 22:41:07 +0000 (22:41 +0000)]
am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
ba126c09a5c00cb0a96da6ece0b4ab4d7ed2d8cb':
Disable Set Wallpaper button while loading image
Selim Cinek [Fri, 21 Mar 2014 18:19:08 +0000 (19:19 +0100)]
Disable Set Wallpaper button while loading image
Bug:
13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
(cherry picked from commit
0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)
Chad Brubaker [Fri, 21 Mar 2014 21:09:44 +0000 (21:09 +0000)]
am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
850eb678d7356ea60925dc6fa450e213d5cea2d5':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 21:09:41 +0000 (21:09 +0000)]
am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
c77261471432e1577586395dd0a6a481ef7431b5':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 21:02:47 +0000 (21:02 +0000)]
am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
eb3c0d9ac387bb0aea5b4956daac1403253bc76d':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 21:02:43 +0000 (21:02 +0000)]
am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
1fce89d946760a1bcf3a733f55494f963eab00c2':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 20:56:41 +0000 (20:56 +0000)]
am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
1aad3ad4ec2137c5aa043f96ccc621a4faffeb56':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 20:56:37 +0000 (20:56 +0000)]
am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
de4e7b4947998638e0345ab9a181bf35a8827bef':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 20:52:14 +0000 (20:52 +0000)]
Merge "Fix support for simultaneous VPN tuns" into klp-dev
Chad Brubaker [Fri, 21 Mar 2014 20:52:04 +0000 (20:52 +0000)]
Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
Ricardo Cervera [Fri, 21 Mar 2014 20:18:29 +0000 (20:18 +0000)]
am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
1d77a8741c8b08c2b911e714c56521483e23bdac':
docs: Added new sensor types. Bug:
10674725
Ricardo Cervera [Fri, 21 Mar 2014 20:11:48 +0000 (20:11 +0000)]
am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
588300cb5211f7217b81683f8a76bdf95c7bfa8d':
docs: Added new sensor types. Bug:
10674725
Ricardo Cervera [Fri, 21 Mar 2014 20:06:06 +0000 (20:06 +0000)]
am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
2e92965820d61b704e0eb307da70825c46d899d3':
docs: Added new sensor types. Bug:
10674725
Ricardo Cervera [Fri, 21 Mar 2014 20:01:31 +0000 (20:01 +0000)]
Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
John Reck [Fri, 21 Mar 2014 19:53:17 +0000 (19:53 +0000)]
am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
aff40e25e8f16c3ecd20376901d7062774850023':
Eliminate mHasAlpha
John Reck [Fri, 21 Mar 2014 19:47:22 +0000 (19:47 +0000)]
am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
fc603ca6b518777a7e4dc391bc771e5609ab3ab5':
Eliminate mHasAlpha
John Reck [Fri, 21 Mar 2014 19:41:00 +0000 (19:41 +0000)]
am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
abf701e6751aed487d4ed0986e0fae8810c3658f':
Eliminate mHasAlpha
John Reck [Fri, 21 Mar 2014 19:37:27 +0000 (19:37 +0000)]
Merge "Eliminate mHasAlpha" into klp-dev
Unsuk Jung [Fri, 21 Mar 2014 19:17:01 +0000 (19:17 +0000)]
am
2270ac96: am
8114c3d0: am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
2270ac96d5d8ab6c2d1601f8dd5d8409762fb35f':
Change wallpaper sizing
Unsuk Jung [Fri, 21 Mar 2014 19:11:01 +0000 (19:11 +0000)]
am
8114c3d0: am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
8114c3d02d6bf72c0627aea6ecf738074ac3f232':
Change wallpaper sizing
Unsuk Jung [Fri, 21 Mar 2014 19:05:40 +0000 (19:05 +0000)]
am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
1a70f391608e82fcc5550c76ccc7bf8bac5bbc10':
Change wallpaper sizing
Will Haldean Brown [Fri, 21 Mar 2014 19:02:16 +0000 (19:02 +0000)]
am
f8c78b50: Update current.txt to include windowSwipeToDismiss
* commit '
f8c78b50fc9f6c81c7ad5d76c81445653dcf3cd9':
Update current.txt to include windowSwipeToDismiss
Unsuk Jung [Fri, 21 Mar 2014 19:01:08 +0000 (19:01 +0000)]
Merge "Change wallpaper sizing" into klp-dev
Alex Klyubin [Fri, 21 Mar 2014 18:47:27 +0000 (18:47 +0000)]
am
d8c32164: am
88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '
d8c32164e19d16cf7d66b9aee368369ae16a4f0d':
Adjust to the change in the private SSLParameterImpl API.
Alex Klyubin [Fri, 21 Mar 2014 18:41:38 +0000 (11:41 -0700)]
am
88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '
88517170cbb09b45324d5b457a0e5e840cc7d09b':
Adjust to the change in the private SSLParameterImpl API.
Alex Klyubin [Fri, 21 Mar 2014 18:36:07 +0000 (18:36 +0000)]
Merge "Adjust to the change in the private SSLParameterImpl API."
Will Haldean Brown [Fri, 21 Mar 2014 18:33:40 +0000 (11:33 -0700)]
Update current.txt to include windowSwipeToDismiss
Change-Id: I5cbee85f7fe852e534a722083feead7359404732
John Reck [Fri, 21 Mar 2014 18:09:45 +0000 (11:09 -0700)]
Eliminate mHasAlpha
Bug:
13580771
The cached value mHasAlpha on Bitmap could get out of sync with the
real value stored in the SkBitmap. Fix this by just eliminating the
cached value. This adds an extra JNI call in copy(), createBitmap(),
and setPremultiplied(), none of which are going to be significantly
impacted by the extra JNI call.
Change-Id: I4fce069a77d9b3bbb47dde04275ff8510ce7e4f0
Alex Klyubin [Fri, 21 Mar 2014 18:13:50 +0000 (11:13 -0700)]
Adjust to the change in the private SSLParameterImpl API.
Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to
getDefaultX509TrustManager.
Bug:
13563574
Change-Id: I601c651d631f5a2e4a04d21941186553988e5286
Jeff Sharkey [Fri, 21 Mar 2014 18:00:13 +0000 (18:00 +0000)]
am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
4868da52450d3e5456b3567c228967539144d108':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Fri, 21 Mar 2014 18:00:09 +0000 (18:00 +0000)]
am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
cedbfad48753b4e266405f677cd0f13156d0c61d':
Fix link in documentation for SWIPE_TO_DISMISS.
Jeff Sharkey [Fri, 21 Mar 2014 17:56:44 +0000 (17:56 +0000)]
am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
c620ec3614c8737b87d60efa9db96c288bcad794':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Fri, 21 Mar 2014 17:50:44 +0000 (10:50 -0700)]
Fix link in documentation for SWIPE_TO_DISMISS.
Change-Id: I3ff1fb1ae97b088e6b2e1a7a2c27981e7220cc2e
Jeff Sharkey [Fri, 21 Mar 2014 17:50:39 +0000 (17:50 +0000)]
am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
3f5232220f2db839f690489ed272113f660daa40':
Lock down MANAGE_DOCUMENTS permission.
Jeff Sharkey [Fri, 21 Mar 2014 17:47:00 +0000 (17:47 +0000)]
Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
Will Haldean Brown [Fri, 21 Mar 2014 17:26:15 +0000 (17:26 +0000)]
am
496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
* commit '
496e8178b0e11c41678e1f2747a41cc2d8b2bda3':
Make windowSwipeToDismiss a public attribute.
Will Haldean Brown [Fri, 21 Mar 2014 17:22:34 +0000 (17:22 +0000)]
Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
Ricardo Cervera [Wed, 12 Mar 2014 16:15:06 +0000 (09:15 -0700)]
docs: Added new sensor types. Bug:
10674725
Change-Id: Ib378e3a1b3f1812b966c53a0eda6319f1bea464b
Michael Jurka [Wed, 18 Dec 2013 16:10:16 +0000 (17:10 +0100)]
Change wallpaper sizing
Bug:
11997581
- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary
Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
(cherry picked from commit
824a4b5ea4c58592b9b2ebe787f5fb6974e7cabe)
Jinsuk Kim [Fri, 21 Mar 2014 03:40:08 +0000 (03:40 +0000)]
am
d73e66cc: Fix broken build
* commit '
d73e66cce12f13faec44b12d9e6f33c2f28a2d5a':
Fix broken build
Jinsuk Kim [Fri, 21 Mar 2014 02:57:09 +0000 (11:57 +0900)]
Fix broken build
Change-Id: Ia7d207f7937e29cf48dce30d8c5a91f50c9e7d4c
Jinsuk Kim [Fri, 21 Mar 2014 02:37:00 +0000 (02:37 +0000)]
am
c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev
* commit '
c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
Add HDMI-CEC service
Jinsuk Kim [Fri, 21 Mar 2014 02:32:38 +0000 (02:32 +0000)]
Merge "Add HDMI-CEC service" into klp-modular-dev
Mike Lockwood [Fri, 21 Mar 2014 01:20:43 +0000 (01:20 +0000)]
am
1fe28b20: am
71060db6: am
dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '
1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Mike Lockwood [Fri, 21 Mar 2014 01:20:40 +0000 (01:20 +0000)]
am
aa7e396f: am
935d417b: am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
aa7e396f44f9b3b12a6abc9d8d62cf3a6f17527b':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Mike Lockwood [Fri, 21 Mar 2014 01:14:15 +0000 (01:14 +0000)]
am
71060db6: am
dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '
71060db65e0e1c903b429c932cd6e27beec10a3e':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Mike Lockwood [Fri, 21 Mar 2014 01:14:12 +0000 (01:14 +0000)]
am
935d417b: am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
935d417b5615a62bc521a8eb58c35de1b4fdf841':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Mike Lockwood [Fri, 21 Mar 2014 01:09:33 +0000 (01:09 +0000)]
am
dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '
dffdf1079da76f532cd6e72bf537c1a69b099c7e':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Mike Lockwood [Fri, 21 Mar 2014 01:09:31 +0000 (01:09 +0000)]
am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
afc3a5d386459667f87d764038dd30e3490c64c2':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Mike Lockwood [Fri, 21 Mar 2014 01:06:16 +0000 (01:06 +0000)]
Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
Mike Lockwood [Fri, 21 Mar 2014 01:05:56 +0000 (01:05 +0000)]
Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
Wei Wang [Fri, 21 Mar 2014 00:51:14 +0000 (00:51 +0000)]
am
f479d158: am
bf056846: am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
f479d15814f58ed820829fef0bfadf73cb2b88aa':
Fix stopBatchedScan not working for wifi
Wei Wang [Fri, 21 Mar 2014 00:45:42 +0000 (00:45 +0000)]
am
bf056846: am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
bf0568468da9e02c177abaf9116f9995d53b59aa':
Fix stopBatchedScan not working for wifi
Wei Wang [Fri, 21 Mar 2014 00:41:23 +0000 (00:41 +0000)]
am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
058061da46db0fdac8ea53c463a6b615fde3e928':
Fix stopBatchedScan not working for wifi
Wei Wang [Fri, 21 Mar 2014 00:37:33 +0000 (00:37 +0000)]
Merge "Fix stopBatchedScan not working for wifi" into klp-dev
Adam Powell [Fri, 21 Mar 2014 00:33:06 +0000 (00:33 +0000)]
am
1c84e98f: am
a6454ccb: am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
1c84e98fc482f75a7ed4373a22096cd447bc55f9':
Update contextual asset bar assets to avoid 9-patch artifacts
Adam Powell [Fri, 21 Mar 2014 00:26:43 +0000 (00:26 +0000)]
am
a6454ccb: am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
a6454ccbfb5b1f39047f8bac74ec11093469cce2':
Update contextual asset bar assets to avoid 9-patch artifacts
Adam Powell [Fri, 21 Mar 2014 00:22:38 +0000 (00:22 +0000)]
am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
49325305905198b9d077ccc784be96e5684e3623':
Update contextual asset bar assets to avoid 9-patch artifacts
Adam Powell [Fri, 21 Mar 2014 00:19:11 +0000 (00:19 +0000)]
Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
Wei Wang [Thu, 20 Mar 2014 23:27:01 +0000 (16:27 -0700)]
Fix stopBatchedScan not working for wifi
Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
Will Haldean Brown [Thu, 20 Mar 2014 23:31:48 +0000 (16:31 -0700)]
Make windowSwipeToDismiss a public attribute.
Bug:
13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c
Marco Nelissen [Thu, 20 Mar 2014 20:49:54 +0000 (20:49 +0000)]
am
46b26641: am
7d09713c: am
7cd52895: am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
46b2664177521a11ee6f4c05a9aee2b516b8f4c3':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:45:32 +0000 (20:45 +0000)]
am
7d09713c: am
7cd52895: am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
7d09713c5198579c0855089a0a77328d4ec1dc36':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:41:54 +0000 (20:41 +0000)]
am
7cd52895: am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
7cd52895ec3e014c1097852725ba68646c1d6665':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:36:34 +0000 (20:36 +0000)]
am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:22:34 +0000 (13:22 -0700)]
am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:16:32 +0000 (13:16 -0700)]
am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
759445c5bdb2eb54af9e974f604226596976e078':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 19:51:55 +0000 (12:51 -0700)]
resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
Vinit Deshapnde [Thu, 20 Mar 2014 19:42:08 +0000 (19:42 +0000)]
am
b876cae9: am
f92b0072: am
52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit '
b876cae90d8e7e57a685e31cd3b347c325728823':
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
Vinit Deshapnde [Thu, 20 Mar 2014 19:36:59 +0000 (19:36 +0000)]
am
f92b0072: am
52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit '
f92b00722d84fa0caea25a3363242b6dced0635c':
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
Mike Lockwood [Thu, 20 Mar 2014 18:14:08 +0000 (11:14 -0700)]
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
On some devices, the USB "set configuration" command is propogated to the framework
after the "start accessory" event is received. However, on other devices like
the 2011 ADK board, no "set configuration" command is sent at all until we have
reenumerated in acccessory mode. To fix the original problem without breaking other
devices, we can simply remove assumptions about if or when "set configuration"
will be received. Now we simply remain switch USB configuration to accessory mode
when we receive the "start accessory" command, and remain there until the existing
10 second timeout expires.
Bug:
13393825
Change-Id: I4c9e3423185bd7252a907e4568d9e3ff06044b7d
Mike Lockwood [Wed, 19 Mar 2014 23:56:18 +0000 (16:56 -0700)]
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
This reverts commit
fbd5521fb5e94fad066e21b9f91f4782afe71660.
This change broke support for the 2011 ADK board, which never sends a "set configuration"
command before "accessory start". So we revert this change and will replace it with a better fix.
Bug:
13535051
Bug:
13393825
Change-Id: Icd870d7ff6daff1567e04d93907f70f5d7e37884
Vinit Deshapnde [Thu, 20 Mar 2014 19:31:42 +0000 (19:31 +0000)]
am
52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit '
52bc363cf3a7de8431cfbb370f0fd3adeecaed52':
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
Vinit Deshapnde [Thu, 20 Mar 2014 19:26:44 +0000 (19:26 +0000)]
Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
Baligh Uddin [Thu, 20 Mar 2014 19:09:09 +0000 (19:09 +0000)]
am
ecf3c574: (-s ours) am
826f3647: (-s ours) am
d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ecf3c574a8cedd3b104b41623d192d61cb039710':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 19:02:28 +0000 (19:02 +0000)]
am
826f3647: (-s ours) am
d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
826f3647a4a44ffcf154c63fe204a7787b96a657':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 18:37:14 +0000 (18:37 +0000)]
am
d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
d16505da8676b54dd354da278b1888f28257028b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 18:32:35 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Marco Nelissen [Thu, 20 Mar 2014 18:11:16 +0000 (11:11 -0700)]
am
072e1da2: am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
072e1da26e80adb4009d063428c2ef8fb65c3d6c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 18:06:41 +0000 (11:06 -0700)]
am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
b17cf207372268d91177de7efa692b2483785991':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:54:38 +0000 (10:54 -0700)]
am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
9ee72b65436242ab4f8f4ceb904ea5078779416c':
Verify certificates
OSDN Git Service
