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

Commit 9f013fe7 authored by Jeff Hao's avatar Jeff Hao Committed by Android (Google) Code Review
Browse files

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

parents a9698674 bd784e96

services/core/java/com/android/server/pm/OtaDexoptService.java

+0 −2
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets; 
import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason;



import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.IOtaDexopt;

import android.content.pm.PackageManager;

import android.content.pm.PackageParser;

import android.os.Environment;

import android.os.RemoteException;

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -498,8 +498,8 @@ public class PackageManagerService extends IPackageManager.Stub { 














    public static final int REASON_LAST = REASON_FORCED_DEXOPT;



























    // Special String to skip shared libraries check during compilation.













    private static final String SPECIAL_SHARED_LIBRARY = "&";













    /** Special library name that skips shared libraries check during compilation. */













    private static final String SKIP_SHARED_LIBRARY_CHECK = "&";





























    final ServiceThread mHandlerThread;
























@@ -2348,7 +2348,7 @@ public class PackageManagerService extends IPackageManager.Stub {













                                        dexoptNeeded, DEXOPT_PUBLIC /*dexFlags*/,















                                        getCompilerFilterForReason(REASON_SHARED_APK),















                                        StorageManager.UUID_PRIVATE_INTERNAL,













                                        SPECIAL_SHARED_LIBRARY);













                                        SKIP_SHARED_LIBRARY_CHECK);















                            }















                        } catch (FileNotFoundException e) {















                            Slog.w(TAG, "Library not found: " + lib);