Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Slog in RollbackManager, not Log

Browse Source 
Test: build
Bug: 132763443
Change-Id: I2f5f5927bfd8a9cf8b506936f74aeb5d0908923e
This commit is contained in:
shafik
2019-06-05 14:59:57 +01:00
parent f422ed746e
commit bb771fbe31
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/rollback/AppDataRollbackHelper.java
View File

@@ -20,7 +20,7 @@ import android.content.rollback.PackageRollbackInfo;
import android.content.rollback.PackageRollbackInfo.RestoreInfo;
import android.os.storage.StorageManager;
import android.util.IntArray;
import android.util.Log;
import android.util.Slog;
import android.util.SparseLongArray;
import com.android.internal.annotations.VisibleForTesting;
@@ -62,7 +62,7 @@ public class AppDataRollbackHelper {
if (isUserCredentialLocked(user)) {
// We've encountered a user that hasn't unlocked on a FBE device, so we can't copy
// across app user data until the user unlocks their device.
Log.v(TAG, "User: " + user + " isn't unlocked, skipping CE userdata backup.");
Slog.v(TAG, "User: " + user + " isn't unlocked, skipping CE userdata backup.");
storageFlags = Installer.FLAG_STORAGE_DE;
packageRollbackInfo.addPendingBackup(user);
} else {
@@ -76,7 +76,7 @@ public class AppDataRollbackHelper {
packageRollbackInfo.putCeSnapshotInode(user, ceSnapshotInode);
}
} catch (InstallerException ie) {
Log.e(TAG, "Unable to create app data snapshot for: "
Slog.e(TAG, "Unable to create app data snapshot for: "
+ packageRollbackInfo.getPackageName() + ", userId: " + user, ie);
}
}
@@ -122,7 +122,7 @@ public class AppDataRollbackHelper {
mInstaller.restoreAppDataSnapshot(packageRollbackInfo.getPackageName(), appId, seInfo,
userId, rollbackId, storageFlags);
} catch (InstallerException ie) {
Log.e(TAG, "Unable to restore app data snapshot: "
Slog.e(TAG, "Unable to restore app data snapshot: "
+ packageRollbackInfo.getPackageName(), ie);
}
@@ -148,7 +148,7 @@ public class AppDataRollbackHelper {
ceSnapshotInodes.delete(user);
}
} catch (InstallerException ie) {
Log.e(TAG, "Unable to delete app data snapshot for "
Slog.e(TAG, "Unable to delete app data snapshot for "
+ packageRollbackInfo.getPackageName(), ie);
}
}
@@ -257,7 +257,7 @@ public class AppDataRollbackHelper {
info.putCeSnapshotInode(userId, ceSnapshotInode);
pendingBackupUsers.remove(idx);
} catch (InstallerException ie) {
Log.e(TAG,
Slog.e(TAG,
"Unable to create app data snapshot for: "
+ info.getPackageName() + ", userId: " + userId, ie);
}
@@ -277,7 +277,7 @@ public class AppDataRollbackHelper {
Installer.FLAG_STORAGE_CE);
info.removeRestoreInfo(ri);
} catch (InstallerException ie) {
Log.e(TAG, "Unable to restore app data snapshot for: "
Slog.e(TAG, "Unable to restore app data snapshot for: "
+ info.getPackageName(), ie);
}
}

56
services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
View File

@@ -52,7 +52,7 @@ import android.os.UserHandle;
import android.provider.DeviceConfig;
import android.util.ArraySet;
import android.util.IntArray;
import android.util.Log;
import android.util.Slog;
import android.util.SparseBooleanArray;
import android.util.SparseLongArray;
@@ -171,7 +171,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
try {
enableRollbackFilter.addDataType("application/vnd.android.package-archive");
} catch (IntentFilter.MalformedMimeTypeException e) {
Log.e(TAG, "addDataType", e);
Slog.e(TAG, "addDataType", e);
}
mContext.registerReceiver(new BroadcastReceiver() {
@@ -251,7 +251,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
private void registerUserCallbacks(UserHandle user) {
Context context = getContextAsUser(user);
if (context == null) {
Log.e(TAG, "Unable to register user callbacks for user " + user);
Slog.e(TAG, "Unable to register user callbacks for user " + user);
return;
}
@@ -290,7 +290,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
public ParceledListSlice getAvailableRollbacks() {
enforceManageRollbacks("getAvailableRollbacks");
if (Thread.currentThread().equals(mHandlerThread)) {
Log.wtf(TAG, "Calling getAvailableRollbacks from mHandlerThread "
Slog.wtf(TAG, "Calling getAvailableRollbacks from mHandlerThread "
+ "causes a deadlock");
throw new IllegalStateException("Cannot call RollbackManager#getAvailableRollbacks "
+ "from the handler thread!");
@@ -309,7 +309,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
// We may not get the most up-to-date information, but whatever we
// can get now is better than nothing, so log but otherwise ignore
// the exception.
Log.w(TAG, "Interrupted while waiting for handler thread in getAvailableRollbacks");
Slog.w(TAG, "Interrupted while waiting for handler thread in getAvailableRollbacks");
}
synchronized (mLock) {
@@ -393,7 +393,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
*/
private void commitRollbackInternal(int rollbackId, List<VersionedPackage> causePackages,
String callerPackageName, IntentSender statusReceiver) {
Log.i(TAG, "Initiating rollback");
Slog.i(TAG, "Initiating rollback");
RollbackData data = getRollbackForId(rollbackId);
if (data == null || data.state != RollbackData.ROLLBACK_STATE_AVAILABLE) {
@@ -532,7 +532,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
}
parentSession.commit(receiver.getIntentSender());
} catch (IOException e) {
Log.e(TAG, "Rollback failed", e);
Slog.e(TAG, "Rollback failed", e);
sendFailure(statusReceiver, RollbackManager.STATUS_FAILURE,
"IOException: " + e.toString());
return;
@@ -761,7 +761,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
*/
private void sendFailure(IntentSender statusReceiver, @RollbackManager.Status int status,
String message) {
Log.e(TAG, message);
Slog.e(TAG, message);
try {
final Intent fillIn = new Intent();
fillIn.putExtra(RollbackManager.EXTRA_STATUS, status);
@@ -876,7 +876,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
// session.
final Context context = getContextAsUser(UserHandle.of(user));
if (context == null) {
Log.e(TAG, "Unable to create context for install session user.");
Slog.e(TAG, "Unable to create context for install session user.");
return false;
}
@@ -903,7 +903,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
}
if (parentSession == null || packageSession == null) {
Log.e(TAG, "Unable to find session for enabled rollback.");
Slog.e(TAG, "Unable to find session for enabled rollback.");
return false;
}
@@ -930,7 +930,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
newPackage = PackageParser.parsePackageLite(
new File(packageSession.resolvedBaseCodePath), 0);
} catch (PackageParser.PackageParserException e) {
Log.e(TAG, "Unable to parse new package", e);
Slog.e(TAG, "Unable to parse new package", e);
return false;
}
String packageName = newPackage.packageName;
@@ -940,7 +940,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
return true;
}
}
Log.e(TAG, "Unable to find package in apk session");
Slog.e(TAG, "Unable to find package in apk session");
return false;
}
@@ -972,16 +972,16 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
// TODO: Don't attempt to enable rollback for split installs.
final int installFlags = session.installFlags;
if ((installFlags & PackageManager.INSTALL_ENABLE_ROLLBACK) == 0) {
Log.e(TAG, "Rollback is not enabled.");
Slog.e(TAG, "Rollback is not enabled.");
return false;
}
if ((installFlags & PackageManager.INSTALL_INSTANT_APP) != 0) {
Log.e(TAG, "Rollbacks not supported for instant app install");
Slog.e(TAG, "Rollbacks not supported for instant app install");
return false;
}
if (session.resolvedBaseCodePath == null) {
Log.e(TAG, "Session code path has not been resolved.");
Slog.e(TAG, "Session code path has not been resolved.");
return false;
}
@@ -990,17 +990,17 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
try {
newPackage = PackageParser.parsePackageLite(new File(session.resolvedBaseCodePath), 0);
} catch (PackageParser.PackageParserException e) {
Log.e(TAG, "Unable to parse new package", e);
Slog.e(TAG, "Unable to parse new package", e);
return false;
}
String packageName = newPackage.packageName;
Log.i(TAG, "Enabling rollback for install of " + packageName
Slog.i(TAG, "Enabling rollback for install of " + packageName
+ ", session:" + session.sessionId);
String installerPackageName = session.getInstallerPackageName();
if (!enableRollbackAllowed(installerPackageName, packageName)) {
Log.e(TAG, "Installer " + installerPackageName
Slog.e(TAG, "Installer " + installerPackageName
+ " is not allowed to enable rollback on " + packageName);
return false;
}
@@ -1016,7 +1016,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
} catch (PackageManager.NameNotFoundException e) {
// TODO: Support rolling back fresh package installs rather than
// fail here. Test this case.
Log.e(TAG, packageName + " is not installed");
Slog.e(TAG, packageName + " is not installed");
return false;
}
@@ -1038,7 +1038,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
}
}
} catch (IOException e) {
Log.e(TAG, "Unable to copy package for rollback for " + packageName, e);
Slog.e(TAG, "Unable to copy package for rollback for " + packageName, e);
return false;
}
@@ -1144,7 +1144,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
final PackageInstaller.SessionInfo session = installer.getSessionInfo(sessionId);
if (session == null) {
Log.e(TAG, "No matching install session for: " + sessionId);
Slog.e(TAG, "No matching install session for: " + sessionId);
result.offer(false);
return;
}
@@ -1157,7 +1157,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
if (!session.isMultiPackage()) {
if (!enableRollbackForPackageSession(newRollback.data, session,
new int[0])) {
Log.e(TAG, "Unable to enable rollback for session: " + sessionId);
Slog.e(TAG, "Unable to enable rollback for session: " + sessionId);
result.offer(false);
return;
}
@@ -1166,13 +1166,13 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
final PackageInstaller.SessionInfo childSession =
installer.getSessionInfo(childSessionId);
if (childSession == null) {
Log.e(TAG, "No matching child install session for: " + childSessionId);
Slog.e(TAG, "No matching child install session for: " + childSessionId);
result.offer(false);
return;
}
if (!enableRollbackForPackageSession(newRollback.data, childSession,
new int[0])) {
Log.e(TAG, "Unable to enable rollback for session: " + sessionId);
Slog.e(TAG, "Unable to enable rollback for session: " + sessionId);
result.offer(false);
return;
}
@@ -1185,7 +1185,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
try {
return result.take();
} catch (InterruptedException ie) {
Log.e(TAG, "Interrupted while waiting for notifyStagedSession response");
Slog.e(TAG, "Interrupted while waiting for notifyStagedSession response");
return false;
}
}
@@ -1343,7 +1343,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
return null;
}
if (newRollback.isCancelled) {
Log.e(TAG, "Rollback has been cancelled by PackageManager");
Slog.e(TAG, "Rollback has been cancelled by PackageManager");
deleteRollback(data);
return null;
}
@@ -1352,7 +1352,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
// this is running on the handler thread and all changes to the
// data.info occur on the handler thread.
if (data.info.getPackages().size() != newRollback.packageSessionIds.length) {
Log.e(TAG, "Failed to enable rollback for all packages in session.");
Slog.e(TAG, "Failed to enable rollback for all packages in session.");
deleteRollback(data);
return null;
}
@@ -1472,7 +1472,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
try {
mRollbackStore.saveRollbackData(rollbackData);
} catch (IOException ioe) {
Log.e(TAG, "Unable to save rollback info for: "
Slog.e(TAG, "Unable to save rollback info for: "
+ rollbackData.info.getRollbackId(), ioe);
}
}

4
services/core/java/com/android/server/rollback/RollbackStore.java
View File

@@ -25,7 +25,7 @@ import android.content.rollback.PackageRollbackInfo;
import android.content.rollback.PackageRollbackInfo.RestoreInfo;
import android.content.rollback.RollbackInfo;
import android.util.IntArray;
import android.util.Log;
import android.util.Slog;
import android.util.SparseLongArray;
import libcore.io.IoUtils;
@@ -83,7 +83,7 @@ class RollbackStore {
try {
rollbacks.add(loadRollbackData(rollbackDir));
} catch (IOException e) {
Log.e(TAG, "Unable to read rollback data at " + rollbackDir, e);
Slog.e(TAG, "Unable to read rollback data at " + rollbackDir, e);
removeFile(rollbackDir);
}
}