diff options
| author | 2019-08-23 02:54:36 -0700 | |
|---|---|---|
| committer | 2019-08-23 02:54:36 -0700 | |
| commit | 20f25166c3b773ccb9457865e6697ff7d73013a5 (patch) | |
| tree | 29c65ee60887b219c4148b555aa4cb4dadbd852e | |
| parent | b0c5a7af5a13d770970a5f9fda294e9b05a7e412 (diff) | |
| parent | 81af0fc8bb5d2a54662c054822c4db3b5801f634 (diff) | |
Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2
am: 81af0fc8bb
Change-Id: I815189c133f274d1a754327807915a02e642a44b
| -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 8c6cbb1ff984..a6b95a95dcd8 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -38,7 +38,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; @@ -74,6 +73,8 @@ import android.view.autofill.AutofillManager.AutofillClient; import android.view.contentcapture.ContentCaptureManager.ContentCaptureClient; 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; |