Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 341de33e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Sigh, someone is pushing 2MB through StopInfo." into nyc-dev

parents 0a04ab24 369f509d

core/java/android/app/ActivityThread.java

+7 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import android.os.StrictMode; 
import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.TransactionTooLargeException;

import android.os.UserHandle;

import android.provider.Settings;

import android.security.NetworkSecurityPolicy;
@@ -3677,6 +3678,12 @@ public final class ActivityThread { 
                ActivityManagerNative.getDefault().activityStopped(

                    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);

                    return;

                }



                throw ex.rethrowFromSystemServer();

            }

        }

core/java/android/app/LoadedApk.java

+4 −0
Original line number Diff line number Diff line
@@ -225,6 +225,10 @@ public final class LoadedApk { 
        return mApplicationInfo;

    }



    public int getTargetSdkVersion() {

        return mApplicationInfo.targetSdkVersion;

    }



    public boolean isSecurityViolation() {

        return mSecurityViolation;

    }