OSDN Git Service
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: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: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: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: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
Unsuk Jung [Fri, 21 Mar 2014 19:01:08 +0000 (19:01 +0000)]
Merge "Change wallpaper sizing" into klp-dev
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
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: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 02:57:09 +0000 (11:57 +0900)]
Fix broken build
Change-Id: Ia7d207f7937e29cf48dce30d8c5a91f50c9e7d4c
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: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: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: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: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: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: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
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
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
Adam Koch [Thu, 20 Mar 2014 16:59:23 +0000 (16:59 +0000)]
am
5a510a2c: am
6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs
* commit '
5a510a2c3e0ec5f2e60577c7a57e60c2101ee354':
Point bitmaps training class to new samples directory.
Scott Main [Thu, 20 Mar 2014 16:59:19 +0000 (16:59 +0000)]
am
e02d5a20: am
a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
* commit '
e02d5a20ede8a6ac46e7b60cc0b258d42e224087':
update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
Wei Wang [Thu, 20 Mar 2014 16:59:13 +0000 (16:59 +0000)]
am
13bd8577: am
c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050 Cherrypick from master to fix b/
13289050
* commit '
13bd85772f6279d14303ec3a18615613c3722844':
DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050 Cherrypick from master to fix b/
13289050
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
Jinsuk Kim [Fri, 28 Feb 2014 08:41:17 +0000 (17:41 +0900)]
Add HDMI-CEC service
This CL adds a system service handling HDMI-CEC protocol. The service
is equipped with the capability sending/receiving HDMI-CEC messages
Not all the messages are in place. Currently it has messages to support
a few features only, as follows:
- One touch play
- System information
- Routing control (partially - active source status maintenance only)
- Device OSD transfer
- Power status
It will be extended to cover the wider usages in the follow up CLs.
The CEC standard version referenced in the implementation is 1.3a.
Change-Id: Ifed0b02f52ebf098eddb3bd0987efbf353b7e8fe
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
Adam Koch [Wed, 26 Feb 2014 03:00:20 +0000 (14:00 +1100)]
Point bitmaps training class to new samples directory.
Change-Id: I5c5ca9619fe47c79066db846cbbee1b26d71826e
Scott Main [Wed, 19 Mar 2014 18:51:05 +0000 (11:51 -0700)]
update to wear docs.
includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414
and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
Change-Id: I035b8db9b266e0af16fe30b3f30846608a3b69a5
Wei Wang [Thu, 20 Mar 2014 03:41:47 +0000 (03:41 +0000)]
am
c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050 Cherrypick from master to fix b/
13289050
* commit '
c0384b6b18617cc395814c5b20077955a185e392':
DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050 Cherrypick from master to fix b/
13289050
Wei Wang [Thu, 20 Mar 2014 03:36:45 +0000 (03:36 +0000)]
am
15a18d07: am
da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '
15a18d07acc57d465e9d67bb28010912bb9ad15f':
DO NOT MERGE: Add status callback for start/stop advertising.
Wei Wang [Thu, 20 Mar 2014 03:32:17 +0000 (03:32 +0000)]
am
da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '
da084104eb768f4472b7988b77a4f2b7e3f170d8':
DO NOT MERGE: Add status callback for start/stop advertising.
Wei Wang [Wed, 19 Mar 2014 22:47:12 +0000 (15:47 -0700)]
DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050
Cherrypick from master to fix b/
13289050
Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
Wei Wang [Thu, 20 Mar 2014 03:27:46 +0000 (03:27 +0000)]
Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
Jim Miller [Thu, 20 Mar 2014 02:47:09 +0000 (02:47 +0000)]
am
8e69abf8: am
46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
* commit '
8e69abf8c62452e6e9bcd254a55a2d80c8ef5b3d':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
Jim Miller [Thu, 20 Mar 2014 02:47:04 +0000 (02:47 +0000)]
am
37050124: am
a413a4ae: Fix the build. DO NOT MERGE
* commit '
370501243685a39a52b6e389b97711b906d2d4f8':
Fix the build. DO NOT MERGE
Jim Miller [Thu, 20 Mar 2014 02:30:14 +0000 (02:30 +0000)]
am
46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
* commit '
46e631178e3420fee182e7d9d1ddfdbca9355bc1':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
Jim Miller [Tue, 10 Dec 2013 01:38:05 +0000 (17:38 -0800)]
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
This fixes a bug where an allocated DeathRecipient in WindowManagerService
was holding a reference to keyguard binder interface after a call to
linkToDeath() without a matchin unlinkToDeath().
It was causing the keyguard side of the binder interface to stick around,
which in tern prevented the keyguard side from releasing its references.
The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.
Fixes bug
11982048
Change-Id: I6959816b819ba953512c53675162195cbf1e0653
Michael Wright [Thu, 20 Mar 2014 01:55:15 +0000 (01:55 +0000)]
Merge "Add idc config option for handling key repeats" into klp-modular-dev
Jim Miller [Thu, 20 Mar 2014 01:49:31 +0000 (01:49 +0000)]
am
a413a4ae: Fix the build. DO NOT MERGE
* commit '
a413a4ae3280be6c45e84e85d7be3379a5cb51e4':
Fix the build. DO NOT MERGE
Jim Miller [Thu, 20 Mar 2014 01:37:36 +0000 (18:37 -0700)]
Fix the build. DO NOT MERGE
Change-Id: Ic34e351f86cfb8299b666e860c067d905cce6747
Chris Craik [Thu, 20 Mar 2014 01:14:44 +0000 (01:14 +0000)]
am
7c9bd98a: am
89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
* commit '
7c9bd98a4bb0aa6954d5f612c197d03f309980f0':
Fix projection offset caching - DO NOT MERGE
Jim Miller [Thu, 20 Mar 2014 01:14:40 +0000 (01:14 +0000)]
am
375ff2c4: am
2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '
375ff2c4a7b42d6dfd333e0ffa351be88fdab034':
Attempt to fix a bug where SIM progress dialog gets stuck.
Chris Craik [Thu, 20 Mar 2014 01:08:45 +0000 (01:08 +0000)]
am
89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
* commit '
89513ee544cd6373496179758e09954af0ba217d':
Fix projection offset caching - DO NOT MERGE
Jim Miller [Thu, 20 Mar 2014 01:08:43 +0000 (01:08 +0000)]
am
2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '
2598fbd71a2109ab307d32935a13fa1eab150e8d':
Attempt to fix a bug where SIM progress dialog gets stuck.
Chris Craik [Thu, 20 Mar 2014 01:04:57 +0000 (01:04 +0000)]
Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
Jim Miller [Thu, 20 Mar 2014 01:04:12 +0000 (01:04 +0000)]
Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
Wei Wang [Wed, 12 Mar 2014 05:22:41 +0000 (22:22 -0700)]
DO NOT MERGE: Add status callback for start/stop advertising.
Cherrypick from master to fix b/
13289050
Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
core/java/android/bluetooth/BluetoothGatt.java
Victoria Lease [Wed, 19 Mar 2014 22:36:38 +0000 (22:36 +0000)]
Victoria Lease [Wed, 19 Mar 2014 22:32:12 +0000 (22:32 +0000)]
Victoria Lease [Wed, 19 Mar 2014 22:27:06 +0000 (22:27 +0000)]
Victoria Lease [Wed, 19 Mar 2014 22:21:09 +0000 (15:21 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:14:07 +0000 (15:14 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:08:32 +0000 (15:08 -0700)]
OSDN Git Service
