From a6a4d60ae0022a288840cd138ad25f5cce8873a6 Mon Sep 17 00:00:00 2001
From: atrost <atrost@google.com>
Date: Wed, 21 Aug 2019 16:48:56 +0100
Subject: [PATCH] Rename android.compat.IPlatformCompat

To com.android.internal.compat.IPlatformCompat. This solves a java9
issue because libcore exported api has the same package android.compat.

Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make framework
Change-Id: I0918344f670669cecb04f1e9e54dbcb471b587d5
---
 core/java/android/content/Context.java                         | 3 ++-
 .../android/internal}/compat/IPlatformCompat.aidl              | 2 +-
 .../core/java/com/android/server/compat/PlatformCompat.java    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename core/java/{android => com/android/internal}/compat/IPlatformCompat.aidl (98%)

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 3c5cfbe0a7436..7baca9bc2ffdd 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
similarity index 98%
rename from core/java/android/compat/IPlatformCompat.aidl
rename to core/java/com/android/internal/compat/IPlatformCompat.aidl
index 3d8a9d5c5e86e..9049c3aea7ecb 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 27050faef7126..fc38735509f05 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;