Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename android.compat.IPlatformCompat"

Browse Source 
am: ee716a23a2

Change-Id: I88fd93b46bcaa5ed782c407f2a9e9469fb0f5f0e
This commit is contained in:
Anna Trostanetski
2019-08-23 02:26:15 -07:00
committed by android-build-merger
parent 41438c3730 ee716a23a2
commit 81af0fc8bb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/Context.java
View File

@@ -38,7 +38,6 @@ import android.app.ActivityManager;
import android.app.IApplicationThread; import android.app.IApplicationThread;
import android.app.IServiceConnection; import android.app.IServiceConnection;
import android.app.VrManager; import android.app.VrManager;
import android.compat.IPlatformCompat;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.AssetManager; import android.content.res.AssetManager;
@@ -74,6 +73,8 @@ import android.view.autofill.AutofillManager.AutofillClient;
import android.view.contentcapture.ContentCaptureManager.ContentCaptureClient; import android.view.contentcapture.ContentCaptureManager.ContentCaptureClient;
import android.view.textclassifier.TextClassificationManager; import android.view.textclassifier.TextClassificationManager;
import com.android.internal.compat.IPlatformCompat;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

2
core/java/android/compat/IPlatformCompat.aidl → core/java/com/android/internal/compat/IPlatformCompat.aidl
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.compat; package com.android.internal.compat;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;

2
services/core/java/com/android/server/compat/PlatformCompat.java
View File

@@ -16,11 +16,11 @@
package com.android.server.compat; package com.android.server.compat;
import android.compat.IPlatformCompat;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.util.Slog; import android.util.Slog;
import com.android.internal.compat.IPlatformCompat;
import com.android.internal.util.DumpUtils; import com.android.internal.util.DumpUtils;
import java.io.FileDescriptor; import java.io.FileDescriptor;