From 49f19f0af96ccf9da78b62a4ac9f51e40b40adc5 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 5 Jan 2017 14:36:02 -0800 Subject: [PATCH] Adding some logging around launcher restore > Also enabling fileLog when the device is debug build (even when launcher is not dogfood build) Bug: 30735662 Change-Id: Ieab2c962d57f6f7f972f8111070d4ecbef06b3e7 --- src/com/android/launcher3/LauncherBackupAgent.java | 8 ++++++++ src/com/android/launcher3/Utilities.java | 6 ++++++ src/com/android/launcher3/logging/FileLog.java | 2 +- src/com/android/launcher3/provider/ImportDataTask.java | 3 +++ src/com/android/launcher3/provider/RestoreDbTask.java | 1 + 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/LauncherBackupAgent.java b/src/com/android/launcher3/LauncherBackupAgent.java index b3e73f7689..140794b074 100644 --- a/src/com/android/launcher3/LauncherBackupAgent.java +++ b/src/com/android/launcher3/LauncherBackupAgent.java @@ -5,10 +5,18 @@ import android.app.backup.BackupDataInput; import android.app.backup.BackupDataOutput; import android.os.ParcelFileDescriptor; +import com.android.launcher3.logging.FileLog; import com.android.launcher3.provider.RestoreDbTask; public class LauncherBackupAgent extends BackupAgent { + @Override + public void onCreate() { + super.onCreate(); + // Set the log dir as LauncherAppState is not initialized during restore. + FileLog.setDir(getFilesDir()); + } + @Override public void onRestore( BackupDataInput data, int appVersionCode, ParcelFileDescriptor newState) { diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 2cb913858c..89ffd315da 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -104,6 +104,12 @@ public final class Utilities { public static final boolean ATLEAST_LOLLIPOP_MR1 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1; + /** + * Indicates if the device has a debug build. Should only be used to store additional info or + * add extra logging and not for changing the app behavior. + */ + public static final boolean IS_DEBUG_DEVICE = Build.TYPE.toLowerCase().contains("debug"); + // An intent extra to indicate the horizontal scroll of the wallpaper. public static final String EXTRA_WALLPAPER_OFFSET = "com.android.launcher3.WALLPAPER_OFFSET"; diff --git a/src/com/android/launcher3/logging/FileLog.java b/src/com/android/launcher3/logging/FileLog.java index 8629e9266c..ffb41b76bf 100644 --- a/src/com/android/launcher3/logging/FileLog.java +++ b/src/com/android/launcher3/logging/FileLog.java @@ -40,7 +40,7 @@ public final class FileLog { private static File sLogsDirectory = null; public static void setDir(File logsDir) { - if (ProviderConfig.IS_DOGFOOD_BUILD) { + if (ProviderConfig.IS_DOGFOOD_BUILD || Utilities.IS_DEBUG_DEVICE) { synchronized (DATE_FORMAT) { // If the target directory changes, stop any active thread. if (sHandler != null && !logsDir.equals(sLogsDirectory)) { diff --git a/src/com/android/launcher3/provider/ImportDataTask.java b/src/com/android/launcher3/provider/ImportDataTask.java index 9d8e62ae5f..808e6e3ac2 100644 --- a/src/com/android/launcher3/provider/ImportDataTask.java +++ b/src/com/android/launcher3/provider/ImportDataTask.java @@ -89,10 +89,12 @@ public class ImportDataTask { ArrayList allScreens = LauncherDbUtils.getScreenIdsFromCursor( mContext.getContentResolver().query(mOtherScreensUri, null, null, null, LauncherSettings.WorkspaceScreens.SCREEN_RANK)); + FileLog.d(TAG, "Importing DB from " + mOtherFavoritesUri); // During import we reset the screen IDs to 0-indexed values. if (allScreens.isEmpty()) { // No thing to migrate + FileLog.e(TAG, "No data found to import"); return false; } @@ -293,6 +295,7 @@ public class ImportDataTask { } } } + FileLog.d(TAG, totalItemsOnWorkspace + " items imported from external source"); if (totalItemsOnWorkspace < MIN_ITEM_COUNT_FOR_SUCCESSFUL_MIGRATION) { throw new Exception("Insufficient data"); } diff --git a/src/com/android/launcher3/provider/RestoreDbTask.java b/src/com/android/launcher3/provider/RestoreDbTask.java index 47bee0669c..a200a8526b 100644 --- a/src/com/android/launcher3/provider/RestoreDbTask.java +++ b/src/com/android/launcher3/provider/RestoreDbTask.java @@ -142,6 +142,7 @@ public class RestoreDbTask { } public static void setPending(Context context, boolean isPending) { + FileLog.d(TAG, "Restore data received through full backup"); Utilities.getPrefs(context).edit().putBoolean(RESTORE_TASK_PENDING, isPending).commit(); } }