diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-06-07 21:06:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-07 21:06:06 +0000 |
| commit | 081cca3731f99b1031bbb580f529b21a09a0581f (patch) | |
| tree | b5ddddb92716d46aa53efa17200ffbb030308112 | |
| parent | 09e948703f0d7f68baccb2e8a2b968dd672f6f77 (diff) | |
| parent | e0e0e1d0004ab443c97aa96e390581fbce85fcd1 (diff) | |
| download | android_packages_apps_Trebuchet-081cca3731f99b1031bbb580f529b21a09a0581f.tar.gz android_packages_apps_Trebuchet-081cca3731f99b1031bbb580f529b21a09a0581f.tar.bz2 android_packages_apps_Trebuchet-081cca3731f99b1031bbb580f529b21a09a0581f.zip | |
Merge "Fixing FileLogs tests" into ub-launcher3-calgary
| -rw-r--r-- | AndroidManifest.xml | 11 | ||||
| -rw-r--r-- | src/com/android/launcher3/logging/FileLog.java | 9 |
2 files changed, 19 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index eb7ea0c61..3a3a28dd6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -49,7 +49,16 @@ <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" /> <uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" /> - <application> + <application + android:backupAgent="com.android.launcher3.LauncherBackupAgent" + android:fullBackupOnly="true" + android:fullBackupContent="@xml/backupscheme" + android:hardwareAccelerated="true" + android:icon="@mipmap/ic_launcher_home" + android:label="@string/app_name" + android:largeHeap="@bool/config_largeHeap" + android:restoreAnyVersion="true" + android:supportsRtl="true" > <!-- Main launcher activity. When extending only change the name, and keep all the diff --git a/src/com/android/launcher3/logging/FileLog.java b/src/com/android/launcher3/logging/FileLog.java index 68d9b8c92..8629e9266 100644 --- a/src/com/android/launcher3/logging/FileLog.java +++ b/src/com/android/launcher3/logging/FileLog.java @@ -40,6 +40,15 @@ public final class FileLog { private static File sLogsDirectory = null; public static void setDir(File logsDir) { + if (ProviderConfig.IS_DOGFOOD_BUILD) { + synchronized (DATE_FORMAT) { + // If the target directory changes, stop any active thread. + if (sHandler != null && !logsDir.equals(sLogsDirectory)) { + ((HandlerThread) sHandler.getLooper().getThread()).quit(); + sHandler = null; + } + } + } sLogsDirectory = logsDir; } |