commit 0c4052ceaad433978a916a5fe785d3965af7093e
author Julia Reynolds <juliacr@google.com> Mon Jan 04 22:07:28 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 04 22:07:28 2016 +0000
tree 16bd53b3bc1b1c1f23d441089c23b574bf64042a
parent e5eb0834150438ad45ffb531ad7f880c72e1e661
parent 2e1e0b7ef69b7a93cc170168aea211e739b3412e

Merge "Allow users to choose a notification assistant."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d8dd102..927e0ac 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2175,7 +2175,7 @@
         <activity android:name=".FallbackHome"
                   android:excludeFromRecents="true"
                   android:theme="@android:style/Theme.Translucent.NoTitleBar">
-            <intent-filter android:priority="-10">
+            <intent-filter android:priority="-1000">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2663,7 +2663,7 @@
                 android:excludeFromRecents="true">
 
             <intent-filter>
-                <action android:name="android.settings.action.SHOW_ADMIN_SUPPORT_DETAILS" />
+                <action android:name="android.settings.SHOW_ADMIN_SUPPORT_DETAILS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>

src/com/android/settings/applications/AppInfoBase.java

diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index f229b3d..599f61e 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -105,6 +105,12 @@
         super.onPause();
     }
 
+    @Override
+    public void onDestroy() {
+        mSession.release();
+        super.onDestroy();
+    }
+
     protected String retrieveAppEntry() {
         final Bundle args = getArguments();
         mPackageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;