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

Catch IllegalStateException in StatsManager

Browse Source 
StatsManagerService throws IllegalStateException
when statsd is not available. This causes GMSCore to crash.

Bug: 149914783
Test: Manual, verify play store no longer crashes
Change-Id: I45cd679600ccfdb7977ecfd4437b62f56034fed2
This commit is contained in:
Jeffrey Huang
2020-02-20 15:19:07 -08:00
parent a6149521d3
commit 201c631992
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apex/statsd/framework/java/android/app/StatsManager.java
View File

@@ -159,6 +159,9 @@ public final class StatsManager {
throw new StatsUnavailableException("could not connect", e);
} catch (SecurityException e) {
throw new StatsUnavailableException(e.getMessage(), e);
} catch (IllegalStateException e) {
Log.e(TAG, "Failed to addConfig in statsmanager");
throw new StatsUnavailableException(e.getMessage(), e);
}
}
}
@@ -195,6 +198,9 @@ public final class StatsManager {
throw new StatsUnavailableException("could not connect", e);
} catch (SecurityException e) {
throw new StatsUnavailableException(e.getMessage(), e);
} catch (IllegalStateException e) {
Log.e(TAG, "Failed to removeConfig in statsmanager");
throw new StatsUnavailableException(e.getMessage(), e);
}
}
}
@@ -391,6 +397,9 @@ public final class StatsManager {
throw new StatsUnavailableException("could not connect", e);
} catch (SecurityException e) {
throw new StatsUnavailableException(e.getMessage(), e);
} catch (IllegalStateException e) {
Log.e(TAG, "Failed to getReports in statsmanager");
throw new StatsUnavailableException(e.getMessage(), e);
}
}
}
@@ -428,6 +437,9 @@ public final class StatsManager {
throw new StatsUnavailableException("could not connect", e);
} catch (SecurityException e) {
throw new StatsUnavailableException(e.getMessage(), e);
} catch (IllegalStateException e) {
Log.e(TAG, "Failed to getStatsMetadata in statsmanager");
throw new StatsUnavailableException(e.getMessage(), e);
}
}
}
@@ -469,6 +481,9 @@ public final class StatsManager {
+ "registered experiment IDs");
}
throw new StatsUnavailableException("could not connect", e);
} catch (IllegalStateException e) {
Log.e(TAG, "Failed to getRegisteredExperimentIds in statsmanager");
throw new StatsUnavailableException(e.getMessage(), e);
}
}
}