OSDN Git Service
Christopher Wiley [Tue, 1 Sep 2015 16:50:53 +0000 (16:50 +0000)]
am
f7ea7c7b: am
1643e97b: Merge "aidl: Pull main() into dedicated file"
* commit '
f7ea7c7b26dd129895c59be3b241d3676556fc42':
aidl: Pull main() into dedicated file
Christopher Wiley [Tue, 1 Sep 2015 16:50:46 +0000 (16:50 +0000)]
am
72b1324c: am
2b83384f: Merge "Tighten up compiler flags for aidl"
* commit '
72b1324cb31ff155d580f9de148c609922218f50':
Tighten up compiler flags for aidl
Christopher Wiley [Tue, 1 Sep 2015 16:36:52 +0000 (16:36 +0000)]
am
1643e97b: Merge "aidl: Pull main() into dedicated file"
* commit '
1643e97b330d6c0f47e8643e52b12c6887a89f81':
aidl: Pull main() into dedicated file
Christopher Wiley [Tue, 1 Sep 2015 16:36:37 +0000 (16:36 +0000)]
am
2b83384f: Merge "Tighten up compiler flags for aidl"
* commit '
2b83384f44ffa30d1d3d61ded9ac4f83a275b77d':
Tighten up compiler flags for aidl
Zhentao Sun [Tue, 1 Sep 2015 01:05:45 +0000 (01:05 +0000)]
am
0a247995: am
aa06c808: am
363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev
* commit '
0a247995d79149b891ab6fad5dc0a1cb584d111c':
Don't launch the camera if it already in foreground.
Jorim Jaggi [Tue, 1 Sep 2015 01:05:39 +0000 (01:05 +0000)]
am
d302508d: am
4a306fd7: am
3a464785: Add a private API to get notified about lockout resets
* commit '
d302508d2838000b1dde05d9bfaf5e5181dcf9dc':
Add a private API to get notified about lockout resets
Zhentao Sun [Tue, 1 Sep 2015 00:58:38 +0000 (00:58 +0000)]
am
aa06c808: am
363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev
* commit '
aa06c8089a7d417a240004e785239f00ba1af0ec':
Don't launch the camera if it already in foreground.
Jorim Jaggi [Tue, 1 Sep 2015 00:58:31 +0000 (00:58 +0000)]
am
4a306fd7: am
3a464785: Add a private API to get notified about lockout resets
* commit '
4a306fd744bc2f6f434cb7032580b063b704a9c5':
Add a private API to get notified about lockout resets
Zhentao Sun [Tue, 1 Sep 2015 00:47:04 +0000 (00:47 +0000)]
am
363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev
* commit '
363c694a448d90322936526d78a9878de0003d0e':
Don't launch the camera if it already in foreground.
Jorim Jaggi [Tue, 1 Sep 2015 00:47:00 +0000 (00:47 +0000)]
am
3a464785: Add a private API to get notified about lockout resets
* commit '
3a464785088e7fd206666f640912729533948ce8':
Add a private API to get notified about lockout resets
Christopher Ferris [Tue, 1 Sep 2015 00:41:06 +0000 (00:41 +0000)]
am
d6597cb4: am
1bc7d0c8: am
70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev
* commit '
d6597cb43c1985ec955f2f5c5daf7be52a9f12a2':
Save/restore errno in SIGCHLD handler.
Zhentao Sun [Tue, 1 Sep 2015 00:40:39 +0000 (00:40 +0000)]
Merge "Don't launch the camera if it already in foreground." into mnc-dr-dev
Jorim Jaggi [Fri, 28 Aug 2015 23:59:13 +0000 (16:59 -0700)]
Add a private API to get notified about lockout resets
SystemUI uses it to start authentication again after lockout reset
expired.
Bug:
22846755
Change-Id: I90a987c6aa4ac52cc7e7aff1bce262d1db3f12ee
Christopher Ferris [Tue, 1 Sep 2015 00:31:30 +0000 (00:31 +0000)]
am
1bc7d0c8: am
70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev
* commit '
1bc7d0c84a1fbd27add883b8e000096677a1ca22':
Save/restore errno in SIGCHLD handler.
Christopher Ferris [Tue, 1 Sep 2015 00:23:02 +0000 (00:23 +0000)]
am
70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev
* commit '
70c958c414204b195d4195cdcafe33932087e6b1':
Save/restore errno in SIGCHLD handler.
Christopher Ferris [Tue, 1 Sep 2015 00:14:16 +0000 (00:14 +0000)]
Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev
Christopher Ferris [Mon, 31 Aug 2015 22:40:01 +0000 (15:40 -0700)]
Save/restore errno in SIGCHLD handler.
The SIGCHLD handler can set the errno, which can change the errno found
on the thread on which the signal handler is invoked. Most of the time
this is harmless, but it's possible that if the main thread was making
a system call, and allows certain failures based on errno, that logic
can fail. The fix is to save/restore errno in the handler.
Bug:
23572286
Bug:
23689391
Change-Id: I4542fd60cc1398ce0a8902d8df98a3d089fb6efe
Todd Kennedy [Mon, 31 Aug 2015 23:14:54 +0000 (23:14 +0000)]
am
f7bf24ad: am
9fe274d6: am
9e25e164: am
e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev
* commit '
f7bf24ad1d780b326287409f37e0e8c03115f60d':
Ensure host is set before onInflate()
Bart Sears [Mon, 31 Aug 2015 23:14:49 +0000 (23:14 +0000)]
am
9030daba: am
2d7df3ef: am
d66d4d1b: am
627975fc: am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
9030dabad5d0545a7e24d514c4e0cad570ca09af':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 23:14:44 +0000 (23:14 +0000)]
am
f86894cb: am
a42870fc: am
188a33c7: am
7b7a3e75: am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
f86894cb9c34f32c2d6f533e1c188dc4046e602c':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Todd Kennedy [Mon, 31 Aug 2015 23:05:49 +0000 (23:05 +0000)]
am
9fe274d6: am
9e25e164: am
e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev
* commit '
9fe274d638413b7342246836c344b442ebcfa64c':
Ensure host is set before onInflate()
Bart Sears [Mon, 31 Aug 2015 23:05:43 +0000 (23:05 +0000)]
am
2d7df3ef: am
d66d4d1b: am
627975fc: am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
2d7df3ef8d0fab3887001f1824a537c98a7a2457':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 23:05:34 +0000 (23:05 +0000)]
am
a42870fc: am
188a33c7: am
7b7a3e75: am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
a42870fcd6bbd15326fea45e156bd2462bf8a78a':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Todd Kennedy [Mon, 31 Aug 2015 22:57:52 +0000 (22:57 +0000)]
am
9e25e164: am
e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev
* commit '
9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b':
Ensure host is set before onInflate()
Bart Sears [Mon, 31 Aug 2015 22:57:47 +0000 (22:57 +0000)]
am
d66d4d1b: am
627975fc: am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
d66d4d1bea063acefae6bab5faf822d7a363b216':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:57:44 +0000 (22:57 +0000)]
am
188a33c7: am
7b7a3e75: am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
188a33c7acb53fb59364b82a41ec9270f6aef5cf':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Todd Kennedy [Mon, 31 Aug 2015 22:45:23 +0000 (22:45 +0000)]
am
e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev
* commit '
e7078e181cd00d20ce7764efa9835e2604a3cb83':
Ensure host is set before onInflate()
Bart Sears [Mon, 31 Aug 2015 22:45:19 +0000 (22:45 +0000)]
am
627975fc: am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
627975fca234bfc62d60904547ba3fb2ac675ec8':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:45:15 +0000 (22:45 +0000)]
am
7b7a3e75: am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
7b7a3e75c3a107c139a7832c5a04cc0d01b7cd1f':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Todd Kennedy [Mon, 31 Aug 2015 22:35:58 +0000 (22:35 +0000)]
Merge "Ensure host is set before onInflate()" into mnc-dev
Bart Sears [Mon, 31 Aug 2015 22:32:22 +0000 (22:32 +0000)]
am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
74890df7267d1c203fdbc5e90052f723a3c89f3d':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:32:17 +0000 (22:32 +0000)]
am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
0bafa33fcdebeaf6bdfd36a3f75e461d630b86bc':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 22:20:06 +0000 (22:20 +0000)]
am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
3cb7e91f2cd1fb29e6d0926e35f90647200c1af4':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:19:58 +0000 (22:19 +0000)]
am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
35c1eb9e6506b407a1af40359d48bb06d884385d':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 22:03:48 +0000 (22:03 +0000)]
am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
199c74eab1a30bff7db7bb4d24c161f36edb7f5b':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:03:44 +0000 (22:03 +0000)]
am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
82b70db7dd906013d131737a5bec2ae59b41ae61':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 21:53:46 +0000 (21:53 +0000)]
Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
Tyler Gunn [Mon, 31 Aug 2015 21:42:15 +0000 (21:42 +0000)]
am
603cfdce: am
6a9baca0: am
7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev
* commit '
603cfdcea1e53f963b27d33bb1f0579a619cc9ca':
Rename carrier config constant.
Tao Bao [Sat, 29 Aug 2015 00:46:20 +0000 (17:46 -0700)]
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bug:
23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
Tyler Gunn [Mon, 31 Aug 2015 21:25:17 +0000 (21:25 +0000)]
am
6a9baca0: am
7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev
* commit '
6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2':
Rename carrier config constant.
Tyler Gunn [Mon, 31 Aug 2015 21:14:55 +0000 (21:14 +0000)]
am
7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev
* commit '
7878eee8a9c20752e038f563b98b6b42c372cd0f':
Rename carrier config constant.
Todd Kennedy [Mon, 31 Aug 2015 21:10:04 +0000 (14:10 -0700)]
Ensure host is set before onInflate()
Bug:
22512520
Change-Id: I70f3b3c3234d7015880e0b83ae13f6fbe218f19a
Tyler Gunn [Mon, 31 Aug 2015 21:01:19 +0000 (21:01 +0000)]
Merge "Rename carrier config constant." into mnc-dr-dev
Selim Cinek [Mon, 31 Aug 2015 20:58:05 +0000 (20:58 +0000)]
am
406b60ac: am
b8645fa7: am
a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev
* commit '
406b60aca6c8b88f35c15ddbb30937fd6cfdc008':
Fixed a bug where the secure camera would flash when rotated
Selim Cinek [Mon, 31 Aug 2015 20:47:50 +0000 (20:47 +0000)]
am
b8645fa7: am
a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev
* commit '
b8645fa79e06c2e5cb87eb7fddccf3d2679c5f71':
Fixed a bug where the secure camera would flash when rotated
Adrian Roos [Mon, 31 Aug 2015 20:40:54 +0000 (20:40 +0000)]
am
9cb060d0: am
7e1775d2: am
78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
* commit '
9cb060d0c314630f6af89677263233f3253ad847':
Disable fingerprint after force lock
Bart Sears [Mon, 31 Aug 2015 20:40:48 +0000 (20:40 +0000)]
am
aaebdd7f: am
02be9316: am
06fb3b2d: am
0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '
aaebdd7f91163382065d3b56d57cafef5e46c7fd':
Don't throttle "while idle" alarms while not dozing
Selim Cinek [Mon, 31 Aug 2015 20:37:26 +0000 (20:37 +0000)]
am
a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev
* commit '
a7cad8e8a4d698bd3880299265760f5158073e2d':
Fixed a bug where the secure camera would flash when rotated
Adrian Roos [Mon, 31 Aug 2015 20:27:55 +0000 (20:27 +0000)]
am
7e1775d2: am
78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
* commit '
7e1775d246371422ae60ec4d825d70bc067a8962':
Disable fingerprint after force lock
Bart Sears [Mon, 31 Aug 2015 20:27:49 +0000 (20:27 +0000)]
am
02be9316: am
06fb3b2d: am
0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '
02be93160a246323f0a17f831e4e8bf56d65d415':
Don't throttle "while idle" alarms while not dozing
Selim Cinek [Mon, 31 Aug 2015 20:27:48 +0000 (20:27 +0000)]
Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev
Tyler Gunn [Mon, 31 Aug 2015 20:18:44 +0000 (20:18 +0000)]
am
b63db9fd: am
3bd58233: am
d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev
* commit '
b63db9fd98d8d9cb3a588b34ce44918ea752463f':
Add carrier config for allowing non-emerg calls in ECM mode.
Adrian Roos [Mon, 31 Aug 2015 20:16:57 +0000 (20:16 +0000)]
am
78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
* commit '
781953123e5b0f0f85691eabc13b3430c3054a10':
Disable fingerprint after force lock
Bart Sears [Mon, 31 Aug 2015 20:16:53 +0000 (20:16 +0000)]
am
06fb3b2d: am
0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '
06fb3b2da8a57fdc5efe24ab9464e6e890740de6':
Don't throttle "while idle" alarms while not dozing
Tyler Gunn [Mon, 31 Aug 2015 20:15:27 +0000 (13:15 -0700)]
Rename carrier config constant.
Bug:
23063217
Change-Id: I0050f0009a7681df1b04edbbd9331bc2918464a2
Tyler Gunn [Mon, 31 Aug 2015 20:07:46 +0000 (20:07 +0000)]
am
3bd58233: am
d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev
* commit '
3bd58233ab3ec8509a3f8922344ae30a330f5159':
Add carrier config for allowing non-emerg calls in ECM mode.
Adrian Roos [Mon, 31 Aug 2015 20:04:46 +0000 (20:04 +0000)]
Merge "Disable fingerprint after force lock" into mnc-dr-dev
Bart Sears [Mon, 31 Aug 2015 20:02:34 +0000 (20:02 +0000)]
am
0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '
0e2e85898743a070a0c42036fa9d841694819a00':
Don't throttle "while idle" alarms while not dozing
Tyler Gunn [Mon, 31 Aug 2015 19:55:55 +0000 (19:55 +0000)]
am
d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev
* commit '
d833cb54537b81d49b6563afb7583d4b36e19c51':
Add carrier config for allowing non-emerg calls in ECM mode.
Bart Sears [Mon, 31 Aug 2015 19:49:11 +0000 (19:49 +0000)]
Merge "Don't throttle "while idle" alarms while not dozing" into mnc-dev
Tyler Gunn [Mon, 31 Aug 2015 19:46:12 +0000 (19:46 +0000)]
Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev
Adam Lesinski [Mon, 31 Aug 2015 19:33:24 +0000 (19:33 +0000)]
am
d0ce1fbb: am
69e17f59: am
da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
* commit '
d0ce1fbbba497e9b5082c69d8da7260e85b0b579':
BatteryStats: Start using cpu power from kernel
Adam Lesinski [Mon, 31 Aug 2015 19:23:44 +0000 (19:23 +0000)]
am
69e17f59: am
da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
* commit '
69e17f59f8aaccbe66ea9ef976d01f076a7a06c3':
BatteryStats: Start using cpu power from kernel
Adam Lesinski [Mon, 31 Aug 2015 19:13:39 +0000 (19:13 +0000)]
am
da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
* commit '
da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95':
BatteryStats: Start using cpu power from kernel
Adam Lesinski [Mon, 31 Aug 2015 19:04:46 +0000 (19:04 +0000)]
Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
Christopher Wiley [Mon, 31 Aug 2015 19:03:44 +0000 (19:03 +0000)]
Merge "aidl: Pull main() into dedicated file"
Christopher Wiley [Sun, 30 Aug 2015 17:57:07 +0000 (10:57 -0700)]
aidl: Pull main() into dedicated file
This separates the main() entry point from the functionality we're
hoping to test. While here, redo the header guards to be consistent
accross the codebae.
Bug:
23516947
Change-Id: I61666126bdba0941f14bd0f031caaa30367b864a
Test: Compiles
Christopher Wiley [Mon, 31 Aug 2015 17:52:03 +0000 (17:52 +0000)]
Merge "Tighten up compiler flags for aidl"
Svetoslav Ganov [Mon, 31 Aug 2015 17:51:52 +0000 (17:51 +0000)]
am
d1c6dca6: am
bbd723ce: am
144c4ff0: am
4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev
* commit '
d1c6dca6219099ca73df04a65cc4e62b2d8102f6':
Fix a NPE when shutting down instrumentation
Tyler Gunn [Fri, 28 Aug 2015 21:14:11 +0000 (14:14 -0700)]
Add carrier config for allowing non-emerg calls in ECM mode.
Default value is TRUE for all carriers, meaning that non-emergency calls
are allowed even when the phone is in emergency callback mode.
Bug:
23063217
Change-Id: I4a227ce64a1e594a055560f42c7611c8eccdae0f
Svetoslav Ganov [Mon, 31 Aug 2015 17:45:11 +0000 (17:45 +0000)]
am
bbd723ce: am
144c4ff0: am
4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev
* commit '
bbd723ce63abdc63c77869fe00ca4aee5a756a9e':
Fix a NPE when shutting down instrumentation
Svetoslav Ganov [Mon, 31 Aug 2015 17:33:09 +0000 (17:33 +0000)]
am
144c4ff0: am
4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev
* commit '
144c4ff08a0be40e6b8af1bca269b33557923d71':
Fix a NPE when shutting down instrumentation
Svetoslav Ganov [Mon, 31 Aug 2015 17:22:53 +0000 (17:22 +0000)]
am
4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev
* commit '
4cb113ed72b771d3148c00a025eb8bc949ff6a41':
Fix a NPE when shutting down instrumentation
Svetoslav Ganov [Mon, 31 Aug 2015 17:16:23 +0000 (17:16 +0000)]
Merge "Fix a NPE when shutting down instrumentation" into mnc-dev
Bryce Lee [Mon, 31 Aug 2015 15:39:47 +0000 (15:39 +0000)]
am
3ef68803: am
ad9a0efc: Merge "Add capability for a connection hand rejection text response." into cw-e-dev
* commit '
3ef6880358ea32ba0cacedf89347716c1cf38d2d':
Add capability for a connection hand rejection text response.
Bryce Lee [Mon, 31 Aug 2015 15:30:30 +0000 (15:30 +0000)]
am
ad9a0efc: Merge "Add capability for a connection hand rejection text response." into cw-e-dev
* commit '
ad9a0efc070f8a948f943d52a43dccf54e49db61':
Add capability for a connection hand rejection text response.
Bryce Lee [Mon, 31 Aug 2015 15:19:44 +0000 (15:19 +0000)]
Merge "Add capability for a connection hand rejection text response." into cw-e-dev
Christopher Wiley [Mon, 24 Aug 2015 22:06:58 +0000 (15:06 -0700)]
Tighten up compiler flags for aidl
Turn all warnings to errors, with special cases for places where
yacc forces us to be lenient. Remove one variable with 0 references
elsewhere in the code.
Change-Id: Ia7819795eb162e9c77d215088aee4c45bd87c1af
Svet Ganov [Sun, 30 Aug 2015 17:44:39 +0000 (10:44 -0700)]
Fix a NPE when shutting down instrumentation
bug:
23657953
Change-Id: I7187c3d911de24abe20a2c462a10352dd741efed
Pavel Zhamaitsiak [Sat, 29 Aug 2015 23:09:57 +0000 (23:09 +0000)]
am
59f3c342: am
6611cff4: am
d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev
* commit '
59f3c3429bf61ff4eb6f5d16abba01cb58cc5ee9':
Support uneditable enhanced 4g lte mode config
Geoff Mendal [Sat, 29 Aug 2015 23:09:51 +0000 (23:09 +0000)]
am
999576d0: (-s ours) am
8038391a: (-s ours) am
469fa946: (-s ours) Import translations. DO NOT MERGE
* commit '
999576d050376f6b3e78827f9a0353b376ace1e4':
Import translations. DO NOT MERGE
Pavel Zhamaitsiak [Sat, 29 Aug 2015 22:57:34 +0000 (22:57 +0000)]
am
6611cff4: am
d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev
* commit '
6611cff402f0edeff85e7a9e6fedc6eeb8f8b1f1':
Support uneditable enhanced 4g lte mode config
Geoff Mendal [Sat, 29 Aug 2015 22:57:29 +0000 (22:57 +0000)]
am
8038391a: (-s ours) am
469fa946: (-s ours) Import translations. DO NOT MERGE
* commit '
8038391a0841f6a038a9dd3592675e794678835b':
Import translations. DO NOT MERGE
Pavel Zhamaitsiak [Sat, 29 Aug 2015 22:44:41 +0000 (22:44 +0000)]
am
d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev
* commit '
d9efca994f99523288986f29128d696440ee4150':
Support uneditable enhanced 4g lte mode config
Geoff Mendal [Sat, 29 Aug 2015 22:44:37 +0000 (22:44 +0000)]
am
469fa946: (-s ours) Import translations. DO NOT MERGE
* commit '
469fa946132b34165ea014e2eef7cd94f59171c1':
Import translations. DO NOT MERGE
Pavel Zhamaitsiak [Sat, 29 Aug 2015 15:40:05 +0000 (15:40 +0000)]
Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev
Geoff Mendal [Sat, 29 Aug 2015 15:37:22 +0000 (08:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I770ccd06cea0e57fa92434a33e4e183d79010921
Auto-generated-cl: translation import
Jim Miller [Sat, 29 Aug 2015 01:46:48 +0000 (01:46 +0000)]
am
098cb247: am
3396a11e: am
3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev
* commit '
098cb2470fa8f13bb3da6267dd33495391b508cc':
Run callbacks from fingerprintd through handler.
Jim Miller [Sat, 29 Aug 2015 01:37:41 +0000 (01:37 +0000)]
am
3396a11e: am
3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev
* commit '
3396a11e354fe4d6243749579c976b341d1007a0':
Run callbacks from fingerprintd through handler.
Jim Miller [Sat, 29 Aug 2015 01:26:21 +0000 (01:26 +0000)]
am
3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev
* commit '
3656975ef879175aa81cf6362a6a7ffc4a5a99fc':
Run callbacks from fingerprintd through handler.
Jim Miller [Sat, 29 Aug 2015 01:14:45 +0000 (01:14 +0000)]
Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev
Jim Miller [Sat, 29 Aug 2015 00:29:49 +0000 (17:29 -0700)]
Run callbacks from fingerprintd through handler.
This fixes a potential race condition on the client monitors
where an async event from fingerprintd could change the state
and disrupt communication with the clients.
Fixes bug
23633702
Change-Id: I69635ab768f1e8abefd0b0d8b8e73bb81e7b5695
Ian Pedowitz [Sat, 29 Aug 2015 00:57:55 +0000 (00:57 +0000)]
am
2e80aa73: am
6f75cb14: am
8d027e6d: am
3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev
* commit '
2e80aa7302611b698897129c379907b18da89b91':
Show the ResolverActivity in dock mode
Ian Pedowitz [Sat, 29 Aug 2015 00:52:10 +0000 (00:52 +0000)]
am
6f75cb14: am
8d027e6d: am
3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev
* commit '
6f75cb1476c1e59a255078468aa586b6fca32ee8':
Show the ResolverActivity in dock mode
Zhentao Sun [Thu, 27 Aug 2015 00:37:30 +0000 (17:37 -0700)]
Don't launch the camera if it already in foreground.
b/
23431496. This change will not launch the Intent if the target app of
this Intent is already running in the foreground.
Change-Id: Ic8c99cf3312a2ead12dbdb94825181aed934e9f0
Ian Pedowitz [Sat, 29 Aug 2015 00:40:19 +0000 (00:40 +0000)]
am
8d027e6d: am
3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev
* commit '
8d027e6d523d13a9cf2a5cf4ef901cc3e78b901d':
Show the ResolverActivity in dock mode
Sungmin Choi [Wed, 26 Aug 2015 06:30:34 +0000 (23:30 -0700)]
Support uneditable enhanced 4g lte mode config
Bug:
23539759
Change-Id: I069d994eaef2f57c3d01ff2f36abcd274da431a5
Ian Pedowitz [Sat, 29 Aug 2015 00:31:29 +0000 (00:31 +0000)]
am
3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev
* commit '
3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07':
Show the ResolverActivity in dock mode
Ian Pedowitz [Sat, 29 Aug 2015 00:20:27 +0000 (00:20 +0000)]
Merge "Show the ResolverActivity in dock mode" into mnc-dev
Selim Cinek [Sat, 29 Aug 2015 00:05:56 +0000 (17:05 -0700)]
Fixed a bug where the secure camera would flash when rotated
Bug:
23602571
Change-Id: I9608a004d97ad27a0f4c6da8e9d955dc644b4941
OSDN Git Service
