OSDN Git Service
Scott Main [Tue, 11 Mar 2014 19:18:55 +0000 (19:18 +0000)]
am
21207588: am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
212075889eab9aab2c48881803888a1b827d77ba':
fix some typos for GoogleApiClient doc
Scott Main [Tue, 11 Mar 2014 19:18:48 +0000 (19:18 +0000)]
am
2ada4e31: am
7b0c111b: am
69e49a81: Merge "fix typos" into klp-docs
* commit '
2ada4e310d728756fc9bf69086987bfe215dc487':
fix typos
Scott Main [Tue, 11 Mar 2014 17:43:42 +0000 (17:43 +0000)]
am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
790c5a4c06e0ceee8fbdbed575e93ef257124569':
fix some typos for GoogleApiClient doc
Scott Main [Tue, 11 Mar 2014 17:43:38 +0000 (17:43 +0000)]
am
7b0c111b: am
69e49a81: Merge "fix typos" into klp-docs
* commit '
7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
fix typos
Narayan Kamath [Tue, 11 Mar 2014 15:17:45 +0000 (15:17 +0000)]
am
b071a07d: am
a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit '
b071a07da89a8736fa4fd757f9a6c6e990d0e858':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
Narayan Kamath [Tue, 11 Mar 2014 15:14:26 +0000 (08:14 -0700)]
am
a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit '
a79af3647f7f93825b84cc25187527b5aac60a69':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
Narayan Kamath [Tue, 11 Mar 2014 15:09:44 +0000 (15:09 +0000)]
Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
Narayan Kamath [Tue, 11 Mar 2014 15:02:10 +0000 (15:02 +0000)]
Remove java.io.tmpdir assignment in AndroidRuntime (again).
This was brought back by a bad merge conflict resolution
in change
0efbd9a463c848118c7685f4bfc8765a82caa761.
Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
Narayan Kamath [Tue, 11 Mar 2014 12:06:00 +0000 (12:06 +0000)]
am
194e77aa: am
0f3fd6c6: Merge "Remove stray logging statement."
* commit '
194e77aafe32cacc00f69b25bec6eeea67eb0205':
Remove stray logging statement.
Narayan Kamath [Tue, 11 Mar 2014 12:03:36 +0000 (05:03 -0700)]
am
0f3fd6c6: Merge "Remove stray logging statement."
* commit '
0f3fd6c66e8376e62ed61dd2b92ea4807571b3de':
Remove stray logging statement.
Narayan Kamath [Tue, 11 Mar 2014 12:00:54 +0000 (12:00 +0000)]
Merge "Remove stray logging statement."
Narayan Kamath [Tue, 11 Mar 2014 11:08:41 +0000 (11:08 +0000)]
Remove stray logging statement.
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
Jeff Brown [Tue, 11 Mar 2014 00:15:38 +0000 (00:15 +0000)]
am
fc7315c6: am
6d71e165: Merge "Round off when calculate next step in Seekbar"
* commit '
fc7315c6c17e6ebc559d2ea0afb8be64c5d7b86c':
Round off when calculate next step in Seekbar
Jeff Brown [Tue, 11 Mar 2014 00:11:57 +0000 (17:11 -0700)]
am
6d71e165: Merge "Round off when calculate next step in Seekbar"
* commit '
6d71e165ba961251f0705b75aafed74eba1bc570':
Round off when calculate next step in Seekbar
Jeff Brown [Tue, 11 Mar 2014 00:11:14 +0000 (00:11 +0000)]
am
33282d66: am
a41ddccd: Merge "Fixed typo errors in documentation"
* commit '
33282d66155e8d68acea512989ec61cb15fae1ce':
Fixed typo errors in documentation
Jeff Brown [Tue, 11 Mar 2014 00:11:10 +0000 (00:11 +0000)]
am
aaf23a9a: am
c3f5d694: Merge "Hang off call by power button while screen is on"
* commit '
aaf23a9a653457cccf54293b2ff76196718c7a1a':
Hang off call by power button while screen is on
Jeff Brown [Tue, 11 Mar 2014 00:11:05 +0000 (00:11 +0000)]
am
e7f7af96: am
35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit '
e7f7af964baa3c5d36abd163e33ad139310049d2':
take account of RotationVector's new extra parameter
Jeff Brown [Tue, 11 Mar 2014 00:08:27 +0000 (17:08 -0700)]
am
a41ddccd: Merge "Fixed typo errors in documentation"
* commit '
a41ddccdc67ace7c9363efebbf6e51710928ce12':
Fixed typo errors in documentation
Jeff Brown [Tue, 11 Mar 2014 00:08:24 +0000 (17:08 -0700)]
am
c3f5d694: Merge "Hang off call by power button while screen is on"
* commit '
c3f5d694324fbe2831405ce60bc43bd0d0183d07':
Hang off call by power button while screen is on
Jeff Brown [Tue, 11 Mar 2014 00:08:21 +0000 (17:08 -0700)]
am
35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit '
35c8ebab0ac66bf2c12b6986f90a07be402e0076':
take account of RotationVector's new extra parameter
Jeff Brown [Tue, 11 Mar 2014 00:06:40 +0000 (00:06 +0000)]
Merge "Round off when calculate next step in Seekbar"
Jeff Brown [Tue, 11 Mar 2014 00:06:24 +0000 (00:06 +0000)]
Merge "Fixed typo errors in documentation"
Jeff Brown [Tue, 11 Mar 2014 00:06:01 +0000 (00:06 +0000)]
Merge "Hang off call by power button while screen is on"
Jeff Brown [Tue, 11 Mar 2014 00:04:49 +0000 (00:04 +0000)]
Merge "take account of RotationVector's new extra parameter"
Adam Powell [Mon, 10 Mar 2014 23:31:04 +0000 (23:31 +0000)]
am
fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix
* commit '
fd6b99750bfab7f930ee375a79009874a3196165':
Prevent overflow from MeasureSpec.adjust; measure cache fix
Adam Powell [Fri, 7 Mar 2014 01:55:16 +0000 (17:55 -0800)]
Prevent overflow from MeasureSpec.adjust; measure cache fix
Extract the size from the MeasureSpec value before adding the
delta. The opposite order could result in a negative delta causing
overflow into size from the EXACTLY mode, creating a very large size
value in the resulting MeasureSpec.
Don't reapply optical bounds insets after pulling a value from the
measurement cache. (The insets will have already been applied before
insertion into the cache.)
Change-Id: Ib0154f4d6c3a7c31e7fee24fd7d5d10cc5dc71a1
Benoit Goby [Mon, 10 Mar 2014 19:02:54 +0000 (19:02 +0000)]
am
c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
* commit '
c6f0b54d695b49966a13bb196800a985ac6ce212':
Add CAP_BLOCK_SUSPEND to system server
Benoit Goby [Mon, 10 Mar 2014 18:59:05 +0000 (18:59 +0000)]
Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
Brian Carlstrom [Mon, 10 Mar 2014 17:51:05 +0000 (17:51 +0000)]
am
ec4c7752: am
ab97d617: Merge "Only pass -Xprofile-* options to ART"
* commit '
ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
Only pass -Xprofile-* options to ART
Brian Carlstrom [Mon, 10 Mar 2014 17:47:26 +0000 (10:47 -0700)]
am
ab97d617: Merge "Only pass -Xprofile-* options to ART"
* commit '
ab97d617e8043f7396dc6031c4ddeb2ae632230f':
Only pass -Xprofile-* options to ART
Brian Carlstrom [Mon, 10 Mar 2014 17:44:30 +0000 (17:44 +0000)]
Merge "Only pass -Xprofile-* options to ART"
Brian Carlstrom [Mon, 10 Mar 2014 17:20:01 +0000 (10:20 -0700)]
Only pass -Xprofile-* options to ART
Bug:
13391896
Change-Id: I5d6a3b900c9b20f02e1d4ccb73f712e9260c7dfd
Scott Main [Mon, 10 Mar 2014 16:24:29 +0000 (16:24 +0000)]
am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
29de50633348fb6329ed38980abce0010253a941':
fix some typos for GoogleApiClient doc
Scott Main [Mon, 10 Mar 2014 16:24:26 +0000 (16:24 +0000)]
am
69e49a81: Merge "fix typos" into klp-docs
* commit '
69e49a819a5fd3a9d0ede1ba18f204e5e2050da6':
fix typos
Scott Main [Mon, 10 Mar 2014 16:21:10 +0000 (16:21 +0000)]
Merge "fix some typos for GoogleApiClient doc" into klp-docs
Scott Main [Mon, 10 Mar 2014 16:20:45 +0000 (16:20 +0000)]
Merge "fix typos" into klp-docs
Narayan Kamath [Mon, 10 Mar 2014 10:47:45 +0000 (10:47 +0000)]
am
bbf82665: am
6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."
* commit '
bbf826659e8e5d0be683b2459207c495303d53b6':
LP64: Make 9 patches architecture agnostic.
Narayan Kamath [Mon, 10 Mar 2014 10:46:07 +0000 (03:46 -0700)]
am
6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."
* commit '
6e2fb587d71631bd29fdb844a6451d68e2144337':
LP64: Make 9 patches architecture agnostic.
Narayan Kamath [Mon, 10 Mar 2014 10:43:57 +0000 (10:43 +0000)]
Merge "LP64: Make 9 patches architecture agnostic."
Narayan Kamath [Mon, 3 Mar 2014 17:12:03 +0000 (17:12 +0000)]
LP64: Make 9 patches architecture agnostic.
The Res_png_9patch struct had several pointer members
whose size differed between 32 and 64 bit platforms.
These members have been replaced by uint32_t offsets
to serialized data. The serialized form for 9patches
places a Res_png_9patch object at the beginning of
serialized data, followed by int32_t arrays of xDivs,
yDivs and colors.
Note that these offsets are not strictly required,
since they can be computed from the values of numXDivs,
numYDivs & numColors, however they are called in tight
loops so having them computed once is a beneficial.
This change also removed the unused patch_equals function
from aapt's Image.cpp.
Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
Wei Wang [Sat, 8 Mar 2014 02:15:08 +0000 (02:15 +0000)]
am
1062080c: am
0ea81eed: (-s ours) am
1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '
1062080cd323c14d5bd24fb308da9431a0d250e5':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Wei Wang [Sat, 8 Mar 2014 02:11:17 +0000 (02:11 +0000)]
am
0ea81eed: (-s ours) am
1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '
0ea81eed882d288c9473e377639b0b88280fd044':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Wei Wang [Sat, 8 Mar 2014 02:05:57 +0000 (02:05 +0000)]
am
1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '
1327e59f36ceea5a1ee7dc66b311206345353de5':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Adam Powell [Sat, 8 Mar 2014 02:03:06 +0000 (02:03 +0000)]
am
c4a6df22: am
96192157: am
f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
* commit '
c4a6df22649378631c4e541ed81c5848735427dd':
Fix a bug where OnTouchListeners in action views could be removed
Marco Nelissen [Sat, 8 Mar 2014 02:03:03 +0000 (02:03 +0000)]
am
bf0fdac1: am
f41efb44: am
57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
* commit '
bf0fdac12d325098b65cde2c76dece85b753d663':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Craig Mautner [Sat, 8 Mar 2014 02:03:00 +0000 (02:03 +0000)]
am
508e88e3: am
9bf7f893: (-s ours) am
93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '
508e88e329cd157c3de94ccbac7374038f7e2355':
Show the keyguard if unsecure window on top. DO NOT MERGE.
Wei Wang [Sat, 8 Mar 2014 02:01:01 +0000 (02:01 +0000)]
Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
Dave Allison [Sat, 8 Mar 2014 01:56:29 +0000 (01:56 +0000)]
am
b94904ab: am
3fc3b9fd: Merge "ART profiler usage."
* commit '
b94904ab6dfbb9db7e8042f10886042a295857d4':
ART profiler usage.
Adam Powell [Sat, 8 Mar 2014 01:55:41 +0000 (01:55 +0000)]
am
96192157: am
f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
* commit '
96192157b88d3630827a9ffd55693866734b4da3':
Fix a bug where OnTouchListeners in action views could be removed
Marco Nelissen [Sat, 8 Mar 2014 01:55:36 +0000 (01:55 +0000)]
am
f41efb44: am
57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
* commit '
f41efb446a40f0904f3788c2a773f2a700b1342a':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Craig Mautner [Sat, 8 Mar 2014 01:55:33 +0000 (01:55 +0000)]
am
9bf7f893: (-s ours) am
93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '
9bf7f893e0833fca9b240c11b98d6d7dc1892081':
Show the keyguard if unsecure window on top. DO NOT MERGE.
Tim Kilbourn [Sat, 8 Mar 2014 01:55:00 +0000 (01:55 +0000)]
am
b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modular-dev
* commit '
b559b37150d24411f0b5ef102ced8d5acf858a0e':
Dump leanback info in aapt dump badging.
Ying Wang [Sat, 8 Mar 2014 01:54:52 +0000 (01:54 +0000)]
am
74bebf6f: Exclude the host aapt and aidl from PDK build.
* commit '
74bebf6faed2d34814ffc3d46664330ea568f7b2':
Exclude the host aapt and aidl from PDK build.
Tim Kilbourn [Sat, 8 Mar 2014 00:55:47 +0000 (00:55 +0000)]
Merge "Dump leanback info in aapt dump badging." into klp-modular-dev
Tim Kilbourn [Fri, 7 Mar 2014 23:12:50 +0000 (15:12 -0800)]
Dump leanback info in aapt dump badging.
Leanback launcher activities are reported, including the banner.
Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
Benoit Goby [Thu, 20 Feb 2014 02:55:28 +0000 (18:55 -0800)]
Add CAP_BLOCK_SUSPEND to system server
With linux 3.5 and above, CAP_BLOCK_SUSPEND is needed to take a
suspend blocker.
CAP_BLOCK_SUSPEND has aleady been added in master.
Change-Id: Ibd4b1f8498c3c4a7b69ea9fc68311546a8f0ecda
Ying Wang [Fri, 7 Mar 2014 23:55:14 +0000 (15:55 -0800)]
Exclude the host aapt and aidl from PDK build.
Bug:
13028632
Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
Jeff Brown [Fri, 7 Mar 2014 23:39:12 +0000 (23:39 +0000)]
am
01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '
01b5e765e59c14cdfb62f1a8684e9116a46874d2':
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
Adam Powell [Fri, 7 Mar 2014 23:38:30 +0000 (23:38 +0000)]
am
f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
* commit '
f175b19aaac7ffe5553013d996a073693cac929d':
Fix a bug where OnTouchListeners in action views could be removed
Marco Nelissen [Fri, 7 Mar 2014 23:38:27 +0000 (23:38 +0000)]
am
57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
* commit '
57a45f22ea7b0509fb918fa39e797a6061f75438':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Dave Allison [Fri, 7 Mar 2014 23:38:26 +0000 (15:38 -0800)]
am
3fc3b9fd: Merge "ART profiler usage."
* commit '
3fc3b9fd1bf71351bf1ff2d49d6e10b6acabf068':
ART profiler usage.
Craig Mautner [Fri, 7 Mar 2014 23:38:20 +0000 (23:38 +0000)]
am
93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '
93df07a1b72488b64354098cd00dff1d36b76b12':
Show the keyguard if unsecure window on top. DO NOT MERGE.
Adam Powell [Fri, 7 Mar 2014 23:28:19 +0000 (23:28 +0000)]
Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 22:49:33 +0000 (22:49 +0000)]
Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
Craig Mautner [Fri, 7 Mar 2014 22:30:25 +0000 (22:30 +0000)]
Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
Dave Allison [Fri, 7 Mar 2014 22:25:42 +0000 (22:25 +0000)]
Merge "ART profiler usage."
Jeff Brown [Fri, 7 Mar 2014 22:15:08 +0000 (22:15 +0000)]
Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
Elliott Hughes [Wed, 13 Nov 2013 23:10:40 +0000 (15:10 -0800)]
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/
12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
Jeff Brown [Fri, 7 Mar 2014 21:58:47 +0000 (13:58 -0800)]
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.
Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.
Bug:
12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
Marco Nelissen [Fri, 7 Mar 2014 21:46:38 +0000 (21:46 +0000)]
am
34425196: am
ac875878: am
9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '
344251969929dcb37a33a3e3910121458f7dc38f':
Make MtpDatabase use libexif instead of libjhead
Vineeta Srivastava [Fri, 7 Mar 2014 21:46:35 +0000 (21:46 +0000)]
am
5ef72c30: am
f066adde: am
dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit '
5ef72c30847a0b29c35489fef30bc21fe5a5dcfe':
telephony: Add same named operator configuration for some operators
Marco Nelissen [Fri, 7 Mar 2014 21:18:52 +0000 (21:18 +0000)]
am
ac875878: am
9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '
ac87587875f1dfade5e06a82ccc009d0f0170569':
Make MtpDatabase use libexif instead of libjhead
Vineeta Srivastava [Fri, 7 Mar 2014 21:18:47 +0000 (21:18 +0000)]
am
f066adde: am
dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit '
f066adde7a3722deba0226715af695537511271e':
telephony: Add same named operator configuration for some operators
Marco Nelissen [Fri, 7 Mar 2014 21:12:21 +0000 (21:12 +0000)]
am
9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '
9823a170e4f9ff1d9233eb7eb661c4d418c2e2a7':
Make MtpDatabase use libexif instead of libjhead
Vineeta Srivastava [Fri, 7 Mar 2014 21:12:17 +0000 (21:12 +0000)]
am
dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit '
dbeb0c12950e92a59671f8da7952ddf3486789b4':
telephony: Add same named operator configuration for some operators
Dave Allison [Thu, 30 Jan 2014 22:19:51 +0000 (14:19 -0800)]
ART profiler usage.
This is a change to add args to some of the profiler related
functions, including installd commands.
Also read properties and set command line options for the runtime
profiling parameters.
Changed calls to isDexOptNeeded() to isDexOptNeededInternal(). This
needs additional arguments passed for profiles.
Bug:
12877748
Change-Id: I1a426c9309d760bac0cf92daa298defee62287c1
Conflicts:
core/jni/AndroidRuntime.cpp
Marco Nelissen [Fri, 7 Mar 2014 20:23:29 +0000 (20:23 +0000)]
Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
Vineeta Srivastava [Fri, 7 Mar 2014 20:09:00 +0000 (20:09 +0000)]
Merge "telephony: Add same named operator configuration for some operators" into klp-dev
Sungmin Choi [Fri, 13 Dec 2013 05:50:40 +0000 (14:50 +0900)]
telephony: Add same named operator configuration for some operators
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.
Bug:
12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
Vineeta Srivastava [Fri, 7 Mar 2014 18:48:17 +0000 (18:48 +0000)]
am
16ed831e: am
3d924f1e: (-s ours) am
ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit '
16ed831eb391e1d08050c52579f316ed5505c1e8':
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
Vineeta Srivastava [Fri, 7 Mar 2014 18:45:11 +0000 (18:45 +0000)]
am
3d924f1e: (-s ours) am
ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit '
3d924f1e8d4664d47a1e5e3045ec450a36bb7009':
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
Mike J. Chen [Fri, 7 Mar 2014 18:44:22 +0000 (18:44 +0000)]
am
b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev
* commit '
b8a7dd639eb680e7bcd410f7d3bd16c7ba6872ad':
Add handshake broadcast support
Vineeta Srivastava [Fri, 7 Mar 2014 18:40:53 +0000 (18:40 +0000)]
am
ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit '
ef86ff58178e876f1dfbedd65166cc806f006ba8':
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
Mike J. Chen [Fri, 7 Mar 2014 18:40:23 +0000 (18:40 +0000)]
Merge "Add handshake broadcast support" into klp-modular-dev
Vineeta Srivastava [Fri, 7 Mar 2014 18:37:42 +0000 (18:37 +0000)]
Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
Sungmin Choi [Mon, 16 Dec 2013 07:14:44 +0000 (16:14 +0900)]
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
This reverts commit
119e24f98706cb0a1217b41e7e750b94c1a8941a.
Bug:
12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
Marco Nelissen [Fri, 10 Jan 2014 18:39:27 +0000 (10:39 -0800)]
Make MtpDatabase use libexif instead of libjhead
b/
12203995
Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
Leon Scroggins III [Fri, 7 Mar 2014 18:21:54 +0000 (18:21 +0000)]
am
48df72f7: am
74ca3fd3: (-s ours) am
bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
* commit '
48df72f7db7456304bde16a6f000fd7d45ba5d13':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Dianne Hackborn [Fri, 7 Mar 2014 18:21:52 +0000 (18:21 +0000)]
am
045ed665: am
8e904d56: (-s ours) am
785d764b: Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
* commit '
045ed665197ed3ba0681db173a058a55662cd16a':
More on issue #
12031685 (DO NOT MERGE)
Leon Scroggins III [Fri, 7 Mar 2014 18:18:35 +0000 (18:18 +0000)]
am
74ca3fd3: (-s ours) am
bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
* commit '
74ca3fd34dac9674f61313594e2863ffecd79c7a':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Dianne Hackborn [Fri, 7 Mar 2014 18:18:31 +0000 (18:18 +0000)]
am
8e904d56: (-s ours) am
785d764b: Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
* commit '
8e904d565e8a54f755814e9ae062743b8b012731':
More on issue #
12031685 (DO NOT MERGE)
Leon Scroggins III [Fri, 7 Mar 2014 18:15:23 +0000 (18:15 +0000)]
am
bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
* commit '
bc57651fb510d7b1a2811235f96e711b6be12a12':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Dianne Hackborn [Fri, 7 Mar 2014 18:15:19 +0000 (18:15 +0000)]
am
785d764b: Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
* commit '
785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
More on issue #
12031685 (DO NOT MERGE)
Leon Scroggins III [Fri, 7 Mar 2014 18:13:29 +0000 (18:13 +0000)]
Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 18:12:30 +0000 (18:12 +0000)]
Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
Andy McFadden [Fri, 7 Mar 2014 17:50:09 +0000 (17:50 +0000)]
am
66069adb: am
cda61e95: am
faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '
66069adb9d22f28b48bd4689b592c887c008be52':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Andy McFadden [Fri, 7 Mar 2014 17:46:42 +0000 (17:46 +0000)]
am
cda61e95: am
faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '
cda61e95f6b600378ab64f43beb42dbbfa2f6a1a':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Andy McFadden [Fri, 7 Mar 2014 17:43:40 +0000 (17:43 +0000)]
am
faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '
faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Andy McFadden [Fri, 7 Mar 2014 17:40:39 +0000 (17:40 +0000)]
Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
Craig Mautner [Mon, 3 Mar 2014 21:26:03 +0000 (13:26 -0800)]
Show the keyguard if unsecure window on top. DO NOT MERGE.
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.
Fixes bug
13225149.
Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
OSDN Git Service
