summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge "Move functor GL setup to just before functor" into klp-devChris Craik2013-08-261-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Move functor GL setup to just before functorChris Craik2013-08-261-6/+9
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10399469 Because the stencil setup can issue draws, it *must* come before the GL state setup. Change-Id: I52a36213549fc60b091a90cbb923a1f0d35f9a65
* | | | | | | | | | | | | | Merge "Use transient state to preserve accessibility focus in ListView" into ↵Alan Viverette2013-08-262-78/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev
| * | | | | | | | | | | | | | Use transient state to preserve accessibility focus in ListViewAlan Viverette2013-08-222-78/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes several stray calls to clearAccessibilityFocus() that were preventing temporarily detached views from retaining accessibility focus. BUG: 10089858 Change-Id: Ieb88a6cd14fe1069ebeeb78bc0edba7a10131f5b
* | | | | | | | | | | | | | | Merge "Add auto-scrolling in ListPopupWindow drag-to-open mode" into klp-devAlan Viverette2013-08-262-2/+784
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add auto-scrolling in ListPopupWindow drag-to-open modeAlan Viverette2013-08-212-2/+784
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 9437139 Change-Id: I836c60b48b31d0a5cc32eef903da9dc0b9b9d8a5
* | | | | | | | | | | | | | | | Merge "Reconcile drag-to-open and touch event interception" into klp-devAlan Viverette2013-08-263-26/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Reconcile drag-to-open and touch event interceptionAlan Viverette2013-08-223-26/+79
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes behavior such that dragging on a Spinner that's inside of a ScrollView will only scroll after a tap delay. BUG: 10442971 Change-Id: I9fa9c5f0cf99e0cd158f52b6fa7a109ce1b6b8b1
* | | | | | | | | | | | | | | | Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-devLeon Scroggins III2013-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix unpremul setting in BitmapRegionDecoder.Leon Scroggins III2013-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requireUnpremultiplied should be the opposite of BitmapOptions. inPremultiplied, as in BitmapFactory. Fixes CTS tests. BUG=10490308 Change-Id: I21b8c057ccdc9b35c69730a7fe8c3b6802ee6dd8
* | | | | | | | | | | | | | | | | Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-devEdward Jee2013-08-264-0/+830
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Enables AT+ANDROID command in Bluetooth HFP.Edward Jee2013-08-234-0/+830
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds another vendor-specific command AT+ANDROID in Bluetooth Hands-Free Profile. And creates an API function that sends an unsolicited result code +ANDROID . Bug: 8736189 Change-Id: I4757c410d31b97511c92f66d71035eb929f9fd29
* | | | | | | | | | | | | | | | | | Merge "camera2: CameraDevice#configureOutputs now deletes unused streams" ↵Igor Murashkin2013-08-261-14/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev
| * | | | | | | | | | | | | | | | | | camera2: CameraDevice#configureOutputs now deletes unused streamsIgor Murashkin2013-08-261-14/+52
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10461554 Change-Id: I3dc48e434d83b18909d25723cc8855c82e1072bc
* | | | | | | | | | | | | | | | | | am 032c5630: am bb6b1ff0: am d608d5e3: add jb mr2 uses-feature items to ↵Scott Main2013-08-263-16/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference page and fix a couple doc bugs * commit '032c56305eb69fcbf0d0baa8dd0276d3821bc0b7': add jb mr2 uses-feature items to reference page and fix a couple doc bugs
| * | | | | | | | | | | | | | | | | am bb6b1ff0: am d608d5e3: add jb mr2 uses-feature items to reference page ↵Scott Main2013-08-263-16/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and fix a couple doc bugs * commit 'bb6b1ff012edac329bf4c3e7121651220259e64c': add jb mr2 uses-feature items to reference page and fix a couple doc bugs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d608d5e3: add jb mr2 uses-feature items to reference page and fix a ↵Scott Main2013-08-263-16/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | couple doc bugs * commit 'd608d5e3fa08cd9935f03144b192ea5934c715a8': add jb mr2 uses-feature items to reference page and fix a couple doc bugs
| | | * | | | | | | | | | | | | | | | | add jb mr2 uses-feature items to reference page and fix a couple doc bugsScott Main2013-08-263-16/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b95d98b083af3dad55f19a9e68f69460d4e6e57
* | | | | | | | | | | | | | | | | | | | Merge "Add new logging for system bar window state." into klp-devJohn Spurlock2013-08-263-6/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add new logging for system bar window state.John Spurlock2013-08-263-6/+36
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And re-enable PhoneStatusBar dump output in bugreports. Bug:10488453 Change-Id: If39b32e82dee59f3c166c5a948d379030da0ea01
* | | | | | | | | | | | | | | | | | | | Merge "Better aidl generated dependency" into klp-devYing Wang2013-08-261-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Better aidl generated dependencyYing Wang2013-08-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if an imported aidl file has been deleted or moved, the generated dependency file still contains the stale file name, and make will fail with "No rule to make target <the deleted/moved file>". This change uses technique described in section "Automatic Dependency Generation", Chapter 8 of "Managing Projects with GNU Make (3d Edition)". The same technique is used by the Android platform build system to generate C/C++ header dependencies. Bug: 10459179 Change-Id: Ib0c01a4234ef1af994487fdc846cdf8d13a675f6
* | | | | | | | | | | | | | | | | | | | | am 59adfca6: (-s ours) am 33283a97: am dce52cdb: DO NOT MERGE: MDST is not ↵Wink Saville2013-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ready until connected to DcTracker. * commit '59adfca65dc35274684831577ec41046b418a688': DO NOT MERGE: MDST is not ready until connected to DcTracker.
| * | | | | | | | | | | | | | | | | | | | am 33283a97: am dce52cdb: DO NOT MERGE: MDST is not ready until connected to ↵Wink Saville2013-08-262-5/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DcTracker. * commit '33283a9726a29b5a79d7885fe194d52c0ebe7450': DO NOT MERGE: MDST is not ready until connected to DcTracker.
| | * | | | | | | | | | | | | | | | | | | am dce52cdb: DO NOT MERGE: MDST is not ready until connected to DcTracker.Wink Saville2013-08-262-5/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dce52cdbf1eab8bd979bf4676973699c39f7b32e': DO NOT MERGE: MDST is not ready until connected to DcTracker.
| | | * | | | | | | | | | | | | | | | | | | DO NOT MERGE: MDST is not ready until connected to DcTracker.Wink Saville2013-08-162-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the system becomes loaded the PhoneApp can be delayed significantly and a call to setEnableFailFastMobileData may not occur because the channel between the MobileDataStateTracker (MDST) and DcTracker (DCT) is not connected. Solution: Add a isReady to MDST and isMobileDataStateTrackerReady to ConnectivityService and call it from isMobileOk. Bug: 10351868 Change-Id: I92f9d58121b88186b636cd71c2fd2ef9a28f7cf6
* | | | | | | | | | | | | | | | | | | | | | am 4e6e1749: am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally ↵Wink Saville2013-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if mobile data is not supported. * commit '4e6e1749eda5a2c84538b0064fdc219aab3605e1': In isMobileOk don't execute finally if mobile data is not supported.
| * | | | | | | | | | | | | | | | | | | | am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile ↵Wink Saville2013-08-261-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data is not supported. * commit 'b42beeafcf8117fb4ac41dd91fc9e6113c0d6aae': In isMobileOk don't execute finally if mobile data is not supported.
| | * | | | | | | | | | | | | | | | | | | am e63411f2: In isMobileOk don\'t execute finally if mobile data is not ↵Wink Saville2013-08-261-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported. * commit 'e63411f28b81a0c9f7fee1d0b3a0765606c9a6f2': In isMobileOk don't execute finally if mobile data is not supported.
| | | * | | | | | | | | | | | | | | | | | In isMobileOk don't execute finally if mobile data is not supported.Wink Saville2013-08-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the early return outside the try {} finally so we don't call setEnableFailFastMobileData(DctContants.DISABLED). Otherwise referencing counting is wrong and an exception is thrown in DcTrackerBase. Bug: 10304904 Change-Id: I5ba5121e473bada9f3daa8d6f3d3577cec8212fc
* | | | | | | | | | | | | | | | | | | | | Merge "Enhancement for OnInfo callback on DRM Framework" into klp-devJeff Tinker2013-08-262-14/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Enhancement for OnInfo callback on DRM FrameworkTakeshi Aimi2013-08-232-14/+70
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DRM framework, plugins can transmit DrmInfoEvent to Java layer. Although DrmInfoEvent has several entries, current implementation can only convey integer and String. This change enables plugins uto propagate a hashmap to Java layer. The hashmap can have one or more Strings and one byte array as value. Changes are made by Sony Corporation. bug: 10459159 Change-Id: I5f2bfb43b676863ef4d220fd4ef1e48777e92752 (cherry picked from commit 84a5b5cab40711e20ba70c5ed4dfeab6b558b53b)
* | | | | | | | | | | | | | | | | | | | Make xxhdpi adb icon consistent with other densities.Daniel Sandler2013-08-261-0/+0
| |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10487353 Change-Id: I50441587988d36e94cfb453ab9706b0ae46b066b
* | | | | | | | | | | | | | | | | | | Fix docs build.Ying Wang2013-08-231-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3299e59fd90141fee324129ff3b251bdf8f60f10
* | | | | | | | | | | | | | | | | | | Merge "Add setting to disable keyguard widgets" into klp-devJim Miller2013-08-243-16/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add setting to disable keyguard widgetsJim Miller2013-08-233-16/+105
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows disabling keyguard widgets through Settings. On new devices, the setting is turned off by default. If the user currently has widgets in keyguard, then we keep them and re-enable the setting. Change-Id: I7258921231d439925ac8627105710efa99309094
* | | | | | | | | | | | | | | | | | Merge "Docs changes pursuant to API review feedback." into klp-devJeff Brown2013-08-245-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Docs changes pursuant to API review feedback.Jeff Brown2013-08-235-12/+13
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74c51791192f7fefad4e299d25c91438cbf6ab73
* | | | | | | | | | | | | | | | | | Merge "Fix leaks of JNI objects in the local reference table" into klp-devdestradaa2013-08-241-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix leaks of JNI objects in the local reference tabledestradaa2013-08-231-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I769502f8b13e0025707abdf98c24f2cac0604602
* | | | | | | | | | | | | | | | | | Merge "Add garbage collection hooks" into klp-devTim Murray2013-08-232-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add garbage collection hooksTim Murray2013-08-232-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 10428172 Change-Id: I6365aa58bbc99aa134e1f261a5819e07a7d70fb0
* | | | | | | | | | | | | | | | | | | Merge "wifi-display: add certification options" into klp-devChong Zhang2013-08-2314-17/+535
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | wifi-display: add certification optionsChong Zhang2013-08-2314-17/+535
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When certification mode is enabled: - Pass wfd session info to wifi display settings - Allow sink to connect to source - Add interface in display manager for pausing/resuming session - Add interface in WifiP2pManager for setting lc, oc and starting autonomous GO Note that we're compliant regardless of certification mode, but some confusing options (eg. allowing incoming connection from sink) we want to hide when not being tested. Bug: 9371882 Change-Id: Icc7dcae4e046453796cfa03f5f197055fabf234b
* | | | | | | | | | | | | | | | | | | Merge "Return EXIF thumbnails when available." into klp-devJeff Sharkey2013-08-233-12/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Return EXIF thumbnails when available.Jeff Sharkey2013-08-233-12/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new ExifInterface method to extract the thumbnail range from a larger image file, and use that to return an AssetFileDescriptor. When decoding an AssetFileDescriptor thumbnail with offsets, read out the raw data entirely, since Skia uses lseek() aggressively. Bug: 10412208 Change-Id: I7906cdf82c0c3794cec7043c801a86f66efeb143
* | | | | | | | | | | | | | | | | | | | Merge "Add CancellationSignal support to file operations." into klp-devJeff Sharkey2013-08-2313-98/+625
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add CancellationSignal support to file operations.Jeff Sharkey2013-08-2313-98/+625
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since ContentProvider file operations can end up doing substantial network I/O before returning the file, allow clients to cancel their file requests with CancellationSignal. Ideally this would only be needed for openFile(), but ContentResolver heavily relies on openAssetFile() and openTypedAssetFile() for common cases. Also improve documentation to mention reliable ParcelFileDescriptors and encourage developers to move away from "rw" combination modes, since they restrict provider flexibility. Mention more about places where pipes or socket pairs could be returned. Improve DocumentsContract documentation. Bug: 10329944 Change-Id: I49b2825ea433eb051624c4da3b77612fe3ffc99c
* | | | | | | | | | | | | | | | | | | am f1fea527: am be2f72a1: am 2c30fe8a: Doc change: fix typo in policy docs.Dirk Dougherty2013-08-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1fea52744eeaeed37a674c3fc94b7e1dbcda341': Doc change: fix typo in policy docs.
| * | | | | | | | | | | | | | | | | | am be2f72a1: am 2c30fe8a: Doc change: fix typo in policy docs.Dirk Dougherty2013-08-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be2f72a187cfe15adb2760c05e78ca9905f8bb8d': Doc change: fix typo in policy docs.