OSDN Git Service
Yasuhiro Matsuda [Wed, 2 Sep 2015 14:31:26 +0000 (14:31 +0000)]
am
ebf9465d: resolved conflicts for merge of
ef57e5e0 to stage-aosp-master
* commit '
ebf9465d213336819b15e3b21d02afce64470d4f':
Add trace code to system server.
Yasuhiro Matsuda [Wed, 2 Sep 2015 13:48:13 +0000 (22:48 +0900)]
resolved conflicts for merge of
ef57e5e0 to stage-aosp-master
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
Yasuhiro Matsuda [Wed, 2 Sep 2015 12:54:23 +0000 (12:54 +0000)]
Merge "Add trace code to system server."
Christopher Wiley [Tue, 1 Sep 2015 20:11:55 +0000 (20:11 +0000)]
am
96343073: am
dd80a6cf: Merge "aidl: Stop using Bionic\'s test main"
* commit '
96343073d63c72afa75057129abea4f0d4f8c103':
aidl: Stop using Bionic's test main
Christopher Wiley [Tue, 1 Sep 2015 20:01:30 +0000 (20:01 +0000)]
am
dd80a6cf: Merge "aidl: Stop using Bionic\'s test main"
* commit '
dd80a6cf37799b41ae07c60137d312c5ea2db961':
aidl: Stop using Bionic's test main
Christopher Wiley [Tue, 1 Sep 2015 19:46:21 +0000 (19:46 +0000)]
Merge "aidl: Stop using Bionic's test main"
Christopher Wiley [Tue, 1 Sep 2015 19:39:25 +0000 (12:39 -0700)]
aidl: Stop using Bionic's test main
This allows us to build unittests on Mac, where Bionic's test main
does not build.
Change-Id: I59c805d233498bb67575f2e5f7049341f70ce55c
Christopher Wiley [Tue, 1 Sep 2015 19:00:53 +0000 (19:00 +0000)]
am
c8e4af65: am
722bf5c7: Merge "aidl: Separate aidl logic into its own static library"
* commit '
c8e4af65af7990d45e5505ebedc832c0a8fe58aa':
aidl: Separate aidl logic into its own static library
Christopher Wiley [Tue, 1 Sep 2015 18:49:12 +0000 (18:49 +0000)]
am
722bf5c7: Merge "aidl: Separate aidl logic into its own static library"
* commit '
722bf5c7dec37265021c17d35b0b078776699f97':
aidl: Separate aidl logic into its own static library
Christopher Wiley [Tue, 1 Sep 2015 18:34:32 +0000 (18:34 +0000)]
Merge "aidl: Separate aidl logic into its own static library"
Christopher Wiley [Tue, 1 Sep 2015 18:31:11 +0000 (18:31 +0000)]
am
cf471647: am
267cb88f: Merge "Set up aidl for gtest"
* commit '
cf4716473d5af3cd257b7e093c95c9b63b3b32c9':
Set up aidl for gtest
Christopher Wiley [Tue, 1 Sep 2015 18:20:19 +0000 (18:20 +0000)]
am
267cb88f: Merge "Set up aidl for gtest"
* commit '
267cb88f4d4adb2cdddd9b29eb8fce7104507114':
Set up aidl for gtest
Christopher Wiley [Tue, 1 Sep 2015 18:07:48 +0000 (11:07 -0700)]
aidl: Separate aidl logic into its own static library
Compile aidl's logic into a static library that can be
linked against both the unittest binary and the executable. Validate
that this is working by writing a basic unittest against options
parsing.
Provide default values for Options struct members. These were
previously taking on values according to the the bits in the memory
allocated to hold them for preprocessed inputs.
Bug:
23516947
Change-Id: Ib57cd7f473995f7851d788deac39f9c4d9018e8f
Test: compiles and unittests pass
Christopher Wiley [Tue, 1 Sep 2015 18:11:41 +0000 (18:11 +0000)]
Merge "Set up aidl for gtest"
Nick Kralevich [Tue, 1 Sep 2015 16:51:19 +0000 (16:51 +0000)]
am
712205ba: am
9d586927: Merge "Automatically assign default seinfo labels using the string "default"."
* commit '
712205bac075dc59a1ccd79a860d553ba31402f0':
Automatically assign default seinfo labels using the string "default".
Christopher Wiley [Tue, 1 Sep 2015 16:51:12 +0000 (16:51 +0000)]
am
26627d70: am
4d6cb77a: Merge "Tighten up compiler flags for aidl"
* commit '
26627d7011e8fbd66f0cabac5c3cb2a66c133d08':
Tighten up compiler flags for aidl
Dan Willemsen [Tue, 1 Sep 2015 16:51:05 +0000 (16:51 +0000)]
am
13786e28: am
60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"
* commit '
13786e281e4d67b9e2ff549fee34ddb3e82e0325':
Remove USE_MINGW, whitelist windows modules
Christopher Wiley [Tue, 1 Sep 2015 16:50:59 +0000 (16:50 +0000)]
am
a6d16725: am
a73e0045: Merge "Revert "Tighten up compiler flags for aidl""
* commit '
a6d167256d37f2b182658bb2d8ac6ed3f6258cb8':
Revert "Tighten up compiler flags for aidl"
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
Nick Kralevich [Tue, 1 Sep 2015 16:37:59 +0000 (16:37 +0000)]
am
9d586927: Merge "Automatically assign default seinfo labels using the string "default"."
* commit '
9d586927102b597845607ccc82661e350821de82':
Automatically assign default seinfo labels using the string "default".
Christopher Wiley [Tue, 1 Sep 2015 16:37:31 +0000 (16:37 +0000)]
am
4d6cb77a: Merge "Tighten up compiler flags for aidl"
* commit '
4d6cb77ad92c9acadb5afc5d80be38dd3b63c3fa':
Tighten up compiler flags for aidl
Dan Willemsen [Tue, 1 Sep 2015 16:37:10 +0000 (16:37 +0000)]
am
60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"
* commit '
60dd5d5966ebe993f5a81c46d9dea62c207abfd3':
Remove USE_MINGW, whitelist windows modules
Christopher Wiley [Tue, 1 Sep 2015 16:37:00 +0000 (16:37 +0000)]
am
a73e0045: Merge "Revert "Tighten up compiler flags for aidl""
* commit '
a73e004516bae61bebe1e308f5b3ee295c1050b2':
Revert "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
Nick Kralevich [Tue, 1 Sep 2015 13:39:10 +0000 (13:39 +0000)]
Merge "Automatically assign default seinfo labels using the string "default"."
Robert Craig [Fri, 28 Aug 2015 16:11:41 +0000 (12:11 -0400)]
Automatically assign default seinfo labels using the string "default".
default seinfo values are those for which policy lacks a
matching stanza in the corresponding mac_permissions.xml
file. Prior to this change the null object reference was
used to represent the non-matching state. This is in
contrast to a policy supplied default stanza which will
assign a non null seinfo value. Confused yet?
Basically, two default states were distinguished in the
code to describe the two cases where either a policy stanza
spelled out the base case seinfo label or not. Policy
writers could either supply a default stanza or rely on
the class instantiated value assigned by the ApplicationInfo
object. The hope was that the later assignment could be
used to help distinguish the cases where policy writers
intentionally white listed apps. This change will just use
the hard coded "default" string implicitly to describe all
cases and removes the idea of a policy supplied default stanza.
Change-Id: Ib7b01ee004775f24db9a69340a31784b967ce030
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
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
Christopher Wiley [Mon, 31 Aug 2015 20:59:23 +0000 (20:59 +0000)]
Merge "Tighten up compiler flags for aidl"
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
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.
These flags are confined to be clang only because the Windows SDK build
is using an older compiler that does not understand these flags.
Change-Id: I6407bd331c25b8845bde46e9a917bce1d6857bd8
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
Dan Willemsen [Mon, 31 Aug 2015 19:30:57 +0000 (19:30 +0000)]
Merge "Remove USE_MINGW, whitelist windows modules"
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
Christopher Wiley [Mon, 31 Aug 2015 19:13:04 +0000 (19:13 +0000)]
Merge "Revert "Tighten up compiler flags for aidl""
Christopher Wiley [Mon, 31 Aug 2015 19:07:40 +0000 (19:07 +0000)]
Revert "Tighten up compiler flags for aidl"
This reverts commit
eea2353a3427f7d157c46e24ab6aba1378e16c2e.
This seems to have broken the build because whatever compiler the builder is using doesn't understand the same "turn off this warning" flags as my local host's compiler.
Change-Id: Ic68b7065b161a5ae683b7082c67147835833e0fa
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
OSDN Git Service
