diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 9 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 6 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/cm_strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/cm_symbols.xml | 3 |
5 files changed, 13 insertions, 13 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 6c88563..cd27d76 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -2428,13 +2428,6 @@ public final class ActivityThread { } catch (Exception e) { if (!mInstrumentation.onException(activity, e)) { - if (e instanceof InflateException) { - Log.e(TAG, "Failed to inflate", e); - sendAppLaunchFailureBroadcast(r); - } else if (e instanceof Resources.NotFoundException) { - Log.e(TAG, "Failed to find resource", e); - sendAppLaunchFailureBroadcast(r); - } throw new RuntimeException( "Unable to start activity " + component + ": " + e.toString(), e); @@ -2449,7 +2442,7 @@ public final class ActivityThread { if (r.packageInfo != null && !TextUtils.isEmpty(r.packageInfo.getPackageName())) { pkg = r.packageInfo.getPackageName(); } - Intent intent = new Intent(Intent.ACTION_APP_LAUNCH_FAILURE, + Intent intent = new Intent(Intent.ACTION_APP_FAILURE, (pkg != null)? Uri.fromParts("package", pkg, null) : null); getSystemContext().sendBroadcast(intent); } diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 052c6d3..a1a0867 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2846,13 +2846,15 @@ public class Intent implements Parcelable, Cloneable { * Could indicate that curently applied theme is malicious. * @hide */ - public static final String ACTION_APP_LAUNCH_FAILURE = "com.tmobile.intent.action.APP_LAUNCH_FAILURE"; + public static final String ACTION_APP_FAILURE = + "com.tmobile.intent.action.APP_FAILURE"; /** * Broadcast Action: Request to reset the unrecoverable errors count to 0. * @hide */ - public static final String ACTION_APP_LAUNCH_FAILURE_RESET = "com.tmobile.intent.action.APP_LAUNCH_FAILURE_RESET"; + public static final String ACTION_APP_FAILURE_RESET = + "com.tmobile.intent.action.APP_FAILURE_RESET"; /** * Activity Action: Shows the brightness setting dialog. diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 863b9ea..540a74b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2954,10 +2954,10 @@ </intent-filter> </receiver> - <receiver android:name="com.android.server.AppsLaunchFailureReceiver" > + <receiver android:name="com.android.server.AppsFailureReceiver" > <intent-filter> - <action android:name="com.tmobile.intent.action.APP_LAUNCH_FAILURE" /> - <action android:name="com.tmobile.intent.action.APP_LAUNCH_FAILURE_RESET" /> + <action android:name="com.tmobile.intent.action.APP_FAILURE" /> + <action android:name="com.tmobile.intent.action.APP_FAILURE_RESET" /> <action android:name="android.intent.action.PACKAGE_ADDED" /> <action android:name="android.intent.action.PACKAGE_REMOVED" /> <action android:name="org.cyanogenmod.intent.action.THEME_CHANGED" /> diff --git a/core/res/res/values/cm_strings.xml b/core/res/res/values/cm_strings.xml index 98e0539..b5da286 100644 --- a/core/res/res/values/cm_strings.xml +++ b/core/res/res/values/cm_strings.xml @@ -133,4 +133,6 @@ <!-- stylus gestures support --> <string name="stylus_app_not_installed">%s is not installed</string> + <string name="theme_reset_notification_title">Theme reset</string> + <string name="theme_reset_notification_body">System theme restored due to multiple app crashes.</string> </resources> diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml index d2ad24d..a5d780e 100644 --- a/core/res/res/values/cm_symbols.xml +++ b/core/res/res/values/cm_symbols.xml @@ -71,4 +71,7 @@ <java-symbol type="bool" name="config_stylusGestures" /> <java-symbol type="string" name="stylus_app_not_installed" /> + <!-- Theme reset notification --> + <java-symbol type="string" name="theme_reset_notification_title" /> + <java-symbol type="string" name="theme_reset_notification_body" /> </resources> |