Skip to content

Commit 62db5c4

Browse files
kmandrikakmandrika
committed
Format
1 parent 6cc9446 commit 62db5c4

File tree

11 files changed

+35
-50
lines changed

11 files changed

+35
-50
lines changed

‎firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashpadController.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
import android.app.ApplicationExitInfo;
1919
import android.content.Context;
2020
import android.os.Build;
21-
2221
import androidx.annotation.NonNull;
2322
import androidx.annotation.Nullable;
2423
import androidx.annotation.RequiresApi;
2524
import androidx.annotation.VisibleForTesting;
26-
2725
import com.google.firebase.crashlytics.internal.Logger;
2826
import com.google.firebase.crashlytics.internal.common.CommonUtils;
2927
import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
@@ -86,7 +84,7 @@ public boolean initialize(
8684
}
8785

8886
public boolean hasCrashDataForSession(String sessionId) {
89-
SessionFiles files = getFilesForSession(sessionId);
87+
SessionFiles files = getFilesForSession(sessionId);
9088
return files.nativeCore != null && files.nativeCore.hasCore();
9189
}
9290

@@ -120,10 +118,10 @@ public SessionFiles getFilesForSession(String sessionId) {
120118
return builder.build();
121119
}
122120

123-
private SessionFiles.NativeCore getNativeCore(String sessionId, File sessionFileDirectoryForMinidump) {
121+
private SessionFiles.NativeCore getNativeCore(
122+
String sessionId, File sessionFileDirectoryForMinidump) {
124123
File minidump = getSingleFileWithExtension(sessionFileDirectoryForMinidump, ".dmp");
125-
CrashlyticsReport.ApplicationExitInfo applicationExitInfo =
126-
getApplicationExitInfo(sessionId);
124+
CrashlyticsReport.ApplicationExitInfo applicationExitInfo = getApplicationExitInfo(sessionId);
127125
return new SessionFiles.NativeCore(minidump, applicationExitInfo);
128126
}
129127

@@ -134,23 +132,23 @@ private CrashlyticsReport.ApplicationExitInfo getApplicationExitInfo(String sess
134132
}
135133

136134
@RequiresApi(api = Build.VERSION_CODES.S)
137-
private CrashlyticsReport.ApplicationExitInfo getNativeCrashApplicationExitInfo(String sessionId) {
135+
private CrashlyticsReport.ApplicationExitInfo getNativeCrashApplicationExitInfo(
136+
String sessionId) {
138137
ActivityManager activityManager =
139-
(ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
138+
(ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
140139
List<ApplicationExitInfo> applicationExitInfoList =
141-
activityManager.getHistoricalProcessExitReasons(null, 0, 0);
140+
activityManager.getHistoricalProcessExitReasons(null, 0, 0);
142141

143142
File sessionStartFile = fileStore.getSessionFile(sessionId, SESSION_START_TIMESTAMP_FILE_NAME);
144-
long sessionTime = sessionStartFile == null
145-
? System.currentTimeMillis()
146-
: sessionStartFile.lastModified();
143+
long sessionTime =
144+
sessionStartFile == null ? System.currentTimeMillis() : sessionStartFile.lastModified();
147145

148146
return getRelevantApplicationExitInfo(sessionTime, applicationExitInfoList);
149147
}
150148

151149
@RequiresApi(api = Build.VERSION_CODES.S)
152150
private CrashlyticsReport.ApplicationExitInfo getRelevantApplicationExitInfo(
153-
long sessionTime, List<ApplicationExitInfo> applicationExitInfoList) {
151+
long sessionTime, List<ApplicationExitInfo> applicationExitInfoList) {
154152
List<ApplicationExitInfo> filtered = new ArrayList<>();
155153
for (ApplicationExitInfo applicationExitInfo : applicationExitInfoList) {
156154
if (applicationExitInfo.getReason() != ApplicationExitInfo.REASON_CRASH_NATIVE
@@ -260,7 +258,8 @@ private static CrashlyticsReport.ApplicationExitInfo convertApplicationExitInfoT
260258
}
261259

262260
@RequiresApi(api = Build.VERSION_CODES.S)
263-
private static String getTraceFileFromApplicationExitInfo(ApplicationExitInfo applicationExitInfo) {
261+
private static String getTraceFileFromApplicationExitInfo(
262+
ApplicationExitInfo applicationExitInfo) {
264263
try {
265264
return convertInputStreamToString(applicationExitInfo.getTraceInputStream());
266265
} catch (IOException e) {
@@ -290,7 +289,7 @@ public static String convertInputStreamToString(InputStream inputStream) throws
290289
@RequiresApi(api = Build.VERSION_CODES.S)
291290
private static String zipAndEncode(byte[] bytes) throws IOException {
292291
try (ByteArrayOutputStream out = new ByteArrayOutputStream();
293-
GZIPOutputStream gzip = new GZIPOutputStream(out)) {
292+
GZIPOutputStream gzip = new GZIPOutputStream(out)) {
294293
gzip.write(bytes);
295294
gzip.finish();
296295

‎firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/SessionFiles.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
package com.google.firebase.crashlytics.ndk;
1616

1717
import androidx.annotation.Nullable;
18-
1918
import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
20-
2119
import java.io.File;
2220

2321
final class SessionFiles {
@@ -26,15 +24,13 @@ final class SessionFiles {
2624
* In most cases, both, the tombstone and the minidump will be available.
2725
*/
2826
static final class NativeCore {
29-
@Nullable
30-
public final File minidump;
27+
@Nullable public final File minidump;
3128

32-
@Nullable
33-
public final CrashlyticsReport.ApplicationExitInfo applicationExitInfo;
29+
@Nullable public final CrashlyticsReport.ApplicationExitInfo applicationExitInfo;
3430

3531
NativeCore(
36-
@Nullable File minidump,
37-
@Nullable CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
32+
@Nullable File minidump,
33+
@Nullable CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
3834
this.minidump = minidump;
3935
this.applicationExitInfo = applicationExitInfo;
4036
}

‎firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/SessionFilesProvider.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import com.google.firebase.crashlytics.internal.NativeSessionFileProvider;
1818
import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
19-
2019
import java.io.File;
2120

2221
class SessionFilesProvider implements NativeSessionFileProvider {
@@ -34,9 +33,7 @@ public File getMinidumpFile() {
3433

3534
@Override
3635
public CrashlyticsReport.ApplicationExitInfo getApplicationExitInto() {
37-
return sessionFiles.nativeCore != null
38-
? sessionFiles.nativeCore.applicationExitInfo
39-
: null;
36+
return sessionFiles.nativeCore != null ? sessionFiles.nativeCore.applicationExitInfo : null;
4037
}
4138

4239
@Override

‎firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,8 @@ public void testFinalizeSessionWithNativeEvent_createsCrashlyticsReportWithNativ
401401

402402
ArgumentCaptor<CrashlyticsReport.FilesPayload> filesPayload =
403403
ArgumentCaptor.forClass(CrashlyticsReport.FilesPayload.class);
404-
verify(reportPersistence).finalizeSessionWithNativeEvent(eq("id"), filesPayload.capture(), any());
404+
verify(reportPersistence)
405+
.finalizeSessionWithNativeEvent(eq("id"), filesPayload.capture(), any());
405406
CrashlyticsReport.FilesPayload ndkPayloadFinalized = filesPayload.getValue();
406407
assertEquals(1, ndkPayloadFinalized.getFiles().size());
407408

‎firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/CrashlyticsNativeComponentDeferredProxy.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package com.google.firebase.crashlytics.internal;
1616

1717
import androidx.annotation.NonNull;
18-
1918
import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
2019
import com.google.firebase.crashlytics.internal.model.StaticSessionData;
2120
import com.google.firebase.inject.Deferred;

‎firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/NativeSessionFileProvider.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
package com.google.firebase.crashlytics.internal;
1616

1717
import androidx.annotation.Nullable;
18-
1918
import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
20-
2119
import java.io.File;
2220

2321
/** Provides references to the files that make up a native crash report. */

‎firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import android.os.StatFs;
2525
import androidx.annotation.NonNull;
2626
import androidx.annotation.Nullable;
27-
2827
import com.google.android.gms.tasks.SuccessContinuation;
2928
import com.google.android.gms.tasks.Task;
3029
import com.google.android.gms.tasks.TaskCompletionSource;
@@ -618,7 +617,7 @@ private void finalizePreviousNativeSession(String previousSessionId) {
618617
nativeComponent.getSessionFileProvider(previousSessionId);
619618
File minidumpFile = nativeSessionFileProvider.getMinidumpFile();
620619
CrashlyticsReport.ApplicationExitInfo applicationExitInfo =
621-
nativeSessionFileProvider.getApplicationExitInto();
620+
nativeSessionFileProvider.getApplicationExitInto();
622621

623622
if (nativeCoreAbsent(previousSessionId, minidumpFile, applicationExitInfo)) {
624623
Logger.getLogger().w("No native core present");
@@ -649,14 +648,14 @@ private void finalizePreviousNativeSession(String previousSessionId) {
649648
Logger.getLogger().d("CrashlyticsController#finalizePreviousNativeSession");
650649

651650
reportingCoordinator.finalizeSessionWithNativeEvent(
652-
previousSessionId, nativeSessionFiles, applicationExitInfo);
651+
previousSessionId, nativeSessionFiles, applicationExitInfo);
653652
previousSessionLogManager.clearLog();
654653
}
655654

656655
private static boolean nativeCoreAbsent(
657-
String previousSessionId,
658-
File minidumpFile,
659-
CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
656+
String previousSessionId,
657+
File minidumpFile,
658+
CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
660659
if (minidumpFile == null || !minidumpFile.exists()) {
661660
Logger.getLogger().w("No minidump data found for session " + previousSessionId);
662661
}
@@ -833,8 +832,8 @@ private static NativeSessionFile nativeCoreFile(NativeSessionFileProvider filePr
833832
File minidump = fileProvider.getMinidumpFile();
834833

835834
return minidump == null || !minidump.exists()
836-
? new BytesBackedNativeSessionFile("minidump_file", "minidump", new byte[] { 0 })
837-
: new FileBackedNativeSessionFile("minidump_file", "minidump", minidump);
835+
? new BytesBackedNativeSessionFile("minidump_file", "minidump", new byte[] {0})
836+
: new FileBackedNativeSessionFile("minidump_file", "minidump", minidump);
838837
}
839838

840839
// endregion

‎firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,7 @@ public void finalizeSessionWithNativeEvent(
177177

178178
reportPersistence.finalizeSessionWithNativeEvent(
179179
sessionId,
180-
FilesPayload.builder()
181-
.setFiles(ImmutableList.from(nativeFiles))
182-
.build(),
180+
FilesPayload.builder().setFiles(ImmutableList.from(nativeFiles)).build(),
183181
applicationExitInfo);
184182
}
185183

‎firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/CrashlyticsReport.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,7 @@ public CrashlyticsReport withNdkPayload(@NonNull FilesPayload filesPayload) {
158158

159159
@NonNull
160160
public CrashlyticsReport withApplicationExitInfo(ApplicationExitInfo appExitInfo) {
161-
return appExitInfo == null
162-
? this
163-
: toBuilder().setAppExitInfo(appExitInfo).build();
161+
return appExitInfo == null ? this : toBuilder().setAppExitInfo(appExitInfo).build();
164162
}
165163

166164
/**

‎firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransform.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import android.util.Base64;
1818
import android.util.JsonReader;
1919
import androidx.annotation.NonNull;
20-
2120
import com.google.firebase.crashlytics.internal.model.AutoCrashlyticsReportEncoder;
2221
import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
2322
import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.ApplicationExitInfo.BuildIdMappingForArch;
@@ -241,7 +240,7 @@ private static CrashlyticsReport.ApplicationExitInfo parseAppExitInfo(
241240
break;
242241
case "buildIdMappingForArch":
243242
builder.setBuildIdMappingForArch(
244-
parseArray(jsonReader, CrashlyticsReportJsonTransform::parseBuildIdMappingForArch));
243+
parseArray(jsonReader, CrashlyticsReportJsonTransform::parseBuildIdMappingForArch));
245244
break;
246245
default:
247246
jsonReader.skipValue();

0 commit comments

Comments
 (0)