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

Commit e66c1c32 authored by Stefanot's avatar Stefanot
Browse files

Move transport out of system server. 

Test: atest FrameworksServicesTests
Test: atest FrameworksServicesRoboTests
Test: atest CtsBackupTestCases
Test: atest CtsBackupHostTestCases
Test: atest GtsBackupTestCases
Test: atest GtsBackupHostTestCases
Bug: 113569323
Change-Id: I9e647f73cc132ae9a685dd9a6ee2f9bb37a1d8b0
parent 3bbff814

core/res/AndroidManifest.xml

+0 −8
Original line number Diff line number Diff line
@@ -4435,14 +4435,6 @@ 
            android:permission="android.permission.LOCATION_HARDWARE"

            android:exported="false" />



        <service android:name="com.android.internal.backup.LocalTransportService"

                android:permission="android.permission.CONFIRM_FULL_BACKUP"

                android:exported="false">

            <intent-filter>

                <action android:name="android.backup.TRANSPORT_HOST" />

            </intent-filter>

        </service>



        <service android:name="com.android.server.MountServiceIdler"

                 android:exported="true"

                 android:permission="android.permission.BIND_JOB_SERVICE" >

core/tests/coretests/src/android/provider/SettingsValidatorsTest.java

+4 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class SettingsValidatorsTest { 
    @Test

    public void testComponentNameValidator() {

        assertTrue(SettingsValidators.COMPONENT_NAME_VALIDATOR.validate(

                "android/com.android.internal.backup.LocalTransport"));

                "com.android.localtransport/.LocalTransport"));

        assertFalse(SettingsValidators.COMPONENT_NAME_VALIDATOR.validate("rectangle"));

    }
@@ -90,7 +90,7 @@ public class SettingsValidatorsTest { 
    @Test

    public void testNullableComponentNameValidator_onValidComponentName_returnsTrue() {

        assertTrue(SettingsValidators.NULLABLE_COMPONENT_NAME_VALIDATOR.validate(

                "android/com.android.internal.backup.LocalTransport"));

                "com.android.localtransport/.LocalTransport"));

    }



    @Test
@@ -185,7 +185,7 @@ public class SettingsValidatorsTest { 
    @Test

    public void testComponentNameListValidator() {

        Validator v = new SettingsValidators.ComponentNameListValidator(",");

        assertTrue(v.validate("android/com.android.internal.backup.LocalTransport,"

        assertTrue(v.validate("com.android.localtransport/.LocalTransport,"

                + "com.google.android.gms/.backup.migrate.service.D2dTransport"));

        assertFalse(v.validate("com.google.5android,android"));

    }
@@ -200,7 +200,7 @@ public class SettingsValidatorsTest { 
    @Test

    public void testPackageNameListValidator() {

        Validator v = new SettingsValidators.PackageNameListValidator(",");

        assertTrue(v.validate("com.android.internal.backup.LocalTransport,com.google.android.gms"));

        assertTrue(v.validate("com.android.localtransport.LocalTransport,com.google.android.gms"));

        assertFalse(v.validate("5com.android.internal.backup.LocalTransport,android"));

    }

data/etc/framework-sysconfig.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    <!-- Whitelist of what components are permitted as backup data transports.  The

         'service' attribute here is a flattened ComponentName string. -->

    <backup-transport-whitelisted-service

        service="android/com.android.internal.backup.LocalTransportService" />

        service="com.android.localtransport/.LocalTransportService" />



    <!-- Whitelist of bundled applications which all handle URLs to their websites by default -->

    <app-link package="com.android.carrierdefaultapp" />

packages/LocalTransport/Android.mk

0 → 100644
+35 −0
Original line number Diff line number Diff line 
#

# 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.

#



LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_PACKAGE_NAME := LocalTransport

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true



include $(BUILD_PACKAGE)



########################

include $(call all-makefiles-under,$(LOCAL_PATH))

packages/LocalTransport/AndroidManifest.xml

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

<!--

/*

 * Copyright (c) 2018 Google Inc.

 *

 * 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="com.android.localtransport"

      android:sharedUserId="android.uid.system" >





    <application android:allowBackup="false" >

        <!-- This service does not need to be exported because it shares uid with the system server

        which is the only client. -->

        <service android:name=".LocalTransportService"

                 android:permission="android.permission.CONFIRM_FULL_BACKUP"

                 android:exported="false">

            <intent-filter>

                <action android:name="android.backup.TRANSPORT_HOST" />

            </intent-filter>

        </service>



    </application>

</manifest>