diff options
| author | 2013-03-28 16:52:49 -0700 | |
|---|---|---|
| committer | 2013-03-28 16:52:49 -0700 | |
| commit | 24948d3ca7ff7fa70ee85e9aa7530239d7b482b2 (patch) | |
| tree | 64ce5adecf2777c76c359cdb896b1b75e7365805 | |
| parent | 0de7af1e18a72a979baa9711e4e980b21cf80255 (diff) | |
| parent | 946a5c91d95daea8e12c235f003abbd3191b57b2 (diff) | |
am 946a5c91: Merge "Save off the seinfo value with packages.list."
* commit '946a5c91d95daea8e12c235f003abbd3191b57b2':
Save off the seinfo value with packages.list.
| -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 a47224770e4b..b744bc335b46 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 0f531b7a6b34..3cf48a0e183f 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()); } |