Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e78467f6 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Add tests for verifying network availability on activity start." into oc-dev

parents d17ebaba 686bb2d3

services/tests/servicestests/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    ShortcutManagerTestUtils \

    truth-prebuilt



LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl



LOCAL_SRC_FILES += aidl/com/android/servicestests/aidl/INetworkStateObserver.aidl



LOCAL_JAVA_LIBRARIES := android.test.runner



LOCAL_PACKAGE_NAME := FrameworksServicesTests

services/tests/servicestests/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 
    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS" />

    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />

    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />

    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />

    <uses-permission android:name="android.permission.DELETE_PACKAGES" />



    <application>

        <uses-library android:name="android.test.runner" />

services/tests/servicestests/aidl/Android.mk

0 → 100644
+23 −0
Original line number Diff line number Diff line 
# Copyright (C) 2017 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.



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests

LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := \

        com/android/servicestests/aidl/INetworkStateObserver.aidl

LOCAL_MODULE := servicestests-aidl

include $(BUILD_STATIC_JAVA_LIBRARY)
 
 No newline at end of file

services/tests/servicestests/aidl/com/android/servicestests/aidl/INetworkStateObserver.aidl

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.servicestests.aidl;



oneway interface INetworkStateObserver {

    /**

     * {@param resultData} will be in the format

     * NetinfoState|NetinfoDetailedState|RealConnectionCheck|RealConnectionCheckDetails|Netinfo.

     * For detailed info, see

     * servicestests/test-apps/ConnTestApp/.../ConnTestActivity#checkNetworkStatus

     */

    void onNetworkStateChecked(String resultData);

}
 
 No newline at end of file

services/tests/servicestests/res/raw/conntestapp

0 → 100644
+8.96 KiB

File added.

No diff preview for this file type.

View file