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

Merge "Swap libcore annotations for framework versions"

Browse Source 
am: b2a8384164

Change-Id: Ifb30d784944408e88e8ba5018022fe2c28ed2303
This commit is contained in:
Neil Fuller
2018-10-05 01:26:22 -07:00
committed by android-build-merger
parent 086476e72e b2a8384164
commit da1171a290
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/dex/ArtManagerService.java
View File

@@ -16,6 +16,8 @@
package com.android.server.pm.dex; package com.android.server.pm.dex;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.content.Context; import android.content.Context;
@@ -57,8 +59,6 @@ import dalvik.system.DexFile;
import dalvik.system.VMRuntime; import dalvik.system.VMRuntime;
import libcore.io.IoUtils; import libcore.io.IoUtils;
import libcore.util.NonNull;
import libcore.util.Nullable;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;