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

Merge "Swap libcore annotations for framework versions" am: b2a8384164

Browse Source 
am: da1171a290

Change-Id: Ib4c4f2efaa14b165ea74bfc7c1b8d5ce79eb79a2
This commit is contained in:
Neil Fuller
2018-10-05 01:36:46 -07:00
committed by android-build-merger
parent 2785286cdc da1171a290
commit f8dcfb2fcd
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;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.AppOpsManager;
import android.content.Context;
@@ -57,8 +59,6 @@ import dalvik.system.DexFile;
import dalvik.system.VMRuntime;
import libcore.io.IoUtils;
import libcore.util.NonNull;
import libcore.util.Nullable;
import java.io.File;
import java.io.FileNotFoundException;