diff options
author | Dianne Hackborn <hackbod@google.com> | 2015-01-09 09:54:06 -0800 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2015-01-09 09:54:06 -0800 |
commit | b3d4cb369e37b1b7e85832cc035226dc7cc8f380 (patch) | |
tree | 5a16c37ccc28c6d25eee080c61c27df966e76079 /services/core/java/com/android/server/SystemConfig.java | |
parent | 9d4b7963399045395799dcb7df5d8c84d9b12884 (diff) | |
download | frameworks_base-b3d4cb369e37b1b7e85832cc035226dc7cc8f380.zip frameworks_base-b3d4cb369e37b1b7e85832cc035226dc7cc8f380.tar.gz frameworks_base-b3d4cb369e37b1b7e85832cc035226dc7cc8f380.tar.bz2 |
Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.
Also:
- Improve error reporting of SystemConfig to tell you which config
file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
to ProcessRecord to print on demand.
Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
Diffstat (limited to 'services/core/java/com/android/server/SystemConfig.java')
-rw-r--r-- | services/core/java/com/android/server/SystemConfig.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java index eb89f21..6ad128c 100644 --- a/services/core/java/com/android/server/SystemConfig.java +++ b/services/core/java/com/android/server/SystemConfig.java @@ -205,8 +205,8 @@ public class SystemConfig { } if (!parser.getName().equals("permissions") && !parser.getName().equals("config")) { - throw new XmlPullParserException("Unexpected start tag: found " + parser.getName() + - ", expected 'permissions' or 'config'"); + throw new XmlPullParserException("Unexpected start tag in " + permFile + + ": found " + parser.getName() + ", expected 'permissions' or 'config'"); } while (true) { @@ -222,7 +222,7 @@ public class SystemConfig { int gid = android.os.Process.getGidForName(gidStr); mGlobalGids = appendInt(mGlobalGids, gid); } else { - Slog.w(TAG, "<group> without gid at " + Slog.w(TAG, "<group> without gid in " + permFile + " at " + parser.getPositionDescription()); } @@ -231,7 +231,7 @@ public class SystemConfig { } else if ("permission".equals(name) && !onlyFeatures) { String perm = parser.getAttributeValue(null, "name"); if (perm == null) { - Slog.w(TAG, "<permission> without name at " + Slog.w(TAG, "<permission> without name in " + permFile + " at " + parser.getPositionDescription()); XmlUtils.skipCurrentTag(parser); continue; @@ -242,14 +242,14 @@ public class SystemConfig { } else if ("assign-permission".equals(name) && !onlyFeatures) { String perm = parser.getAttributeValue(null, "name"); if (perm == null) { - Slog.w(TAG, "<assign-permission> without name at " + Slog.w(TAG, "<assign-permission> without name in " + permFile + " at " + parser.getPositionDescription()); XmlUtils.skipCurrentTag(parser); continue; } String uidStr = parser.getAttributeValue(null, "uid"); if (uidStr == null) { - Slog.w(TAG, "<assign-permission> without uid at " + Slog.w(TAG, "<assign-permission> without uid in " + permFile + " at " + parser.getPositionDescription()); XmlUtils.skipCurrentTag(parser); continue; @@ -257,7 +257,7 @@ public class SystemConfig { int uid = Process.getUidForName(uidStr); if (uid < 0) { Slog.w(TAG, "<assign-permission> with unknown uid \"" - + uidStr + "\" at " + + uidStr + " in " + permFile + " at " + parser.getPositionDescription()); XmlUtils.skipCurrentTag(parser); continue; @@ -275,10 +275,10 @@ public class SystemConfig { String lname = parser.getAttributeValue(null, "name"); String lfile = parser.getAttributeValue(null, "file"); if (lname == null) { - Slog.w(TAG, "<library> without name at " + Slog.w(TAG, "<library> without name in " + permFile + " at " + parser.getPositionDescription()); } else if (lfile == null) { - Slog.w(TAG, "<library> without file at " + Slog.w(TAG, "<library> without file in " + permFile + " at " + parser.getPositionDescription()); } else { //Log.i(TAG, "Got library " + lname + " in " + lfile); @@ -297,7 +297,7 @@ public class SystemConfig { allowed = !"true".equals(notLowRam); } if (fname == null) { - Slog.w(TAG, "<feature> without name at " + Slog.w(TAG, "<feature> without name in " + permFile + " at " + parser.getPositionDescription()); } else if (allowed) { //Log.i(TAG, "Got feature " + fname); @@ -311,7 +311,7 @@ public class SystemConfig { } else if ("unavailable-feature".equals(name)) { String fname = parser.getAttributeValue(null, "name"); if (fname == null) { - Slog.w(TAG, "<unavailable-feature> without name at " + Slog.w(TAG, "<unavailable-feature> without name in " + permFile + " at " + parser.getPositionDescription()); } else { mUnavailableFeatures.add(fname); @@ -322,7 +322,7 @@ public class SystemConfig { } else if ("allow-in-power-save".equals(name) && !onlyFeatures) { String pkgname = parser.getAttributeValue(null, "package"); if (pkgname == null) { - Slog.w(TAG, "<allow-in-power-save> without package at " + Slog.w(TAG, "<allow-in-power-save> without package in " + permFile + " at " + parser.getPositionDescription()); } else { mAllowInPowerSave.add(pkgname); @@ -333,7 +333,7 @@ public class SystemConfig { } else if ("fixed-ime-app".equals(name) && !onlyFeatures) { String pkgname = parser.getAttributeValue(null, "package"); if (pkgname == null) { - Slog.w(TAG, "<fixed-ime-app> without package at " + Slog.w(TAG, "<fixed-ime-app> without package in " + permFile + " at " + parser.getPositionDescription()); } else { mFixedImeApps.add(pkgname); |