diff options
| author | 2019-08-21 19:46:39 +0000 | |
|---|---|---|
| committer | 2019-08-21 19:46:39 +0000 | |
| commit | ee716a23a28d406f1ad0c0a11039880c05491fde (patch) | |
| tree | 1c6f2ae99cf43c4ffd9346dfde24314ee415d3a0 | |
| parent | bc6371727c669f0f6a0568a7844a6f47c28cb36c (diff) | |
| parent | a6a4d60ae0022a288840cd138ad25f5cce8873a6 (diff) | |
Merge "Rename android.compat.IPlatformCompat"
| -rw-r--r-- | core/java/android/content/Context.java | 3 | ||||
| -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.java | 2 |
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; |