commit 2a03d33945b781b37ec6fc705d45185a5c33b553
author Tomohiro Takeda <tomohiro.takeda@sonymobile.com> Sat Sep 17 15:53:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 17 15:53:11 2016 +0000
tree a891557ba4e8474abb9244e1a30cea655340919a
parent c38b6a12cb2c0b4b00bd7eeb7174cc85ee7face6
parent 7b357f0b55b6401382b696ef1c3f1439cfa1282e

Merge "Fix ApplicationsState.Session memory leak in settings app" am: 00a2619a10
am: 7b357f0b55

Change-Id: I5d7d5041c32c18c2ce50b883656cdce28daa4d93

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

diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java
index ffa2236..f254d19 100644
--- a/src/com/android/settings/applications/AdvancedAppSettings.java
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -29,16 +29,13 @@
 import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settingslib.applications.ApplicationsState.Session;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 public class AdvancedAppSettings extends SettingsPreferenceFragment implements
-        ApplicationsState.Callbacks, Indexable {
+        Indexable {
 
     static final String TAG = "AdvancedAppSettings";
 
@@ -48,7 +45,6 @@
     private static final String KEY_SYSTEM_ALERT_WINDOW = "system_alert_window";
     private static final String KEY_WRITE_SETTINGS_APPS = "write_settings_apps";
 
-    private Session mSession;
     private Preference mAppPermsPreference;
     private Preference mAppDomainURLsPreference;
     private Preference mHighPowerPreference;
@@ -65,10 +61,6 @@
         Preference permissions = getPreferenceScreen().findPreference(KEY_APP_PERM);
         permissions.setIntent(new Intent(Intent.ACTION_MANAGE_PERMISSIONS));
 
-        ApplicationsState applicationsState = ApplicationsState.getInstance(
-                getActivity().getApplication());
-        mSession = applicationsState.newSession(this);
-
         mAppPermsPreference = findPreference(KEY_APP_PERM);
         mAppDomainURLsPreference = findPreference(KEY_APP_DOMAIN_URLS);
         mHighPowerPreference = findPreference(KEY_HIGH_POWER_APPS);
@@ -81,46 +73,6 @@
         return MetricsEvent.APPLICATIONS_ADVANCED;
     }
 
-    @Override
-    public void onRunningStateChanged(boolean running) {
-        // No-op.
-    }
-
-    @Override
-    public void onPackageListChanged() {
-        // No-op.
-    }
-
-    @Override
-    public void onRebuildComplete(ArrayList<AppEntry> apps) {
-        // No-op.
-    }
-
-    @Override
-    public void onPackageIconChanged() {
-        // No-op.
-    }
-
-    @Override
-    public void onPackageSizeChanged(String packageName) {
-        // No-op.
-    }
-
-    @Override
-    public void onAllSizesComputed() {
-        // No-op.
-    }
-
-    @Override
-    public void onLauncherInfoChanged() {
-        // No-op.
-    }
-
-    @Override
-    public void onLoadEntriesCompleted() {
-        // No-op.
-    }
-
     private final PermissionsResultCallback mPermissionCallback = new PermissionsResultCallback() {
         @Override
         public void onAppWithPermissionsCountsResult(int standardGrantedPermissionAppCount,