diff options
Diffstat (limited to 'services/java')
7 files changed, 23 insertions, 26 deletions
diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index a5e26a8..b3af35a 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -146,8 +146,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { getSendingUserId()); if (Intent.ACTION_BOOT_COMPLETED.equals(action) || ACTION_EXPIRED_PASSWORD_NOTIFICATION.equals(action)) { - Slog.v(TAG, "Sending password expiration notifications for action " + action - + " for user " + userHandle); + if (DBG) Slog.v(TAG, "Sending password expiration notifications for action " + + action + " for user " + userHandle); mHandler.post(new Runnable() { public void run() { handlePasswordExpirationNotification(getUserData(userHandle)); @@ -468,7 +468,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { private void handlePackagesChanged(int userHandle) { boolean removed = false; - Slog.d(TAG, "Handling package changes for user " + userHandle); + if (DBG) Slog.d(TAG, "Handling package changes for user " + userHandle); DevicePolicyData policy = getUserData(userHandle); IPackageManager pm = AppGlobals.getPackageManager(); for (int i = policy.mAdminList.size() - 1; i >= 0; i--) { @@ -982,7 +982,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { long token = Binder.clearCallingIdentity(); try { String value = cameraDisabled ? "1" : "0"; - Slog.v(TAG, "Change in camera state [" + if (DBG) Slog.v(TAG, "Change in camera state [" + SYSTEM_PROP_DISABLE_CAMERA + "] = " + value); SystemProperties.set(SYSTEM_PROP_DISABLE_CAMERA, value); } finally { @@ -1682,10 +1682,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } int neededNumbers = getPasswordMinimumNumeric(null, userHandle); if (numbers < neededNumbers) { - Slog - .w(TAG, "resetPassword: number of numerical digits " + numbers - + " does not meet required number of numerical digits " - + neededNumbers); + Slog.w(TAG, "resetPassword: number of numerical digits " + numbers + + " does not meet required number of numerical digits " + + neededNumbers); return false; } int neededLowerCase = getPasswordMinimumLowerCase(null, userHandle); diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index ad28a36..2e0c977 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -105,9 +105,9 @@ class MountService extends IMountService.Stub // TODO: listen for user creation/deletion - private static final boolean LOCAL_LOGD = true; - private static final boolean DEBUG_UNMOUNT = true; - private static final boolean DEBUG_EVENTS = true; + private static final boolean LOCAL_LOGD = false; + private static final boolean DEBUG_UNMOUNT = false; + private static final boolean DEBUG_EVENTS = false; private static final boolean DEBUG_OBB = false; // Disable this since it messes up long-running cryptfs operations. diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 894c4d0..55885e6 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1005,7 +1005,7 @@ class ServerThread extends Thread { Intent intent = new Intent(); intent.setComponent(new ComponentName("com.android.systemui", "com.android.systemui.SystemUIService")); - Slog.d(TAG, "Starting service: " + intent); + //Slog.d(TAG, "Starting service: " + intent); context.startServiceAsUser(intent, UserHandle.OWNER); } } diff --git a/services/java/com/android/server/TelephonyRegistry.java b/services/java/com/android/server/TelephonyRegistry.java index 26684de..17260d5 100644 --- a/services/java/com/android/server/TelephonyRegistry.java +++ b/services/java/com/android/server/TelephonyRegistry.java @@ -139,7 +139,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { public void handleMessage(Message msg) { switch (msg.what) { case MSG_USER_SWITCHED: { - Slog.d(TAG, "MSG_USER_SWITCHED userId=" + msg.arg1); + if (DBG) Slog.d(TAG, "MSG_USER_SWITCHED userId=" + msg.arg1); TelephonyRegistry.this.notifyCellLocation(mCellLocation); break; } diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 82c9030..5fb2ec9 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -21,7 +21,6 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED; import com.android.internal.R; import com.android.internal.os.BatteryStatsImpl; import com.android.internal.os.ProcessStats; -import com.android.internal.widget.LockPatternUtils; import com.android.server.AttributeCache; import com.android.server.IntentResolver; import com.android.server.ProcessMap; @@ -7935,7 +7934,7 @@ public final class ActivityManagerService extends ActivityManagerNative } }, 0, null, null, android.Manifest.permission.INTERACT_ACROSS_USERS, - false, false, MY_PID, Process.SYSTEM_UID, UserHandle.USER_ALL); + true, false, MY_PID, Process.SYSTEM_UID, UserHandle.USER_ALL); } finally { Binder.restoreCallingIdentity(ident); } @@ -14257,7 +14256,7 @@ public final class ActivityManagerService extends ActivityManagerNative } }, 0, null, null, android.Manifest.permission.INTERACT_ACROSS_USERS, - false, false, MY_PID, Process.SYSTEM_UID, UserHandle.USER_ALL); + true, false, MY_PID, Process.SYSTEM_UID, UserHandle.USER_ALL); } } } finally { @@ -14480,7 +14479,7 @@ public final class ActivityManagerService extends ActivityManagerNative long ident = Binder.clearCallingIdentity(); try { // We are going to broadcast ACTION_USER_STOPPING and then - // once that is down send a final ACTION_SHUTDOWN and then + // once that is done send a final ACTION_SHUTDOWN and then // stop the user. final Intent stoppingIntent = new Intent(Intent.ACTION_USER_STOPPING); stoppingIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); diff --git a/services/java/com/android/server/dreams/DreamManagerService.java b/services/java/com/android/server/dreams/DreamManagerService.java index 1f40176..7e4a554 100644 --- a/services/java/com/android/server/dreams/DreamManagerService.java +++ b/services/java/com/android/server/dreams/DreamManagerService.java @@ -47,7 +47,7 @@ import libcore.util.Objects; * @hide */ public final class DreamManagerService extends IDreamManager.Stub { - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; private static final String TAG = "DreamManagerService"; private final Object mLock = new Object(); @@ -292,7 +292,7 @@ public final class DreamManagerService extends IDreamManager.Stub { stopDreamLocked(); - Slog.i(TAG, "Entering dreamland."); + if (DEBUG) Slog.i(TAG, "Entering dreamland."); final Binder newToken = new Binder(); mCurrentDreamToken = newToken; @@ -310,7 +310,7 @@ public final class DreamManagerService extends IDreamManager.Stub { private void stopDreamLocked() { if (mCurrentDreamToken != null) { - Slog.i(TAG, "Leaving dreamland."); + if (DEBUG) Slog.i(TAG, "Leaving dreamland."); cleanupDreamLocked(); diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 83672c5..78d2565 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -4113,7 +4113,7 @@ public class PackageManagerService extends IPackageManager.Stub { } } - Slog.i(TAG, "Linking native library dir for " + path); + if (DEBUG_INSTALL) Slog.i(TAG, "Linking native library dir for " + path); final int[] userIds = sUserManager.getUserIds(); synchronized (mInstallLock) { for (int userId : userIds) { @@ -6301,20 +6301,21 @@ public class PackageManagerService extends IPackageManager.Stub { final File packageFile; if (encryptionParams != null || !"file".equals(mPackageURI.getScheme())) { - ParcelFileDescriptor out = null; - mTempPackage = createTempPackageFile(mDrmAppPrivateInstallDir); if (mTempPackage != null) { + ParcelFileDescriptor out; try { out = ParcelFileDescriptor.open(mTempPackage, ParcelFileDescriptor.MODE_READ_WRITE); } catch (FileNotFoundException e) { + out = null; Slog.e(TAG, "Failed to create temporary file for : " + mPackageURI); } // Make a temporary file for decryption. ret = mContainerService .copyResource(mPackageURI, encryptionParams, out); + IoUtils.closeQuietly(out); packageFile = mTempPackage; @@ -9079,10 +9080,8 @@ public class PackageManagerService extends IPackageManager.Stub { if (removed.size() > 0) { for (int j=0; j<removed.size(); j++) { PreferredActivity pa = removed.get(i); - RuntimeException here = new RuntimeException("here"); - here.fillInStackTrace(); Slog.w(TAG, "Removing dangling preferred activity: " - + pa.mPref.mComponent, here); + + pa.mPref.mComponent); pir.removeFilter(pa); } mSettings.writePackageRestrictionsLPr( |