OSDN Git Service
Tim Kilbourn [Fri, 14 Mar 2014 20:50:40 +0000 (20:50 +0000)]
am
ec033943: am
9873e099: am
55740325: Merge "Add leanback device features." into klp-modular-dev
* commit '
ec0339437869ebb42a67a2811dc6de31239d5d62':
Add leanback device features.
Tim Kilbourn [Fri, 14 Mar 2014 20:47:03 +0000 (20:47 +0000)]
am
9873e099: am
55740325: Merge "Add leanback device features." into klp-modular-dev
* commit '
9873e099c32513cdb28c3ffb8c2306ad87f0b052':
Add leanback device features.
Tim Kilbourn [Fri, 14 Mar 2014 20:42:18 +0000 (20:42 +0000)]
am
55740325: Merge "Add leanback device features." into klp-modular-dev
* commit '
557403250b9accf4f17ab87f636f1722949960a3':
Add leanback device features.
Tim Kilbourn [Fri, 14 Mar 2014 20:38:51 +0000 (20:38 +0000)]
Merge "Add leanback device features." into klp-modular-dev
Winson Chung [Fri, 14 Mar 2014 20:34:27 +0000 (20:34 +0000)]
Merge "Fixing memory leaks related to Tasks holding onto their callbacks."
Christopher Tate [Fri, 14 Mar 2014 19:16:07 +0000 (19:16 +0000)]
Merge "Make RegisteredServicesCache understand ASEC-based updates"
Victoria Lease [Fri, 14 Mar 2014 18:01:38 +0000 (18:01 +0000)]
am
c2d934d7: am
f8ce43ea: am
1365d982: am
4cde7734: Merge "remove unnecessary switchUser call"
* commit '
c2d934d7e87b9eb8cbb15ccc0c39b13ad32de460':
remove unnecessary switchUser call
Victoria Lease [Fri, 14 Mar 2014 17:57:32 +0000 (17:57 +0000)]
am
f8ce43ea: am
1365d982: am
4cde7734: Merge "remove unnecessary switchUser call"
* commit '
f8ce43ea146cace780cb4f75348d4eca4526660a':
remove unnecessary switchUser call
Victoria Lease [Fri, 14 Mar 2014 17:54:32 +0000 (17:54 +0000)]
am
1365d982: am
4cde7734: Merge "remove unnecessary switchUser call"
* commit '
1365d98270e0a0a61d10743820e923aeff974b39':
remove unnecessary switchUser call
Ricardo Cervera [Fri, 14 Mar 2014 17:54:11 +0000 (17:54 +0000)]
am
d387206a: am
7890eeff: am
882ba89b: am
50694917: am
7e566239: Merge "docs: Updated Building your First App tutorial. Bug:
13429905" into klp-docs
* commit '
d387206a84a35b86663adb5bf00671cafbf6aee4':
docs: Updated Building your First App tutorial. Bug:
13429905
Joe Fernandez [Fri, 14 Mar 2014 17:54:07 +0000 (17:54 +0000)]
am
53edba8d: am
571c171e: am
58f019a6: am
8bb11153: am
f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs
* commit '
53edba8d5cae3ea385f64ee980399278bb5a76fd':
Doc change: Update developer video on home page carousel.
John Spurlock [Fri, 14 Mar 2014 17:54:03 +0000 (17:54 +0000)]
am
88f65e01: am
4108431b: am
28ac0c10: am
ad66c27b: am
6d9b034c: Fix typo in public logcat page.
* commit '
88f65e01d28c8f22d77624d1c8b264c761f3ac2a':
Fix typo in public logcat page.
Ricardo Cervera [Fri, 14 Mar 2014 17:54:00 +0000 (17:54 +0000)]
am
b063df4d: am
c12c92bb: am
784aab78: am
8714a343: am
ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit '
b063df4d27772aa9d71805acbb70b4473ad4b58d':
docs: Added step to get JDK to the Android Studio install instructions.
Katie McCormick [Fri, 14 Mar 2014 17:53:56 +0000 (17:53 +0000)]
am
e612874b: am
9c5c5a87: am
8e142bbb: am
b681794d: am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
e612874b4c684f3d466d76a2e1a75fec066108f5':
Doc update: new doc studio layout editor
John Spurlock [Fri, 14 Mar 2014 17:53:53 +0000 (17:53 +0000)]
am
dc28dc63: am
399cac5b: am
75985bbe: am
62826f55: am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
dc28dc63a7c04dcb87e257700a1d7aea40de0ce3':
Fix doc typos in AppOpsManager.java
JP Abgrall [Fri, 14 Mar 2014 17:53:49 +0000 (17:53 +0000)]
am
d47dc7c3: am
7238585e: am
4f261396: am
4ecd833e: am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
d47dc7c3bd1cf9fbc549141512bc75c43454ef7c':
ConnectivityService: add support to set TCP initial rwnd
Chad Brubaker [Fri, 14 Mar 2014 17:53:45 +0000 (17:53 +0000)]
am
ff9da494: am
4b59883a: am
7c2b1625: am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
ff9da494622a7f9358979509849ab94364d17706':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 17:53:41 +0000 (17:53 +0000)]
am
78a06696: am
90119082: am
358eaa78: am
fc1d0471: am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
78a06696b714dd97076b98a415aadcc174fe3af0':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 17:53:36 +0000 (17:53 +0000)]
am
1b2a09d4: (-s ours) am
d590516b: am
70a0ea0e: am
16858164: am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
1b2a09d4d42e7a2406ac9c25b7cedd8880f25643':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 17:53:33 +0000 (17:53 +0000)]
am
40716d95: (-s ours) am
63492522: (-s ours) am
46bfaa1b: (-s ours) am
a5a921e3: (-s ours) am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
40716d95ad377a76f14a89b90319e4e9650b5963':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 17:53:30 +0000 (17:53 +0000)]
am
32a9180a: am
f29a4981: am
d4981014: am
e5191aab: am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
32a9180a6c1ac12503aaf0d123c2bfff73349508':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 17:53:28 +0000 (17:53 +0000)]
am
5988ea8c: (-s ours) am
88768cc3: am
6adc9602: am
825dd9dd: am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
5988ea8c2278fb2d042d2ad2459fb647d962f71f':
Retain display when creating specialized contexts. (DO NOT MERGE)
Zhihai Xu [Fri, 14 Mar 2014 17:53:16 +0000 (17:53 +0000)]
am
86dbccae: (-s ours) am
6d3d6c4a: am
57080be9: am
bdd4c31a: am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
86dbccae5e3481892e0b9ea5de8d5d042d5cb1ba':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Narayan Kamath [Fri, 14 Mar 2014 17:53:05 +0000 (17:53 +0000)]
am
1abb7e0f: am
63938750: am
c0232642: am
629daddd: Merge "Fix layoutlib build."
* commit '
1abb7e0f3920b31cf216b99fc83231d80dfa7ca4':
Fix layoutlib build.
Victoria Lease [Fri, 14 Mar 2014 17:51:45 +0000 (10:51 -0700)]
am
4cde7734: Merge "remove unnecessary switchUser call"
* commit '
4cde773435074809672f9de6a47b26de902a83d1':
remove unnecessary switchUser call
Selim Cinek [Fri, 14 Mar 2014 17:50:11 +0000 (17:50 +0000)]
Merge "Fixed a crash when an image with an odd width/height was selected"
Selim Cinek [Fri, 14 Mar 2014 17:42:48 +0000 (18:42 +0100)]
Fixed a crash when an image with an odd width/height was selected
Due to an internal rounding in the renderer, the calculations
for the cropping area could be slightly offset, getting out
of the image boundaries. I sanitized the rect by ensuring they
are inside the image.
Bug:
12174629
Change-Id: Icc37790732ddd479631b898b23c05501d2dcd5be
Victoria Lease [Fri, 14 Mar 2014 17:48:00 +0000 (17:48 +0000)]
Merge "remove unnecessary switchUser call"
Jeff Brown [Fri, 14 Mar 2014 17:45:24 +0000 (17:45 +0000)]
am
f0e2988f: am
d8b17079: am
6ae4d53b: resolved conflicts for merge of
db3146c0 to klp-modular-dev
* commit '
f0e2988f873108ef4f03da9b6f8f5aef919ad329':
Fix power manager display wake lock bugs. (DO NOT MERGE)
Adam Powell [Fri, 14 Mar 2014 17:13:03 +0000 (17:13 +0000)]
am
6395c6a4: am
6cde6c75: am
41685ce9: am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
6395c6a4909749d54679be16411783ccaeba4372':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Ricardo Cervera [Fri, 14 Mar 2014 16:36:26 +0000 (16:36 +0000)]
am
7890eeff: am
882ba89b: am
50694917: am
7e566239: Merge "docs: Updated Building your First App tutorial. Bug:
13429905" into klp-docs
* commit '
7890eeff3adc862160b0da257a9524c540fc1fa7':
docs: Updated Building your First App tutorial. Bug:
13429905
Joe Fernandez [Fri, 14 Mar 2014 16:36:23 +0000 (16:36 +0000)]
am
571c171e: am
58f019a6: am
8bb11153: am
f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs
* commit '
571c171e6353cafbb98e767c2243a676c30cb8ea':
Doc change: Update developer video on home page carousel.
John Spurlock [Fri, 14 Mar 2014 16:36:20 +0000 (16:36 +0000)]
am
4108431b: am
28ac0c10: am
ad66c27b: am
6d9b034c: Fix typo in public logcat page.
* commit '
4108431b2e9d66c03daa204689e566b2c2598a95':
Fix typo in public logcat page.
Ricardo Cervera [Fri, 14 Mar 2014 16:36:17 +0000 (16:36 +0000)]
am
c12c92bb: am
784aab78: am
8714a343: am
ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit '
c12c92bbed3631dfaf9f5975e9b69a4bda300d12':
docs: Added step to get JDK to the Android Studio install instructions.
Katie McCormick [Fri, 14 Mar 2014 16:36:14 +0000 (16:36 +0000)]
am
9c5c5a87: am
8e142bbb: am
b681794d: am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
9c5c5a874a2453a9684ad56739f1a779f04e66db':
Doc update: new doc studio layout editor
John Spurlock [Fri, 14 Mar 2014 16:36:11 +0000 (16:36 +0000)]
am
399cac5b: am
75985bbe: am
62826f55: am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
399cac5b335b7a0a0c0146c6de8b653382caae6a':
Fix doc typos in AppOpsManager.java
JP Abgrall [Fri, 14 Mar 2014 16:36:08 +0000 (16:36 +0000)]
am
7238585e: am
4f261396: am
4ecd833e: am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
7238585e2eea81d416e3e98c283e99c3a9a38a1a':
ConnectivityService: add support to set TCP initial rwnd
Chad Brubaker [Fri, 14 Mar 2014 16:36:04 +0000 (16:36 +0000)]
am
4b59883a: am
7c2b1625: am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
4b59883afd498dd993263c95aa6db84cbe7c49b4':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 16:36:01 +0000 (16:36 +0000)]
am
90119082: am
358eaa78: am
fc1d0471: am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
9011908230e8c91a580b3ceec2e91059460fe5fb':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 16:35:59 +0000 (16:35 +0000)]
am
d590516b: am
70a0ea0e: am
16858164: am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
d590516b673e1a319099d8d009706d42a61877e0':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 16:35:56 +0000 (16:35 +0000)]
am
63492522: (-s ours) am
46bfaa1b: (-s ours) am
a5a921e3: (-s ours) am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
634925222ad4528984bf35b9b2316db9a227d51c':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 16:35:53 +0000 (16:35 +0000)]
am
f29a4981: am
d4981014: am
e5191aab: am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
f29a4981616c05f300b582eb09d48ed81c97dd37':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 16:35:51 +0000 (16:35 +0000)]
am
88768cc3: am
6adc9602: am
825dd9dd: am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
88768cc35789638f16b5a1a9c9de99eb4f6cd408':
Retain display when creating specialized contexts. (DO NOT MERGE)
Ricardo Cervera [Fri, 14 Mar 2014 16:32:38 +0000 (16:32 +0000)]
am
882ba89b: am
50694917: am
7e566239: Merge "docs: Updated Building your First App tutorial. Bug:
13429905" into klp-docs
* commit '
882ba89bf4aa6046b8f69460f1fe3ad87325e6d8':
docs: Updated Building your First App tutorial. Bug:
13429905
Joe Fernandez [Fri, 14 Mar 2014 16:32:36 +0000 (16:32 +0000)]
am
58f019a6: am
8bb11153: am
f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs
* commit '
58f019a646cb3eecdd3a085eade0824c89b1f80f':
Doc change: Update developer video on home page carousel.
John Spurlock [Fri, 14 Mar 2014 16:32:33 +0000 (16:32 +0000)]
am
28ac0c10: am
ad66c27b: am
6d9b034c: Fix typo in public logcat page.
* commit '
28ac0c10ae58a8253db16406b63c37a2ddf94ccf':
Fix typo in public logcat page.
Ricardo Cervera [Fri, 14 Mar 2014 16:32:30 +0000 (16:32 +0000)]
am
784aab78: am
8714a343: am
ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit '
784aab786c9e6f84d6ae58655f32ce6b3ccfc33f':
docs: Added step to get JDK to the Android Studio install instructions.
Katie McCormick [Fri, 14 Mar 2014 16:32:27 +0000 (16:32 +0000)]
am
8e142bbb: am
b681794d: am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
8e142bbbe19c2f485033eace102d2e950ceeb4fb':
Doc update: new doc studio layout editor
John Spurlock [Fri, 14 Mar 2014 16:32:24 +0000 (16:32 +0000)]
am
75985bbe: am
62826f55: am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
75985bbe2f04519cc663db7ad54e8e69f3eabfc0':
Fix doc typos in AppOpsManager.java
JP Abgrall [Fri, 14 Mar 2014 16:32:21 +0000 (16:32 +0000)]
am
4f261396: am
4ecd833e: am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
4f26139661b0039cff5e570975e6bf9b0bbce1af':
ConnectivityService: add support to set TCP initial rwnd
Chad Brubaker [Fri, 14 Mar 2014 16:32:18 +0000 (16:32 +0000)]
am
7c2b1625: am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
7c2b1625d66d3c80c313160f78c8bccd9499539e':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 16:32:15 +0000 (16:32 +0000)]
am
358eaa78: am
fc1d0471: am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
358eaa7825140ee571a7b9d61705fb3adb5b60aa':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 16:32:12 +0000 (16:32 +0000)]
am
70a0ea0e: am
16858164: am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
70a0ea0e8de981a2a0c3fb296718256a2355ee2d':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 16:32:05 +0000 (16:32 +0000)]
am
46bfaa1b: (-s ours) am
a5a921e3: (-s ours) am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
46bfaa1b93068c78ea5a2ab337ea8b98592b7c10':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 16:32:02 +0000 (16:32 +0000)]
am
d4981014: am
e5191aab: am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
d4981014d486c3ff72813d0d37048ee2abdb3d63':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 16:31:59 +0000 (16:31 +0000)]
am
6adc9602: am
825dd9dd: am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
6adc96020f763289d2e2a33b612f2ff237fb40b6':
Retain display when creating specialized contexts. (DO NOT MERGE)
Ricardo Cervera [Fri, 14 Mar 2014 16:28:46 +0000 (16:28 +0000)]
am
50694917: am
7e566239: Merge "docs: Updated Building your First App tutorial. Bug:
13429905" into klp-docs
* commit '
506949173761f9bde016b9d74de94df4b63df370':
docs: Updated Building your First App tutorial. Bug:
13429905
Joe Fernandez [Fri, 14 Mar 2014 16:28:30 +0000 (16:28 +0000)]
am
8bb11153: am
f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs
* commit '
8bb11153f946a95485644b08a067472735810ef2':
Doc change: Update developer video on home page carousel.
John Spurlock [Fri, 14 Mar 2014 16:28:26 +0000 (16:28 +0000)]
am
ad66c27b: am
6d9b034c: Fix typo in public logcat page.
* commit '
ad66c27b9c2f2dce1b9443018a7c4d097bc08fc3':
Fix typo in public logcat page.
Ricardo Cervera [Fri, 14 Mar 2014 16:28:22 +0000 (16:28 +0000)]
am
8714a343: am
ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit '
8714a3437e13b4a403e49c4c624f272dd6dc8f4e':
docs: Added step to get JDK to the Android Studio install instructions.
Katie McCormick [Fri, 14 Mar 2014 16:28:18 +0000 (16:28 +0000)]
am
b681794d: am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
b681794d2583e06693c23eec1af4e282b067abd9':
Doc update: new doc studio layout editor
John Spurlock [Fri, 14 Mar 2014 16:28:15 +0000 (16:28 +0000)]
am
62826f55: am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
62826f55be4415684b4e321469298ba43d598bbb':
Fix doc typos in AppOpsManager.java
JP Abgrall [Fri, 14 Mar 2014 16:28:09 +0000 (16:28 +0000)]
am
4ecd833e: am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
4ecd833ee35d1120f8c1ae52367947cacfc263a4':
ConnectivityService: add support to set TCP initial rwnd
Chad Brubaker [Fri, 14 Mar 2014 16:27:58 +0000 (16:27 +0000)]
am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
78f204aed8c0f3c8174616801d66f96a9a00a5fd':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 16:27:55 +0000 (16:27 +0000)]
am
fc1d0471: am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 16:27:51 +0000 (16:27 +0000)]
am
16858164: am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
16858164c73f0696d12161e97bad9cb22c55e603':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 16:27:44 +0000 (16:27 +0000)]
am
a5a921e3: (-s ours) am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 16:27:40 +0000 (16:27 +0000)]
am
e5191aab: am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
e5191aabff5b9b751349b8634836a858af744905':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 16:27:35 +0000 (16:27 +0000)]
am
825dd9dd: am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
825dd9dd38a42306d18a627768b16204cf4d8710':
Retain display when creating specialized contexts. (DO NOT MERGE)
Zhihai Xu [Fri, 14 Mar 2014 16:08:38 +0000 (16:08 +0000)]
am
6d3d6c4a: am
57080be9: am
bdd4c31a: am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
6d3d6c4a06a1e83d126622d8a971f439b80ec354':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Zhihai Xu [Fri, 14 Mar 2014 16:01:00 +0000 (16:01 +0000)]
am
57080be9: am
bdd4c31a: am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
57080be98e6c8d33781c619b79731264ab909baf':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Zhihai Xu [Fri, 14 Mar 2014 15:56:47 +0000 (15:56 +0000)]
am
bdd4c31a: am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Narayan Kamath [Fri, 14 Mar 2014 14:25:58 +0000 (14:25 +0000)]
am
63938750: am
c0232642: am
629daddd: Merge "Fix layoutlib build."
* commit '
6393875024e3b2ee6916d718d79dfbeb722537c1':
Fix layoutlib build.
Narayan Kamath [Fri, 14 Mar 2014 14:22:30 +0000 (14:22 +0000)]
am
c0232642: am
629daddd: Merge "Fix layoutlib build."
* commit '
c0232642b74517aa2717673f0811ba65c620f491':
Fix layoutlib build.
Narayan Kamath [Fri, 14 Mar 2014 14:19:24 +0000 (07:19 -0700)]
am
629daddd: Merge "Fix layoutlib build."
* commit '
629daddd03b598616de7c30a13b1f9f9b11b98fe':
Fix layoutlib build.
Narayan Kamath [Fri, 14 Mar 2014 14:12:35 +0000 (14:12 +0000)]
Merge "Fix layoutlib build."
Narayan Kamath [Fri, 14 Mar 2014 14:10:30 +0000 (14:10 +0000)]
Fix layoutlib build.
Was using private data structures from libcore.
Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
Dave Platt [Fri, 14 Mar 2014 13:13:38 +0000 (13:13 +0000)]
am
cb1254f1: am
e4e6b3cc: am
21384faa: am
f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '
cb1254f1abc44b82e2a9da0d9a73230eb46e129e':
NsdService does not clean up after exiting clients
Brian Carlstrom [Fri, 14 Mar 2014 13:13:34 +0000 (13:13 +0000)]
am
2facefe6: am
00d115a7: resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
* commit '
2facefe648996732c61a8a26c76704faa6d20e56':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Naofumi Harada [Fri, 14 Mar 2014 10:34:34 +0000 (10:34 +0000)]
am
0a167a98: (-s ours) am
107041e2: am
03263ce3: am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
0a167a98658afdb220ffd62b00d2e65d2baed3d3':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Fri, 14 Mar 2014 10:34:30 +0000 (10:34 +0000)]
am
0b925975: (-s ours) am
48dd8b0f: am
74f99a4e: am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
0b925975b88c91285df97ca26cebb8f8429ec0da':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Fri, 14 Mar 2014 10:28:28 +0000 (10:28 +0000)]
am
6467e900: (-s ours) am
7f68f7f4: am
f5729a6a: am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
6467e900a1211de65ae70cc722c871987e0b6531':
Add the calling package name to requestRouteToHost
Jeff Brown [Fri, 14 Mar 2014 06:11:02 +0000 (06:11 +0000)]
am
d8b17079: am
6ae4d53b: resolved conflicts for merge of
db3146c0 to klp-modular-dev
* commit '
d8b170799f1cb00825a4a947901d4b214d20c5a1':
Fix power manager display wake lock bugs. (DO NOT MERGE)
Jose Lima [Fri, 14 Mar 2014 04:26:48 +0000 (21:26 -0700)]
resolved conflicts for merge of
4882ddfa to master
Change-Id: I179899697c148ac34a67b195e2dbd3df2f9138de
Jeff Brown [Fri, 14 Mar 2014 04:12:08 +0000 (04:12 +0000)]
am
6ae4d53b: resolved conflicts for merge of
db3146c0 to klp-modular-dev
* commit '
6ae4d53b571cb71cc6c2ad55d12679d22e9334d5':
Fix power manager display wake lock bugs. (DO NOT MERGE)
Jeff Brown [Fri, 14 Mar 2014 04:07:33 +0000 (21:07 -0700)]
resolved conflicts for merge of
db3146c0 to klp-modular-dev
Change-Id: I1500228392add2de325b9530ae33d7c3e738c021
Christopher Tate [Fri, 14 Mar 2014 00:23:10 +0000 (00:23 +0000)]
am
83b31aae: (-s ours) am
d5b25cbd: am
aaaeb6a2: am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
83b31aae81402c2b10bd711bc14c6ebdfe4c85bf':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Fri, 14 Mar 2014 00:23:06 +0000 (00:23 +0000)]
am
e4f1c8ab: (-s ours) am
c48e3d03: (-s ours) am
4c9ebc4c: (-s ours) am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e4f1c8ab271c06c03d7b962efed9a669f3c8986b':
Import translations. DO NOT MERGE
Alan Viverette [Fri, 14 Mar 2014 00:23:03 +0000 (00:23 +0000)]
am
70994e9e: (-s ours) am
d7cc4bf4: am
cf2b65ce: am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
70994e9eef43b6cf95ec6cf553dd97bf92567587':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Fri, 14 Mar 2014 00:22:59 +0000 (00:22 +0000)]
am
17bbdcc5: (-s ours) am
839321a3: am
c25dbb50: am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
17bbdcc549a0469fa3d8ed5778e77964ab7caf2d':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Fri, 14 Mar 2014 00:22:56 +0000 (00:22 +0000)]
am
c59474d2: (-s ours) am
ba3d0fd5: am
af6288b7: am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
c59474d2813be8df40090ca121f9570977796aa7':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Fri, 14 Mar 2014 00:22:48 +0000 (00:22 +0000)]
am
b287043c: am
4a5c9e94: am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
b287043c3d31e8360ba5c11bd6dafda7288db8a9':
Fix a bug in submenu presenter priority handling
Jason Sams [Fri, 14 Mar 2014 00:22:45 +0000 (00:22 +0000)]
am
440613f5: am
276565c8: am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
440613f5c35577f9a5bbc087b2e306e37bb8f94e':
Force merge of remaining KLP changes to fix build.
Winson Chung [Fri, 14 Mar 2014 00:14:17 +0000 (17:14 -0700)]
Fixing memory leaks related to Tasks holding onto their callbacks.
- Switching to SwipeHelper
Adam Powell [Thu, 13 Mar 2014 23:59:57 +0000 (23:59 +0000)]
am
6cde6c75: am
41685ce9: am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
6cde6c75b3469b7f76343ef7fc646f65c8393a17':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Adam Powell [Thu, 13 Mar 2014 23:57:19 +0000 (23:57 +0000)]
am
41685ce9: am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
41685ce983abd6b4ccbb0ae8043d6a1dc118f7d3':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Adam Powell [Thu, 13 Mar 2014 23:53:38 +0000 (23:53 +0000)]
am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
898d6d964cb3b650b5c9bed2276310547e5455e0':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Dave Platt [Thu, 13 Mar 2014 23:47:32 +0000 (23:47 +0000)]
am
e4e6b3cc: am
21384faa: am
f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '
e4e6b3cc1908c60bd0e45063116cf935b7aad56a':
NsdService does not clean up after exiting clients
Brian Carlstrom [Thu, 13 Mar 2014 23:43:37 +0000 (23:43 +0000)]
am
00d115a7: resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
* commit '
00d115a7533df23027f671c90c0ae52684392e4a':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Dave Platt [Thu, 13 Mar 2014 23:42:03 +0000 (23:42 +0000)]
am
21384faa: am
f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '
21384faa2b3da619a54b35f15936c00593b30694':
NsdService does not clean up after exiting clients