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

Commit 2e86809b authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Native libraries on SD" into gingerbread

parents ae6bdc23 0ac83f5a

core/tests/coretests/src/android/content/pm/PackageManagerTests.java

+2 −0
Original line number Diff line number Diff line
@@ -1392,8 +1392,10 @@ public class PackageManagerTests extends AndroidTestCase { 
                assertNotNull(info);

                if ((moveFlags & PackageManager.MOVE_INTERNAL) != 0) {

                    assertTrue((info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) == 0);

                    assertTrue(info.nativeLibraryDir.startsWith(info.dataDir));

                } else if ((moveFlags & PackageManager.MOVE_EXTERNAL_MEDIA) != 0){

                    assertTrue((info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0);

                    assertTrue(info.nativeLibraryDir.startsWith(SECURE_CONTAINERS_PREFIX));

                }

            }

        } catch (NameNotFoundException e) {

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

+1 −0
Original line number Diff line number Diff line
@@ -9833,6 +9833,7 @@ class PackageManagerService extends IPackageManager.Stub { 
                                       ps.codePathString = ps.codePath.getPath();

                                       ps.resourcePath = new File(pkg.applicationInfo.publicSourceDir);

                                       ps.resourcePathString = ps.resourcePath.getPath();

                                       ps.nativeLibraryPathString = newNativePath;

                                       // Set the application info flag correctly.

                                       if ((mp.flags & PackageManager.INSTALL_EXTERNAL) != 0) {

                                           pkg.applicationInfo.flags |= ApplicationInfo.FLAG_EXTERNAL_STORAGE;