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

Commit c3a3b399 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 25752 into eclair 

* changes:
  Add a Gservices setting to controll the app error reporting feature.
parents 66fdd84e a233943c

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -3598,6 +3598,14 @@ public final class Settings { 
        public static final String SEARCH_PER_SOURCE_CONCURRENT_QUERY_LIMIT =

                "search_per_source_concurrent_query_limit";



        /**

         * Flag for allowing ActivityManagerService to send ACTION_APP_ERROR intents

         * on application crashes and ANRs. If this is disabled, the crash/ANR dialog

         * will never display the "Report" button.

         * Type: int ( 0 = disallow, 1 = allow )

         */

        public static final String SEND_ACTION_APP_ERROR = "send_action_app_error";



        /**

         * @deprecated

         * @hide

services/java/com/android/server/am/ActivityManagerService.java

+7 −0
Original line number Diff line number Diff line
@@ -8431,6 +8431,13 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 
    }















    private ComponentName getErrorReportReceiver(ProcessRecord app) {













        // check if error reporting is enabled in Gservices













        int enabled = Settings.Gservices.getInt(mContext.getContentResolver(),













                Settings.Gservices.SEND_ACTION_APP_ERROR, 0);













        if (enabled == 0) {













            return null;













        }



























        IPackageManager pm = ActivityThread.getPackageManager();





























        try {