Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 884ef46c authored by Anna Trostanetski's avatar Anna Trostanetski Committed by android-build-merger
Browse files

Merge "Rename android.compat.IPlatformCompat" am: ee716a23 am: 81af0fc8 

am: 20f25166

Change-Id: Icbdf02f150e14b4c63b24e70e72f0faf3946e130
parents bc59f857 20f25166

core/java/android/content/Context.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/compat/IPlatformCompat.aidl→core/java/com/android/internal/compat/IPlatformCompat.aidl

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.compat;

package com.android.internal.compat;



import android.content.pm.ApplicationInfo;

services/core/java/com/android/server/compat/PlatformCompat.java

+1 −1
Original line number Diff line number Diff line
@@ -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;