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

Commit 912e647d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-16528474-remove-iorap-SLJMCTXSQL" 

* changes:
  Revert "Remove iorap framework codes"
  Revert "Remove scripts related to iorap"
parents 22097a09 2f393cdb

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -6754,6 +6754,10 @@ 
                    android:resource="@xml/autofill_compat_accessibility_service" />

        </service>



        <service android:name="com.google.android.startop.iorap.IorapForwardingService$IorapdJobServiceProxy"

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

        </service>



        <service android:name="com.android.server.blob.BlobStoreIdleJobService"

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

        </service>

services/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ filegroup { 
        ":services.selectiontoolbar-sources",

        ":services.smartspace-sources",

        ":services.speech-sources",

        ":services.startop.iorap-sources",

        ":services.systemcaptions-sources",

        ":services.translation-sources",

        ":services.texttospeech-sources",
@@ -150,6 +151,7 @@ java_library { 
        "services.selectiontoolbar",

        "services.smartspace",

        "services.speech",

        "services.startop",

        "services.systemcaptions",

        "services.translation",

        "services.texttospeech",
@@ -205,6 +207,7 @@ stubs_defaults { 
        " --hide-annotation android.annotation.Hide" +

        " --hide InternalClasses" + // com.android.* classes are okay in this interface

        // TODO: remove the --hide options below

        " --hide-package com.google.android.startop.iorap" +

        " --hide DeprecationMismatch" +

        " --hide HiddenTypedefConstant",

    visibility: ["//frameworks/base:__subpackages__"],

services/java/com/android/server/SystemServer.java

+6 −0
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ import com.android.server.wm.WindowManagerService; 


import dalvik.system.VMRuntime;



import com.google.android.startop.iorap.IorapForwardingService;



import java.io.File;

import java.io.FileDescriptor;

import java.io.IOException;
@@ -1623,6 +1625,10 @@ public final class SystemServer implements Dumpable { 
            mSystemServiceManager.startService(PinnerService.class);

            t.traceEnd();



            t.traceBegin("IorapForwardingService");

            mSystemServiceManager.startService(IorapForwardingService.class);

            t.traceEnd();



            if (Build.IS_DEBUGGABLE && ProfcollectForwardingService.enabled()) {

                t.traceBegin("ProfcollectForwardingService");

                mSystemServiceManager.startService(ProfcollectForwardingService.class);

services/startop/Android.bp

0 → 100644
+36 −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.

 */



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    //   SPDX-license-identifier-MIT

    //   SPDX-license-identifier-Unicode-DFS

    default_applicable_licenses: ["frameworks_base_license"],

}



java_library_static {

    name: "services.startop",

    defaults: ["platform_service_defaults"],



    static_libs: [

        // frameworks/base/startop/iorap

        "services.startop.iorap",

    ],

}

startop/iorap/Android.bp

0 → 100644
+44 −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.



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



filegroup {

  name: "services.startop.iorap-javasources",

  srcs: ["src/**/*.java"],

  path: "src",

  visibility: ["//visibility:private"],

}



filegroup {

  name: "services.startop.iorap-sources",

  srcs: [

    ":services.startop.iorap-javasources",

    ":iorap-aidl",

  ],

  visibility: ["//frameworks/base/services:__subpackages__"],

}



java_library_static {

  name: "services.startop.iorap",

  srcs: [":services.startop.iorap-sources"],

  libs: ["services.core"],

}