diff options
| author | Geremy Condra <gcondra@google.com> | 2013-03-28 21:45:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-28 21:45:22 +0000 |
| commit | 946a5c91d95daea8e12c235f003abbd3191b57b2 (patch) | |
| tree | d270d9e7a499676ae5ef33eeb053f7afec5a282f /services | |
| parent | 02c86306d2569d18a49da3d9228dacb25b1f8973 (diff) | |
| parent | 4a4537331be12e7ac11066931c845ec9d8064571 (diff) | |
| download | frameworks_base-946a5c91d95daea8e12c235f003abbd3191b57b2.zip frameworks_base-946a5c91d95daea8e12c235f003abbd3191b57b2.tar.gz frameworks_base-946a5c91d95daea8e12c235f003abbd3191b57b2.tar.bz2 | |
Merge "Save off the seinfo value with packages.list."
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/pm/Settings.java | 3 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java index a472247..b744bc3 100644 --- a/services/java/com/android/server/pm/Settings.java +++ b/services/java/com/android/server/pm/Settings.java @@ -1359,6 +1359,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. // @@ -1372,6 +1373,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()); } diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java index 0f531b7..3cf48a0 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java @@ -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()); } |