OSDN Git Service
Scott Main [Tue, 25 Mar 2014 23:53:24 +0000 (23:53 +0000)]
am
ad52a4ce: Merge "fix broken link" into klp-docs
* commit '
ad52a4ce9964508288316bfc5fb52833bf70b6a5':
fix broken link
Scott Main [Tue, 25 Mar 2014 23:46:59 +0000 (23:46 +0000)]
Merge "fix broken link" into klp-docs
Scott Main [Tue, 25 Mar 2014 23:45:40 +0000 (16:45 -0700)]
fix broken link
Change-Id: If2f19d5c65372313860176808a3a0105f9fa118e
Ricardo Cervera [Tue, 25 Mar 2014 21:13:54 +0000 (21:13 +0000)]
am
39aed838: docs: Amend SDK release notes for 22.6.2
* commit '
39aed838f505314fe6f1947e39de79de2f84ba40':
docs: Amend SDK release notes for 22.6.2
Ricardo Cervera [Tue, 25 Mar 2014 20:50:55 +0000 (13:50 -0700)]
docs: Amend SDK release notes for 22.6.2
Change-Id: I76e46ec5abf7e9f2203eeaef723d06597565d4c9
Ricardo Cervera [Tue, 25 Mar 2014 20:27:51 +0000 (20:27 +0000)]
am
825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
* commit '
825280d2ac85cef7ec1f096b02006c26dba0374a':
docs: Added release notes for Android SDK 22.6.2
Ricardo Cervera [Tue, 25 Mar 2014 20:22:58 +0000 (20:22 +0000)]
Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
Ricardo Cervera [Wed, 19 Mar 2014 21:48:37 +0000 (14:48 -0700)]
docs: Added release notes for Android SDK 22.6.2
Change-Id: I6c8abb75b10cf4bc983f67954c169c7ac9ab9b1c
Eino-Ville Talvala [Tue, 25 Mar 2014 19:01:45 +0000 (19:01 +0000)]
am
ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
* commit '
ecad0541a6e90b98ad96456c4e6992121ee8a789':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Eino-Ville Talvala [Tue, 25 Mar 2014 18:57:08 +0000 (18:57 +0000)]
Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
Craig Mautner [Tue, 25 Mar 2014 17:58:54 +0000 (17:58 +0000)]
am
6f955df8: am
550b44d1: am
f4644189: am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
6f955df8e632aabeef312d488b7ebbad25d8a2d8':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Scott Main [Tue, 25 Mar 2014 17:54:35 +0000 (17:54 +0000)]
am
837a4885: fix links and add note that adb forward must be repeated bug:
13474515 bug:
13576843
* commit '
837a4885978dd29cda4b8309051284af5a45f41c':
fix links and add note that adb forward must be repeated bug:
13474515 bug:
13576843
Craig Mautner [Tue, 25 Mar 2014 17:48:38 +0000 (17:48 +0000)]
am
550b44d1: am
f4644189: am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
550b44d1884c5f65187dbc8bf8d4e6090f302a7b':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Scott Main [Tue, 25 Mar 2014 17:39:28 +0000 (10:39 -0700)]
fix links and add note that adb forward must be repeated
bug:
13474515
bug:
13576843
Change-Id: I808efb5fa1fae2280b4447ad0278ea1d4428b5b6
Craig Mautner [Tue, 25 Mar 2014 17:42:38 +0000 (10:42 -0700)]
am
f4644189: am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
f4644189f665f221e8033587811e58f12e2ccc86':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:36:04 +0000 (10:36 -0700)]
am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:29:48 +0000 (10:29 -0700)]
am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
02c7ba73e8733def289535b6d13dc6a504a0443f':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:29:10 +0000 (17:29 +0000)]
am
2b2395f3: Merge "Don\'t wait for finishing animation when second display is disconnected" into klp-dev
* commit '
2b2395f39a7a3b271f7d1072acec64db1554694e':
Don't wait for finishing animation when second display is disconnected
Craig Mautner [Tue, 25 Mar 2014 17:22:56 +0000 (10:22 -0700)]
am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
41bb0637ca430808ab40a0300467ea58ae0a05c3':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:22:55 +0000 (17:22 +0000)]
Merge "Don't wait for finishing animation when second display is disconnected" into klp-dev
Koji Fukui [Fri, 14 Mar 2014 12:20:21 +0000 (21:20 +0900)]
Don't wait for finishing animation when second display is disconnected
Basically WindowManagerService wait for finishing animation when
a window is removed. But when second display is disconnected, windows
on second display can't be shown even if animation is waited for.
On the contrary, it keeps on waiting for finishing the animation
in special case.
With this fix windows are immediately removed without waiting for
animation when second display is disconnected.
(Cherry picked from aosp
39f7068ed903f747d6885117dc1bac69f626ae91)
Change-Id: I1354c193c04db394a21a11c174e10c8e7da17a0e
Fixes bug: b/
13632129
Craig Mautner [Tue, 25 Mar 2014 17:04:07 +0000 (10:04 -0700)]
am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
76e85eec845ff3688e6fd5b7bafbb5934530df4b':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:58:17 +0000 (09:58 -0700)]
am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
3bc9971d707839f2d26e601082d654242295002d':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:55:03 +0000 (16:55 +0000)]
am
81e094d7: Merge "Move task to top in window manager." into klp-dev
* commit '
81e094d76b9220e335edc24599919f8cd0f5d317':
Move task to top in window manager.
Baligh Uddin [Tue, 25 Mar 2014 16:55:01 +0000 (16:55 +0000)]
am
89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8907801268b62dfadaf8c9f73d60ffaea6dbf904':
Import translations. DO NOT MERGE
Craig Mautner [Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)]
am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
95d6e32bc3c5382740a6bb418f77cf7147d833f7':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:48:38 +0000 (16:48 +0000)]
Merge "Move task to top in window manager." into klp-dev
Craig Mautner [Tue, 25 Mar 2014 16:48:27 +0000 (09:48 -0700)]
am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
86f9a93e20bf33b9f5152592f4781bd253be8643':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Baligh Uddin [Tue, 25 Mar 2014 16:47:23 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Craig Mautner [Tue, 25 Mar 2014 16:43:40 +0000 (16:43 +0000)]
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
Scott Main [Tue, 25 Mar 2014 10:06:36 +0000 (10:06 +0000)]
am
52f449fd: fix size and behavior of video thumbnail when flash not available
* commit '
52f449fd5a999aea77fa8df3628af7845d0cfcef':
fix size and behavior of video thumbnail when flash not available
Scott Main [Tue, 25 Mar 2014 06:23:22 +0000 (23:23 -0700)]
fix size and behavior of video thumbnail when flash not available
Change-Id: Ifc5eae0f9e42cc16b0daab9e715ff885388cf91c
Ricardo Cervera [Tue, 25 Mar 2014 00:16:55 +0000 (00:16 +0000)]
am
399b9994: docs: Added release notes for Google APIs System Image v4.
* commit '
399b99940e68eec11de1d0a23df67740ac3fdbd4':
docs: Added release notes for Google APIs System Image v4.
Ricardo Cervera [Tue, 25 Mar 2014 00:01:35 +0000 (17:01 -0700)]
docs: Added release notes for Google APIs System Image v4.
Change-Id: Iac43dc318de44d19d48b0977c951cbc600b5c396
Matthew Williams [Mon, 24 Mar 2014 22:39:21 +0000 (22:39 +0000)]
am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
bb87ac7f9733ca9b490cb34e8a675dba083a57b7':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Scott Main [Mon, 24 Mar 2014 22:14:29 +0000 (22:14 +0000)]
am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
779174ea182908e18d821656fc408697485a1f7a':
update wear homepage with layout fixes and replace GIFs with smaller versions
Matthew Williams [Mon, 24 Mar 2014 21:42:06 +0000 (14:42 -0700)]
DO NOT MERGE: Downgrade expedited to normal on reschedule.
bug:
12033540
Expedited was previously tracked by a redundant internal variable, ostensibly
as an optimisation. This variable could differ from the value in the bundle
depending on how the operation is initialised, which led to confusion. Now an
expedited sync will only be treated as such on its first execution.
Change-Id: Ibfc4e9e49b86c82f2364a6ef55f887705a053eb6
Scott Main [Mon, 24 Mar 2014 20:53:24 +0000 (13:53 -0700)]
update wear homepage with layout fixes and replace GIFs with smaller versions
Change-Id: I2e0b4efed83a4de7e095ece18d3c73634a23f964
Baligh Uddin [Mon, 24 Mar 2014 16:46:08 +0000 (09:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0b32878886c66eb9fdd22bf332786e140d334533
Auto-generated-cl: translation import
Selim Cinek [Mon, 24 Mar 2014 16:25:09 +0000 (16:25 +0000)]
am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
c41853cee89b391cd2d4d93205ea69c746ccfa4c':
Fixed wallpaper bug where wrong size was taken when cropping
Selim Cinek [Mon, 24 Mar 2014 12:53:06 +0000 (13:53 +0100)]
Fixed wallpaper bug where wrong size was taken when cropping
When cropping, the selected area of the image was incorrectly
cropped to the size of the view instead of the size of the image
Bug:
13617446
Change-Id: If54a0891fa2cdeee70ba63752874f1543d401701
Craig Mautner [Thu, 20 Mar 2014 02:48:38 +0000 (19:48 -0700)]
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Previous fix to keep non-show-when-locked windows hid dialogs from
activities that had asked to be show-when-locked. That was too
restrictive.
Fixes bug
13225149.
Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4
Gabriel Peal [Sat, 22 Mar 2014 23:35:00 +0000 (23:35 +0000)]
am
83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '
83da75d938d519bbcffb9c3b52802fd2daad4aee':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
Gabriel Peal [Wed, 19 Mar 2014 23:41:49 +0000 (16:41 -0700)]
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
The first set of these APIs is for telephony:
Added some APIs to ITelephony and created a first party framework for them
toggleHold()
merge()
mute(boolean mute)
playDtmfTone(char digit, boolean timedShortCode)
stopDtmfTone()
swap()
addListener(ITelephonyListener listener)
removeListener(ITelephonyListener listener)
Bug:
13302451
Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6
Igor Murashkin [Wed, 19 Mar 2014 01:14:41 +0000 (18:14 -0700)]
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Bug:
12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
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: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 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: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: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:05:40 +0000 (19:05 +0000)]
am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
1a70f391608e82fcc5550c76ccc7bf8bac5bbc10':
Change wallpaper sizing
Unsuk Jung [Fri, 21 Mar 2014 19:01:08 +0000 (19:01 +0000)]
Merge "Change wallpaper sizing" into klp-dev
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
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
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)
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: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: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
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
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 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
Marco Nelissen [Thu, 20 Mar 2014 17:51:35 +0000 (10:51 -0700)]
am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
665b07579aa2a74bb5425d543892da40d78b7ef8':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:47:34 +0000 (10:47 -0700)]
am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
81fbdade8db4117157ea48602be121e6cf5597dd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:27:58 +0000 (10:27 -0700)]
resolved conflicts for merge of
534f3e94 to jb-mr1-dev
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
Craig Mautner [Thu, 20 Mar 2014 17:08:04 +0000 (10:08 -0700)]
Move task to top in window manager.
In certain situations it was possible for a task to move to the top
in activity manager but not in window manager. This resulted in
the task appearing behind the launcher icons.
Fixes bug
13410184.
Change-Id: If0582b395e126a8aff70a0e4c64b731083c6ae8a
Marco Nelissen [Thu, 20 Mar 2014 17:04:23 +0000 (10:04 -0700)]
am
a3337bc7: Merge "Verify certificates" into jb-dev
* commit '
a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 16:58:36 +0000 (16:58 +0000)]
Merge "Verify certificates" into jb-dev
Adam Powell [Thu, 20 Mar 2014 00:35:25 +0000 (17:35 -0700)]
Update contextual asset bar assets to avoid 9-patch artifacts
Asset drop from UX
Bug
11879853
Change-Id: I8190340900a16ae41135ec1231e36e959603e165
Adam Koch [Thu, 20 Mar 2014 09:31:00 +0000 (09:31 +0000)]
am
6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs
* commit '
6398a86f1b6ce84effc1417b8b99216e3093af48':
Point bitmaps training class to new samples directory.
Scott Main [Thu, 20 Mar 2014 09:30:51 +0000 (09:30 +0000)]
am
a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
* commit '
a32c43761e5a101efbbb9183f4421ba40f4c75fb':
update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
Adam Koch [Thu, 20 Mar 2014 07:12:06 +0000 (07:12 +0000)]
Merge "Point bitmaps training class to new samples directory." into klp-docs
OSDN Git Service
