summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-03-26 16:36:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-26 16:36:33 +0000
commitc76275377cbc807b3bbc2fc1662ff18c59043e5b (patch)
tree4ff145e0886d48a4d1765bd0378f1f61def84a46
parent59f0258a27ebaf8468919a9d2855c41f0429238d (diff)
parent32cc40a9b57750451a6489e01526dc6a14d72bff (diff)
downloadframeworks_base-c76275377cbc807b3bbc2fc1662ff18c59043e5b.zip
frameworks_base-c76275377cbc807b3bbc2fc1662ff18c59043e5b.tar.gz
frameworks_base-c76275377cbc807b3bbc2fc1662ff18c59043e5b.tar.bz2
am 32cc40a9: am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes."
* commit '32cc40a9b57750451a6489e01526dc6a14d72bff': Note libselinux dependency on packages.list format changes.
-rw-r--r--services/core/java/com/android/server/pm/Settings.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 9236bde..37547f2 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -1477,6 +1477,7 @@ final class Settings {
// FROM NATIVE CODE. AT THE MOMENT, LOOK AT THE FOLLOWING SOURCES:
// system/core/run-as/run-as.c
// system/core/sdcard/sdcard.c
+ // external/libselinux/src/android.c:package_info_init()
//
sb.setLength(0);
sb.append(ai.packageName);