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

Commit 70a984cf authored by Anna Trostanetski's avatar Anna Trostanetski Committed by android-build-merger
Browse files

Merge "Move IPlatformCompat.aidl definition to framework.jar" into... 

Merge "Move IPlatformCompat.aidl definition to framework.jar" into stage-aosp-master am: 77a833f3 am: eb3326be
am: 684082f5

Change-Id: Iad1cc358186f472baa836a2a3895c18bcad2d9ff
parents fcee9fb5 684082f5

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ java_defaults { 
        "core/java/android/companion/ICompanionDeviceDiscoveryService.aidl",

        "core/java/android/companion/ICompanionDeviceDiscoveryServiceCallback.aidl",

        "core/java/android/companion/IFindDeviceCallback.aidl",

        "core/java/android/compat/IPlatformCompat.aidl",

        "core/java/android/service/dreams/IDreamManager.aidl",

        "core/java/android/service/dreams/IDreamService.aidl",

        "core/java/android/service/oemlock/IOemLockService.aidl",

services/core/java/com/android/server/compat/IPlatformCompat.aidl→core/java/android/compat/IPlatformCompat.aidl

+6 −2
Original line number Diff line number Diff line
@@ -14,12 +14,16 @@ 
 * limitations under the License.

 */



package com.android.server.compat;

package android.compat;



import android.content.pm.ApplicationInfo;



/**

 * System private API for talking with the PlatformCompat service.

 * Platform private API for talking with the PlatformCompat service.

 *

 * <p> Should be used for gating and logging from non-app processes.

 * For app processes please use android.compat.Compatibility API.

 *

 * {@hide}

 */

interface IPlatformCompat

services/core/Android.bp

+0 −9
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ java_library_static { 
    },

    srcs: [

        "java/**/*.java",

        ":platformcompat_aidl",

        ":dumpstate_aidl",

        ":idmap2_aidl",

        ":installd_aidl",
@@ -82,11 +81,3 @@ prebuilt_etc { 
    name: "gps_debug.conf",

    src: "java/com/android/server/location/gps_debug.conf",

}
 


filegroup {

    name: "platformcompat_aidl",

    srcs: [

        "java/com/android/server/compat/IPlatformCompat.aidl",

    ],

    path: "java",

}

services/core/java/com/android/server/compat/PlatformCompat.java

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.compat;



import android.compat.IPlatformCompat;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.util.Slog;