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

Commit 11f08829 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Automerger Merge Worker
Browse files

Merge "Add end-to-end tests for @EnforcePermission" am: cdac5de2 am:... 

Merge "Add end-to-end tests for @EnforcePermission" am: cdac5de2 am: 0b79c1e4 am: 1db6fa51 am: 641c09a3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2486756



Change-Id: I24a4ed218bf46f3eb7f10dec65319134ee3732ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 818aec1e 641c09a3

tests/EnforcePermission/Android.bp

0 → 100644
+22 −0
Original line number Diff line number Diff line 
// Copyright (C) 2023 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 {

    default_applicable_licenses: ["frameworks_base_license"],

}



filegroup {

    name: "frameworks-enforce-permission-test-aidl",

    srcs: ["aidl/**/*.aidl"],

}

tests/EnforcePermission/aidl/android/tests/enforcepermission/INested.aidl

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

 * Copyright (C) 2023 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 android.tests.enforcepermission;



interface INested {

    @EnforcePermission("ACCESS_NETWORK_STATE")

    void ProtectedByAccessNetworkState();



    @EnforcePermission("READ_SYNC_SETTINGS")

    void ProtectedByReadSyncSettings();

}

tests/EnforcePermission/aidl/android/tests/enforcepermission/IProtected.aidl

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

 * Copyright (C) 2023 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 android.tests.enforcepermission;



interface IProtected {

    @EnforcePermission("INTERNET")

    void ProtectedByInternet();



    @EnforcePermission("VIBRATE")

    void ProtectedByVibrate();



    @EnforcePermission("INTERNET")

    void ProtectedByInternetAndVibrateImplicitly();



    @EnforcePermission("INTERNET")

    void ProtectedByInternetAndAccessNetworkStateImplicitly();



    @EnforcePermission("INTERNET")

    void ProtectedByInternetAndReadSyncSettingsImplicitly();

}

tests/EnforcePermission/service-app/Android.bp

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



android_test_helper_app {

    name: "EnforcePermissionTestHelper",

    srcs: [

        "src/**/*.java",

        ":frameworks-enforce-permission-test-aidl",

    ],

    platform_apis: true,

    certificate: "platform",

}

tests/EnforcePermission/service-app/AndroidManifest.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

  package="android.tests.enforcepermission.service">

    <application>

        <service

          android:name=".TestService"

          android:exported="true" />



        <service

          android:name=".NestedTestService"

          android:exported="true" />

    </application>

</manifest>