OSDN Git Service
Filip Gruszczynski [Thu, 3 Sep 2015 04:23:40 +0000 (04:23 +0000)]
am
521ded6e: am
dbf8c0d9: am
991e4936: am
cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev
* commit '
521ded6e9dcb9e97843c89f6d7c87264107d4ef7':
Don't perform layout while adjusting displays/stacks state.
Eino-Ville Talvala [Thu, 3 Sep 2015 04:23:35 +0000 (04:23 +0000)]
am
cb41a60e: am
7f2b4b6a: am
7e28b3bc: am
f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
* commit '
cb41a60ee259ee332eb11e2208c3ae5582ec5aec':
DO NOT MERGE: Fix DngCreator default crop calculations.
Selim Cinek [Thu, 3 Sep 2015 04:23:28 +0000 (04:23 +0000)]
am
260ae8e5: am
3e64c75f: am
146dc265: am
9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev
* commit '
260ae8e56c6c3f6acd9290a843f6cfe27cdad6a7':
Fixed when the notification effects are being cleared
Jim Miller [Thu, 3 Sep 2015 04:23:13 +0000 (04:23 +0000)]
am
444f8d2d: am
d050cc87: am
e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
* commit '
444f8d2d37144a3cb3966b3ca9118a7242c094e7':
Fix broken enter key after failed PIN attempts.
Vineeta Srivastava [Thu, 3 Sep 2015 04:23:07 +0000 (04:23 +0000)]
am
971f899a: am
53c14ce4: am
860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev
* commit '
971f899ab0ef939bce126ca26d7489799fe4edf8':
Do not show roaming icon for NL KPN network with Telfort SIM
Svetoslav [Thu, 3 Sep 2015 04:22:57 +0000 (04:22 +0000)]
am
42e3c369: am
dc436aaa: am
69228600: am
fb9ec507: Incorrect app op check in broadcast queue
* commit '
42e3c3696d7c5a6ee6ec4c9fd37289d6e917577a':
Incorrect app op check in broadcast queue
Tim Murray [Thu, 3 Sep 2015 04:22:36 +0000 (04:22 +0000)]
am
e2565aec: am
e20eff91: am
3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev
* commit '
e2565aecca1c56dcf80bb0e88dfddeca25388ad6':
Enable migration to big cores for app launches.
Christopher Wiley [Thu, 3 Sep 2015 00:39:29 +0000 (00:39 +0000)]
am
80a679c4: am
b1db04f3: Merge "aidl: Add end to end test"
* commit '
80a679c459d509e31f0f4e1b8accc327a451e0f5':
aidl: Add end to end test
Christopher Wiley [Thu, 3 Sep 2015 00:39:22 +0000 (00:39 +0000)]
am
a3b4fb68: am
b14e7b84: Merge "aidl: Remove example test"
* commit '
a3b4fb6851dc91222863783b7ac6664d62df2c3d':
aidl: Remove example test
Christopher Wiley [Thu, 3 Sep 2015 00:31:52 +0000 (00:31 +0000)]
am
b1db04f3: Merge "aidl: Add end to end test"
* commit '
b1db04f371963cb61bc5df21142a59f77515a62f':
aidl: Add end to end test
Christopher Wiley [Thu, 3 Sep 2015 00:31:45 +0000 (00:31 +0000)]
am
b14e7b84: Merge "aidl: Remove example test"
* commit '
b14e7b84290fa40221e3f315862dd1f79bf21871':
aidl: Remove example test
Casey Dahlin [Wed, 2 Sep 2015 23:20:40 +0000 (23:20 +0000)]
am
b15623cf: resolved conflicts for merge of
9483748a to stage-aosp-master
* commit '
b15623cf1c63d33fdd60c6046312c88cda961eb6':
Delete outdated options tests
Casey Dahlin [Wed, 2 Sep 2015 21:33:41 +0000 (14:33 -0700)]
resolved conflicts for merge of
9483748a to stage-aosp-master
Change-Id: I82fd3a6ddeffc564915e43b23b81293adf1f9b5d
Casey Dahlin [Wed, 2 Sep 2015 21:29:59 +0000 (21:29 +0000)]
am
bad130ee: am
02bc5488: Merge "Remove RPC interface Type"
* commit '
bad130eed378891b82250d90aaf207088b4362e2':
Remove RPC interface Type
Casey Dahlin [Wed, 2 Sep 2015 21:18:46 +0000 (21:18 +0000)]
am
02bc5488: Merge "Remove RPC interface Type"
* commit '
02bc5488c19dcae7f21c43c8f3a20138e01a04d9':
Remove RPC interface Type
Christopher Wiley [Wed, 2 Sep 2015 21:10:30 +0000 (21:10 +0000)]
Merge "aidl: Add end to end test"
Christopher Wiley [Wed, 2 Sep 2015 21:10:09 +0000 (21:10 +0000)]
Merge "aidl: Remove example test"
Casey Dahlin [Wed, 2 Sep 2015 21:02:02 +0000 (21:02 +0000)]
Merge "Delete outdated options tests"
Casey Dahlin [Wed, 2 Sep 2015 21:01:33 +0000 (21:01 +0000)]
Merge "Remove RPC interface Type"
Casey Dahlin [Wed, 2 Sep 2015 18:02:11 +0000 (11:02 -0700)]
Delete outdated options tests
Bug:
23718807
Test: Re-ran make. Confirmed code was not linked.
Change-Id: If065b9287ed70b9e380281cae42f89bd5f1ffb06
Signed-off-by: Casey Dahlin <sadmac@google.com>
Casey Dahlin [Tue, 1 Sep 2015 20:21:26 +0000 (13:21 -0700)]
Remove RPC interface Type
AIDL previously supported "rpc" and "flatten" types, which are not used
anywhere in the Android tree. This patch removes them, which significantly cuts
down code and complexity.
Bug:
23517584
Test: Rebuilt AOSP tree against new version
Change-Id: I6cf38d43c1ce109ffca987cc14520945aa22431f
Signed-off-by: Casey Dahlin <sadmac@google.com>
Christopher Wiley [Tue, 1 Sep 2015 00:36:41 +0000 (17:36 -0700)]
aidl: Add end to end test
This test sets up an artificial hierarchy of .aidl files, then
checks that the generated code contains a substring that we
know to be correct. This isn't a very good unittest, but it does
validate that the whole flow works start to finish.
Bug:
23516947
Test: compiles, unit tests pass.
Change-Id: I931b7659731b05440040623e12596669604cef3a
Christopher Wiley [Wed, 2 Sep 2015 19:49:52 +0000 (12:49 -0700)]
aidl: Remove example test
We have enough tests demonstrating how to write them.
Bug:
23516947
Change-Id: I966cb6bb2d754db389be8f9b90957ac33cf66639
Test: Unittests pass.
Christopher Wiley [Wed, 2 Sep 2015 16:43:08 +0000 (16:43 +0000)]
am
d494b8c0: am
f37947cb: Merge "aidl: Don\'t link librt on Mac"
* commit '
d494b8c0cfaeedfb560f09355254c5fe397242be':
aidl: Don't link librt on Mac
Christopher Wiley [Wed, 2 Sep 2015 16:34:40 +0000 (16:34 +0000)]
am
f37947cb: Merge "aidl: Don\'t link librt on Mac"
* commit '
f37947cb1a452b81f7b25cf961763c2ec3db5632':
aidl: Don't link librt on Mac
Christopher Wiley [Wed, 2 Sep 2015 16:23:01 +0000 (16:23 +0000)]
Merge "aidl: Don't link librt on Mac"
Christopher Wiley [Wed, 2 Sep 2015 01:36:44 +0000 (18:36 -0700)]
aidl: Don't link librt on Mac
This fixes unittest build on Mac.
Change-Id: I5180f647d1b5b41f99c4d0423aaec9d05fee6355
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."
Filip Gruszczynski [Wed, 2 Sep 2015 00:06:38 +0000 (00:06 +0000)]
am
dbf8c0d9: am
991e4936: am
cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev
* commit '
dbf8c0d9260f83b0d4d60c1dea1fbcd023ee5d29':
Don't perform layout while adjusting displays/stacks state.
Eino-Ville Talvala [Wed, 2 Sep 2015 00:06:32 +0000 (00:06 +0000)]
am
7f2b4b6a: am
7e28b3bc: am
f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
* commit '
7f2b4b6a63a6d2d6f7cbd6be9cc86d826fa99107':
DO NOT MERGE: Fix DngCreator default crop calculations.
Selim Cinek [Wed, 2 Sep 2015 00:06:24 +0000 (00:06 +0000)]
am
3e64c75f: am
146dc265: am
9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev
* commit '
3e64c75f33ef1f7876e1ae19fc1af4ff1e7ebdb6':
Fixed when the notification effects are being cleared
Filip Gruszczynski [Tue, 1 Sep 2015 23:49:41 +0000 (23:49 +0000)]
am
991e4936: am
cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev
* commit '
991e493616a644b6bb7fdea9a99990520d77348a':
Don't perform layout while adjusting displays/stacks state.
Eino-Ville Talvala [Tue, 1 Sep 2015 23:49:37 +0000 (23:49 +0000)]
am
7e28b3bc: am
f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
* commit '
7e28b3bced7d6963114f667fc2ec0a13ff64607d':
DO NOT MERGE: Fix DngCreator default crop calculations.
Selim Cinek [Tue, 1 Sep 2015 23:49:33 +0000 (23:49 +0000)]
am
146dc265: am
9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev
* commit '
146dc26511a9a1b82bf62d679b9cae6e8966241f':
Fixed when the notification effects are being cleared
Filip Gruszczynski [Tue, 1 Sep 2015 23:33:58 +0000 (23:33 +0000)]
am
cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev
* commit '
cbacd4f0cee10b63adf6e2d482e7b4f62c0104a0':
Don't perform layout while adjusting displays/stacks state.
Eino-Ville Talvala [Tue, 1 Sep 2015 23:33:54 +0000 (23:33 +0000)]
am
f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
* commit '
f50d4ce6d31c8401b36cbf07df75264bc417519d':
DO NOT MERGE: Fix DngCreator default crop calculations.
Selim Cinek [Tue, 1 Sep 2015 23:33:50 +0000 (23:33 +0000)]
am
9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev
* commit '
9a2d5742bd11c2a7a583d53b1ef1ad12d75e239e':
Fixed when the notification effects are being cleared
Jim Miller [Tue, 1 Sep 2015 23:32:43 +0000 (23:32 +0000)]
am
d050cc87: am
e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
* commit '
d050cc87c865d0ea382132d5669668e7b806ac89':
Fix broken enter key after failed PIN attempts.
Vineeta Srivastava [Tue, 1 Sep 2015 23:32:35 +0000 (23:32 +0000)]
am
53c14ce4: am
860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev
* commit '
53c14ce4f1f4b85fa4c4418327353b92fa6b0499':
Do not show roaming icon for NL KPN network with Telfort SIM
Filip Gruszczynski [Tue, 1 Sep 2015 23:11:46 +0000 (23:11 +0000)]
Merge "Don't perform layout while adjusting displays/stacks state." into mnc-dev
Jim Miller [Tue, 1 Sep 2015 23:08:06 +0000 (23:08 +0000)]
am
e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
* commit '
e45761ff901342a538607a3539997b106e867821':
Fix broken enter key after failed PIN attempts.
Vineeta Srivastava [Tue, 1 Sep 2015 23:08:03 +0000 (23:08 +0000)]
am
860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev
* commit '
860aa1e1b08ec119c5cc538cb2019ec53a72aeab':
Do not show roaming icon for NL KPN network with Telfort SIM
Eino-Ville Talvala [Tue, 1 Sep 2015 23:06:17 +0000 (23:06 +0000)]
Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
Svetoslav [Tue, 1 Sep 2015 23:01:53 +0000 (23:01 +0000)]
am
dc436aaa: am
69228600: am
fb9ec507: Incorrect app op check in broadcast queue
* commit '
dc436aaaf2f00ddb0faf70ff6dfb8368c8a589f7':
Incorrect app op check in broadcast queue
Selim Cinek [Tue, 1 Sep 2015 23:00:25 +0000 (23:00 +0000)]
Merge "Fixed when the notification effects are being cleared" into mnc-dev
Jim Miller [Tue, 1 Sep 2015 22:58:43 +0000 (22:58 +0000)]
Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
Vineeta Srivastava [Tue, 1 Sep 2015 22:55:54 +0000 (22:55 +0000)]
Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev
Svetoslav [Tue, 1 Sep 2015 22:52:09 +0000 (22:52 +0000)]
am
69228600: am
fb9ec507: Incorrect app op check in broadcast queue
* commit '
692286008c197bb2810fcaf9441be5cb6a860ce0':
Incorrect app op check in broadcast queue
Svetoslav [Tue, 1 Sep 2015 22:39:46 +0000 (22:39 +0000)]
am
fb9ec507: Incorrect app op check in broadcast queue
* commit '
fb9ec50795142c24b56dd28e45f5012b9b445380':
Incorrect app op check in broadcast queue
Jim Miller [Tue, 1 Sep 2015 22:21:55 +0000 (15:21 -0700)]
Fix broken enter key after failed PIN attempts.
Fixes bug
23699953
Change-Id: Id099443b830f5608c0bf955075c3407b401f3d53
Svetoslav [Tue, 1 Sep 2015 21:45:18 +0000 (14:45 -0700)]
Incorrect app op check in broadcast queue
An intent broadcaster can specify which permissions should be
held by a receiver to get the broadcast. These permissions may
have corresponding app ops and if this is the case we also
check the app ops. There is a bug in broadcast queue where if
a permission does not have an app op we still try to check this
app op and get an exception as the app op does not exist. This
did not manifest often because the broadcast API takes an
optional app op against which is compared the app op for each
permission and if they differ the app op for the permission is
checked.
bug:
23725305
Change-Id: Iec56ee354bbc11e7bc245134cf3afd2c11eecbc4
Tim Murray [Tue, 1 Sep 2015 21:43:13 +0000 (21:43 +0000)]
am
e20eff91: am
3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev
* commit '
e20eff91a429465bb92e0f3a21d6d7e31f2114df':
Enable migration to big cores for app launches.
Tim Murray [Tue, 1 Sep 2015 21:33:36 +0000 (21:33 +0000)]
am
3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev
* commit '
3491da4eb3714556ac908777be3a55f2e200bf0b':
Enable migration to big cores for app launches.
Tim Murray [Tue, 1 Sep 2015 21:23:38 +0000 (21:23 +0000)]
Merge "Enable migration to big cores for app launches." into mnc-dr-dev
Ruben Brunk [Thu, 27 Aug 2015 21:00:03 +0000 (14:00 -0700)]
DO NOT MERGE: Fix DngCreator default crop calculations.
Bug:
23591407
Bug:
23697593
Change-Id: I1b0e46e7371b3db63e8d68230964d09d7537c3ce
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
Sungmin Choi [Tue, 1 Sep 2015 18:13:33 +0000 (11:13 -0700)]
Do not show roaming icon for NL KPN network with Telfort SIM
Bug:
23707729
Change-Id: I9c27e814b652c1e3d3a1d75c0f4e51ed153ec3ae
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
Filip Gruszczynski [Mon, 31 Aug 2015 15:57:24 +0000 (08:57 -0700)]
Don't perform layout while adjusting displays/stacks state.
When we detach the stack from the display we are in an inconsistent
state. We need to finish that operation, before we start laying out
things again. Otherwise we will encounter subtle bugs, where stack is
partially closed, but still used during the layout.
Display detachment was already doing the right thing and scheduling a
layout after it finishes the display detach. However, removing the
stack's windows was triggering immediate relayout and causing a crash.
This CL also adds some missing synchronization around
WindowManagerService.mStackIdToStack, which is in most cases protected by
mWindowMap.
Bug:
22191609
Bug:
23615329
Change-Id: I1e2fc42e1a5b673be808acdec473f85f138d7062
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
Selim Cinek [Mon, 31 Aug 2015 23:15:49 +0000 (16:15 -0700)]
Fixed when the notification effects are being cleared
Previously the notification effects were not correctly cleared in certain
cases and the user could end up in a state where the notification light would
always blink.
Bug:
22931139
Change-Id: I9a71e56cf4479354a9d773b5b6f0edd7693f2b05
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.