diff options
3 files changed, 97 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java index 0adb4392a174..29a6b956ed1e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java @@ -403,7 +403,7 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi boolean hasCACerts = !(conn.getService().getUserCaAliases().getList().isEmpty()); return new Pair<Integer, Boolean>(userId[0], hasCACerts); } catch (RemoteException | InterruptedException | AssertionError e) { - Log.i(TAG, e.getMessage()); + Log.i(TAG, "failed to get CA certs", e); new Handler(Dependency.get(Dependency.BG_LOOPER)).postDelayed( () -> new CACertLoader().execute(userId[0]), CA_CERT_LOADING_RETRY_TIME_IN_MS); diff --git a/services/core/java/com/android/server/policy/TEST_MAPPING b/services/core/java/com/android/server/policy/TEST_MAPPING new file mode 100644 index 000000000000..e212b0481ed6 --- /dev/null +++ b/services/core/java/com/android/server/policy/TEST_MAPPING @@ -0,0 +1,50 @@ +{ + "presubmit": [ + { + "name": "FrameworksServicesTests", + "options": [ + { + "include-filter": "com.android.server.policy." + }, + { + "include-annotation": "android.platform.test.annotations.Presubmit" + }, + { + "exclude-annotation": "android.support.test.filters.FlakyTest" + } + ] + }, + { + "name": "WmTests", + "options": [ + { + "include-filter": "com.android.server.policy." + }, + { + "include-annotation": "android.platform.test.annotations.Presubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + } + ] + } + ], + "postsubmit": [ + { + "name": "FrameworksServicesTests", + "options": [ + { + "include-filter": "com.android.server.policy." + } + ] + }, + { + "name": "WmTests", + "options": [ + { + "include-filter": "com.android.server.policy." + } + ] + } + ] +} diff --git a/services/tests/wmtests/src/com/android/server/policy/DummyPolicyTests.java b/services/tests/wmtests/src/com/android/server/policy/DummyPolicyTests.java new file mode 100644 index 000000000000..03fb12350127 --- /dev/null +++ b/services/tests/wmtests/src/com/android/server/policy/DummyPolicyTests.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.policy; + +import android.platform.test.annotations.Presubmit; + +import org.junit.Test; + +import androidx.test.filters.FlakyTest; + +/** + * Dummy test for com.android.server.policy. + * TODO(b/113800711): Remove this class once the actual tests are moved from servicestests. + */ +public class DummyPolicyTests { + + @Presubmit + @Test + public void preSubmitTest() {} + + @FlakyTest + @Presubmit + @Test + public void flakyPreSubmitTest() {} + + @Test + public void postSubmitTest() {} + + @FlakyTest + @Test + public void flakyPostSubmitTest() {} +} |