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

Merge "Some cleanup for <uses-library> change." into nyc-dev

Browse Source
This commit is contained in:
Jeff Hao
2016-04-28 01:31:14 +00:00
committed by Android (Google) Code Review
parent a96986745f bd784e961c
commit 9f013fe71e
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/OtaDexoptService.java
View File

@@ -22,9 +22,7 @@ import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;
import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason; import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.IOtaDexopt; import android.content.pm.IOtaDexopt;
import android.content.pm.PackageManager;
import android.content.pm.PackageParser; import android.content.pm.PackageParser;
import android.os.Environment; import android.os.Environment;
import android.os.RemoteException; import android.os.RemoteException;

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -498,8 +498,8 @@ public class PackageManagerService extends IPackageManager.Stub {
public static final int REASON_LAST = REASON_FORCED_DEXOPT; public static final int REASON_LAST = REASON_FORCED_DEXOPT;
// Special String to skip shared libraries check during compilation. /** Special library name that skips shared libraries check during compilation. */
private static final String SPECIAL_SHARED_LIBRARY = "&"; private static final String SKIP_SHARED_LIBRARY_CHECK = "&";
final ServiceThread mHandlerThread; final ServiceThread mHandlerThread;
@@ -2348,7 +2348,7 @@ public class PackageManagerService extends IPackageManager.Stub {
dexoptNeeded, DEXOPT_PUBLIC /*dexFlags*/, dexoptNeeded, DEXOPT_PUBLIC /*dexFlags*/,
getCompilerFilterForReason(REASON_SHARED_APK), getCompilerFilterForReason(REASON_SHARED_APK),
StorageManager.UUID_PRIVATE_INTERNAL, StorageManager.UUID_PRIVATE_INTERNAL,
SPECIAL_SHARED_LIBRARY); SKIP_SHARED_LIBRARY_CHECK);
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Slog.w(TAG, "Library not found: " + lib); Slog.w(TAG, "Library not found: " + lib);