PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ApplicationsState.Session memory leak in settings app"

Browse Source 
am: 00a2619a10

Change-Id: I2119e1d878296dae003b6283e225866155fa88b6
This commit is contained in:
Tomohiro Takeda
2016-09-17 15:50:40 +00:00
committed by android-build-merger
parent 87e59d0e81 00a2619a10
commit 7b357f0b55
1 changed files with 1 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/com/android/settings/applications/AdvancedAppSettings.java
View File

@@ -29,16 +29,13 @@ import com.android.settings.Utils;
import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback; import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable; 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.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
public class AdvancedAppSettings extends SettingsPreferenceFragment implements public class AdvancedAppSettings extends SettingsPreferenceFragment implements
ApplicationsState.Callbacks, Indexable { Indexable {
static final String TAG = "AdvancedAppSettings"; static final String TAG = "AdvancedAppSettings";
@@ -48,7 +45,6 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements
private static final String KEY_SYSTEM_ALERT_WINDOW = "system_alert_window"; private static final String KEY_SYSTEM_ALERT_WINDOW = "system_alert_window";
private static final String KEY_WRITE_SETTINGS_APPS = "write_settings_apps"; private static final String KEY_WRITE_SETTINGS_APPS = "write_settings_apps";
private Session mSession;
private Preference mAppPermsPreference; private Preference mAppPermsPreference;
private Preference mAppDomainURLsPreference; private Preference mAppDomainURLsPreference;
private Preference mHighPowerPreference; private Preference mHighPowerPreference;
@@ -65,10 +61,6 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements
Preference permissions = getPreferenceScreen().findPreference(KEY_APP_PERM); Preference permissions = getPreferenceScreen().findPreference(KEY_APP_PERM);
permissions.setIntent(new Intent(Intent.ACTION_MANAGE_PERMISSIONS)); permissions.setIntent(new Intent(Intent.ACTION_MANAGE_PERMISSIONS));
ApplicationsState applicationsState = ApplicationsState.getInstance(
getActivity().getApplication());
mSession = applicationsState.newSession(this);
mAppPermsPreference = findPreference(KEY_APP_PERM); mAppPermsPreference = findPreference(KEY_APP_PERM);
mAppDomainURLsPreference = findPreference(KEY_APP_DOMAIN_URLS); mAppDomainURLsPreference = findPreference(KEY_APP_DOMAIN_URLS);
mHighPowerPreference = findPreference(KEY_HIGH_POWER_APPS); mHighPowerPreference = findPreference(KEY_HIGH_POWER_APPS);
@@ -81,46 +73,6 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements
return MetricsEvent.APPLICATIONS_ADVANCED; 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() { private final PermissionsResultCallback mPermissionCallback = new PermissionsResultCallback() {
@Override @Override
public void onAppWithPermissionsCountsResult(int standardGrantedPermissionAppCount, public void onAppWithPermissionsCountsResult(int standardGrantedPermissionAppCount,