summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/content/Context.java3
-rw-r--r--core/java/com/android/internal/compat/IPlatformCompat.aidl (renamed from core/java/android/compat/IPlatformCompat.aidl)2
-rw-r--r--services/core/java/com/android/server/compat/PlatformCompat.java2
3 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 3c5cfbe0a743..7baca9bc2ffd 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -37,7 +37,6 @@ import android.app.ActivityManager;
import android.app.IApplicationThread;
import android.app.IServiceConnection;
import android.app.VrManager;
-import android.compat.IPlatformCompat;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.AssetManager;
@@ -72,6 +71,8 @@ import android.view.WindowManager;
import android.view.autofill.AutofillManager.AutofillClient;
import android.view.textclassifier.TextClassificationManager;
+import com.android.internal.compat.IPlatformCompat;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
diff --git a/core/java/android/compat/IPlatformCompat.aidl b/core/java/com/android/internal/compat/IPlatformCompat.aidl
index 3d8a9d5c5e86..9049c3aea7ec 100644
--- a/core/java/android/compat/IPlatformCompat.aidl
+++ b/core/java/com/android/internal/compat/IPlatformCompat.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.compat;
+package com.android.internal.compat;
import android.content.pm.ApplicationInfo;
diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java
index 27050faef712..fc38735509f0 100644
--- a/services/core/java/com/android/server/compat/PlatformCompat.java
+++ b/services/core/java/com/android/server/compat/PlatformCompat.java
@@ -16,11 +16,11 @@
package com.android.server.compat;
-import android.compat.IPlatformCompat;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.util.Slog;
+import com.android.internal.compat.IPlatformCompat;
import com.android.internal.util.DumpUtils;
import java.io.FileDescriptor;