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

Commit a54e0643 authored by Geremy Condra's avatar Geremy Condra Committed by Android Git Automerger
Browse files

am 9d034deb: am 24948d3c: am 946a5c91: Merge "Save off the seinfo value with packages.list." 

* commit '9d034deb':
  Save off the seinfo value with packages.list.
parents 89ef9628 9d034deb

services/java/com/android/server/pm/Settings.java

+3 −0
Original line number Diff line number Diff line
@@ -1372,6 +1372,7 @@ final class Settings { 
                    // userId     - application-specific user id

                    // debugFlag  - 0 or 1 if the package is debuggable.

                    // dataPath   - path to package's data path

                    // seinfo     - seinfo label for the app (assigned at install time)

                    //

                    // NOTE: We prefer not to expose all ApplicationInfo flags for now.

                    //
@@ -1385,6 +1386,8 @@ final class Settings { 
                    sb.append((int)ai.uid);

                    sb.append(isDebug ? " 1 " : " 0 ");

                    sb.append(dataPath);

                    sb.append(" ");

                    sb.append(ai.seinfo);

                    sb.append("\n");

                    str.write(sb.toString().getBytes());

                }

services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java

+3 −3
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ public class PackageManagerSettingsTests extends AndroidTestCase { 


    private void writePackagesList() {

        writeFile(new File(getContext().getFilesDir(), "system/packages.list"),

                ( "com.google.app1 11000 0 /data/data/com.google.app1"

                + "com.google.app2 11001 0 /data/data/com.google.app2"

                + "com.android.app3 11030 0 /data/data/com.android.app3")

                ( "com.google.app1 11000 0 /data/data/com.google.app1 seinfo1"

                + "com.google.app2 11001 0 /data/data/com.google.app2 seinfo2"

                + "com.android.app3 11030 0 /data/data/com.android.app3 seinfo3")

                .getBytes());

    }