OSDN Git Service
Chad Brubaker [Fri, 14 Mar 2014 17:59:39 +0000 (10:59 -0700)]
am
d92eb826: am
ff9da494: am
4b59883a: am
7c2b1625: am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
d92eb8264729c54dad1e23d5197d8816313b6f70':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 17:59:36 +0000 (10:59 -0700)]
am
353e0cf7: 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 '
353e0cf71885909ac7062fdb09f42b9682359593':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 17:59:33 +0000 (10:59 -0700)]
am
5313f2c7: 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 '
5313f2c783de49b8ebbd320458a182f0da824593':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 17:59:31 +0000 (10:59 -0700)]
am
9cd1e9da: (-s ours) 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 '
9cd1e9da9c64e8d9fe99497153ce319c05c12e52':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 17:59:27 +0000 (10:59 -0700)]
am
c9519fcd: 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 '
c9519fcd386a43d3908111c468903329b9346a3d':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 17:59:24 +0000 (10:59 -0700)]
am
7aaf04a5: 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 '
7aaf04a54d6ba9219fa0c2292b4e0c549e9535a8':
Retain display when creating specialized contexts. (DO NOT MERGE)
Zhihai Xu [Fri, 14 Mar 2014 17:59:22 +0000 (10:59 -0700)]
am
bb25d325: 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 '
bb25d32514b110fb17793078b969eee2f2c4696a':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Narayan Kamath [Fri, 14 Mar 2014 17:59:19 +0000 (10:59 -0700)]
am
ceb2e0a6: am
1abb7e0f: am
63938750: am
c0232642: am
629daddd: Merge "Fix layoutlib build."
* commit '
ceb2e0a6058c31ebd3ef66e497d571134ba496c2':
Fix layoutlib build.
Selim Cinek [Fri, 14 Mar 2014 17:53:48 +0000 (10:53 -0700)]
am
20b37400: Merge "Fixed a crash when an image with an odd width/height was selected"
* commit '
20b37400eb4e21d7e9434047adc510a1f928a6d1':
Fixed a crash when an image with an odd width/height was selected
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.
Jeff Brown [Fri, 14 Mar 2014 17:50:25 +0000 (10:50 -0700)]
am
a84b4453: am
f0e2988f: am
d8b17079: am
6ae4d53b: resolved conflicts for merge of
db3146c0 to klp-modular-dev
* commit '
a84b44530606fdd9ee25c90f954fa1039096df89':
Fix power manager display wake lock bugs. (DO NOT MERGE)
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
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:17:02 +0000 (10:17 -0700)]
am
6413a712: am
6395c6a4: am
6cde6c75: am
41685ce9: am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
6413a7128f4915b08a56acb04f56001b499311d8':
Add a config override for ViewConfiguration#hasPermanentMenuKey
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
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)
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)
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:21:31 +0000 (06:21 -0700)]
am
6b2b1402: am
cb1254f1: am
e4e6b3cc: am
21384faa: am
f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '
6b2b14028ddec40b70c346f5a1e4d266720fadcd':
NsdService does not clean up after exiting clients
Brian Carlstrom [Fri, 14 Mar 2014 13:21:28 +0000 (06:21 -0700)]
am
2df4b6a0: am
2facefe6: am
00d115a7: resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
* commit '
2df4b6a050452c48a31a9543e63388d4fc2433ba':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
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:36:47 +0000 (03:36 -0700)]
am
73dca274: 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 '
73dca274796dc6c8a2e59e19d7ee59fe529f678d':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Fri, 14 Mar 2014 10:36:44 +0000 (03:36 -0700)]
am
d3619645: 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 '
d3619645103a7fc345bd027f5fdd62f771ba9f5b':
Only allow System apps to make VPN exempt routes
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:31:54 +0000 (03:31 -0700)]
am
8a48ebb0: am
6467e900: (-s ours) am
7f68f7f4: am
f5729a6a: am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
8a48ebb0a01ebaf1c655e0a4f601d62213e46446':
Add the calling package name to requestRouteToHost
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)
Evan Charlton [Fri, 14 Mar 2014 04:58:48 +0000 (04:58 +0000)]
Merge "Fix the SDK build" into master-nova
Evan Charlton [Fri, 14 Mar 2014 04:55:27 +0000 (21:55 -0700)]
Fix the SDK build
Fix a bad {@link} tag which was breaking the SDK javadocs build.
Change-Id: Ib44fc5c21738fa65ef3cec72f8c0e8e8f4b938c2
Jose Lima [Fri, 14 Mar 2014 04:30:03 +0000 (21:30 -0700)]
am
92703e62: resolved conflicts for merge of
4882ddfa to master
* commit '
92703e62c1dc88a410a32b05c2d44f391c193140':
Add banner attribute to app manifest
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:26:08 +0000 (17:26 -0700)]
am
87dbf308: 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 '
87dbf308fcde409a73921a6da95d93bcb5e8c106':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Fri, 14 Mar 2014 00:26:05 +0000 (17:26 -0700)]
am
25e41f43: (-s ours) 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 '
25e41f4345c2e58e31c0e32507b6475107d9a286':
Import translations. DO NOT MERGE
Alan Viverette [Fri, 14 Mar 2014 00:26:02 +0000 (17:26 -0700)]
am
050246e0: 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 '
050246e0ebb14828110f07b5978b6ad7d4e6874f':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Fri, 14 Mar 2014 00:25:59 +0000 (17:25 -0700)]
am
d2df12c2: 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 '
d2df12c219b051acf4cc8fb3c6d78f7d1d4a814b':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Fri, 14 Mar 2014 00:25:56 +0000 (17:25 -0700)]
am
38a3ddf4: 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 '
38a3ddf44a42c07a0ec629537225c9ddd1fd47af':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Fri, 14 Mar 2014 00:25:53 +0000 (17:25 -0700)]
am
2e8436b4: am
b287043c: am
4a5c9e94: am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
2e8436b462f405d195f2370d65e10efe48c7e18f':
Fix a bug in submenu presenter priority handling
Jason Sams [Fri, 14 Mar 2014 00:25:51 +0000 (17:25 -0700)]
am
3bab28f9: am
440613f5: am
276565c8: am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
3bab28f9e98fb8e2aae8e170bebe0070b7abb3bb':
Force merge of remaining KLP changes to fix build.
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.
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
Dave Platt [Thu, 13 Mar 2014 23:38:59 +0000 (16:38 -0700)]
am
f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '
f3a2895a31069a7c01c69d011b290fcfb3298b3c':
NsdService does not clean up after exiting clients
Dave Platt [Thu, 13 Mar 2014 23:35:15 +0000 (23:35 +0000)]
Merge "NsdService does not clean up after exiting clients"
Brian Carlstrom [Thu, 13 Mar 2014 23:31:14 +0000 (16:31 -0700)]
resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
Change-Id: I1f4e555773fe6138efaf73444525da0f747b01d5
Jason Sams [Thu, 13 Mar 2014 23:18:20 +0000 (16:18 -0700)]
am
a9b8bf05: am
21f97de0: am
35a9e339: am
fc15f899: Fix build issues from bad merge
* commit '
a9b8bf053ca5a1e81160422a38341c7dd4b4022d':
Fix build issues from bad merge
Jason Sams [Thu, 13 Mar 2014 23:18:17 +0000 (16:18 -0700)]
am
da8c79d3: am
4a268aff: am
534606b4: am
632c915c: resolved conflicts for merge of
780d57b8 to klp-modular-dev
* commit '
da8c79d378e3a133bb88d80cf8765bb4f7507d66':
Fix destruction issues relating to AllocationAdapter.
Dave Platt [Fri, 7 Mar 2014 22:48:22 +0000 (14:48 -0800)]
NsdService does not clean up after exiting clients
When a client of the NsdService exits, NsdService should
clean up the requests it has sent to the mDNS daemon:
cancel any pending resource-discovery and resource-resolution
queries, and remove any services registered by this client.
If this isn't done, several bad things happen. The daemon will
continue to run unnecessarily, will report service discoveries
that can't be forwarded on to the client, and will continue to
advertise service ports for an application which is no longer
running until the device is rebooted (mDNS pollution).
Bug:
9801184
Change-Id: I0aa7311480322aefcff16f902fbbf34f50985d38
Jason Sams [Thu, 13 Mar 2014 23:12:01 +0000 (23:12 +0000)]
am
21f97de0: am
35a9e339: am
fc15f899: Fix build issues from bad merge
* commit '
21f97de0bc4871cd8759aa8edbf55eb97d4a6ff2':
Fix build issues from bad merge
Jason Sams [Thu, 13 Mar 2014 23:11:58 +0000 (23:11 +0000)]
am
4a268aff: am
534606b4: am
632c915c: resolved conflicts for merge of
780d57b8 to klp-modular-dev
* commit '
4a268affbf2a15d68171036a941c2404eae07833':
Fix destruction issues relating to AllocationAdapter.
Mike Lockwood [Thu, 13 Mar 2014 22:28:33 +0000 (15:28 -0700)]
am
885ddcaa: Merge "MTP: Add support for some audio specific object properties"
* commit '
885ddcaa6df92d173a5b8798d0f37ae63ae2b6a1':
MTP: Add support for some audio specific object properties
Mike Lockwood [Thu, 13 Mar 2014 22:25:08 +0000 (22:25 +0000)]
Merge "MTP: Add support for some audio specific object properties"
Hui Shu [Thu, 13 Mar 2014 22:16:28 +0000 (15:16 -0700)]
am
57ad97fb: Merge "Add removeApi commandline option for doclava and an empty removed.txt"
* commit '
57ad97fb701876ecb87b76f29592a41731aeb487':
Add removeApi commandline option for doclava and an empty removed.txt
Mike Lockwood [Thu, 13 Mar 2014 21:51:29 +0000 (14:51 -0700)]
MTP: Add support for some audio specific object properties
This stops Windows 7 from putting up the
"Your device might not be able to play or view this file" dialog
when copying MP3 files to the device.
Bug:
3195286
Change-Id: Ic5b3fb75309893caae1a4f4b56068a543847f1f7
Hui Shu [Thu, 13 Mar 2014 22:11:40 +0000 (22:11 +0000)]
Merge "Add removeApi commandline option for doclava and an empty removed.txt"
John Reck [Thu, 13 Mar 2014 22:09:31 +0000 (15:09 -0700)]
OSDN Git Service
