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

Merge "Suppress StopInfo exception based on target API." into nyc-dev

Browse Source 
am: d1caf8560d

* commit 'd1caf8560df4860fa7fcbd63afe359990f72d9f4':
  Suppress StopInfo exception based on target API.
This commit is contained in:
Jeff Sharkey
2016-03-01 22:20:58 +00:00
committed by android-build-merger
parent 46e39cfd7c d1caf8560d
commit cfc7bc8137
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ActivityThread.java
View File

@@ -3690,8 +3690,8 @@ public final class ActivityThread {
activity.token, state, persistentState, description);
} catch (RemoteException ex) {
if (ex instanceof TransactionTooLargeException
&& "com.google.android.gms".equals(activity.packageInfo.getPackageName())) {
Log.d(TAG, "STAHP SENDING SO MUCH DATA KTHX: " + ex);
&& activity.packageInfo.getTargetSdkVersion() < Build.VERSION_CODES.N) {
Log.e(TAG, "App tried sending too much data in instance state", ex);
return;
}