Code Review / O1_MP2 / alps-release-o1.mp2-default.git / commitdiff
? search:
re
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: c8819fa)
test 128288 [客户反馈1984]App crashed when Add ringtones wuxuhua 48/7148/1 dev_France_vodafone
author wuxuhua [email protected]
Mon, 2 Apr 2018 18:04:56 +0800 (18:04 +0800)
committer wuxuhua [email protected]
Mon, 2 Apr 2018 18:04:56 +0800 (18:04 +0800)
Change-Id: I4ac445287290b5abbe3e813ef7b3cf034abf1e9c
alps/packages/apps/Launcher3/src/com/android/launcher3/model/LoaderTask.java patch | blob | history
alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/applications/ManageApplications.java patch | blob | history
alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/applications/RecentAppsPreferenceController.java patch | blob | history
alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/datausage/UnrestrictedDataAccess.java patch | blob | history
diff --git a/alps/packages/apps/Launcher3/src/com/android/launcher3/model/LoaderTask.java b/alps/packages/apps/Launcher3/src/com/android/launcher3/model/LoaderTask.java
index 4756edc…abbbd95 100644 (file)
— a/alps/packages/apps/Launcher3/src/com/android/launcher3/model/LoaderTask.java
+++ b/alps/packages/apps/Launcher3/src/com/android/launcher3/model/LoaderTask.java
@@ -817,7 +817,11 @@ public class LoaderTask implements Runnable {
for (int i = 0; i < apps.size(); i++) {
LauncherActivityInfo app = apps.get(i);
// This builds the icon bitmaps.
-
mBgAllAppsList.add(new AppInfo(app, user, quietMode), app);
-
//Redmine128288 wuxuhua modified for hide files apk 2018-4-2 begin
-
if (!"com.android.documentsui".equals(app.getComponentName().getPackageName())) {
-
mBgAllAppsList.add(new AppInfo(app, user, quietMode), app);
-
}
-
//Redmine128288 wuxuhua modified for hide files apk 2018-4-2 end } ManagedProfileHeuristic.onAllAppsLoaded(mApp.getContext(), apps, user);
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/applications/ManageApplications.java b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/applications/ManageApplications.java
index deda92a…f8d5332 100644 (file)
— a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/applications/ManageApplications.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/applications/ManageApplications.java
@@ -1208,7 +1208,17 @@ public class ManageApplications extends InstrumentedPreferenceFragment
ArrayList<ApplicationsState.AppEntry> applyPrefixFilter(CharSequence prefix,
ArrayList<ApplicationsState.AppEntry> origEntries) {
if (prefix == null || prefix.length() == 0) {
-
return origEntries;
-
//Redmine128288 wuxuhua modified for hide files apk 2018-4-2 begin
-
ArrayList<ApplicationsState.AppEntry> newEntries = new ArrayList<ApplicationsState.AppEntry>();
-
for (int i = 0; i < origEntries.size(); i++) {
-
ApplicationsState.AppEntry entry = origEntries.get(i);
-
String nlabel = entry.getNormalizedLabel();
-
if (!"com.android.documentsui".equals(entry.info.packageName)) {
-
newEntries.add(entry);
-
}
-
}
-
return newEntries;
-
//Redmine128288 wuxuhua modified for hide files apk 2018-4-2 end } else { String prefixStr = ApplicationsState.normalize(prefix.toString()); final String spacePrefixStr = " " + prefixStr;
@@ -1218,7 +1228,11 @@ public class ManageApplications extends InstrumentedPreferenceFragment
ApplicationsState.AppEntry entry = origEntries.get(i);
String nlabel = entry.getNormalizedLabel();
if (nlabel.startsWith(prefixStr) || nlabel.indexOf(spacePrefixStr) != -1) {
-
newEntries.add(entry);
-
//Redmine128288 wuxuhua modified for hide files apk 2018-4-2 begin
-
if (!"com.android.documentsui".equals(entry.info.packageName)) {
-
newEntries.add(entry);
-
}
-
//Redmine128288 wuxuhua modified for hide files apk 2018-4-2 end } } return newEntries;
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/applications/RecentAppsPreferenceController.java b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/applications/RecentAppsPreferenceController.java
index d0f7584…6dd273a 100644 (file)
— a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/applications/RecentAppsPreferenceController.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -220,6 +220,11 @@ public class RecentAppsPreferenceController extends AbstractPreferenceController
final UsageStats stat = recentApps.get(i);
// Bind recent apps to existing prefs if possible, or create a new pref.
final String pkgName = stat.getPackageName();
-
//Redmine128288 wuxuhua modified for hide files apk 2018-4-2 begin
-
if ("com.android.documentsui".equals(pkgName)) {
-
continue;
-
}
-
//Redmine128288 wuxuhua modified for hide files apk 2018-4-2 end final ApplicationsState.AppEntry appEntry = mApplicationsState.getEntry(pkgName, mUserId); if (appEntry == null) {
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/datausage/UnrestrictedDataAccess.java
index b76cc93…952dea1 100644 (file)
— a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/datausage/UnrestrictedDataAccess.java
@@ -238,6 +238,11 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
@VisibleForTesting
boolean shouldAddPreference(AppEntry app) {
-
//Redmine128288 wuxuhua modified for hide files apk 2018-4-2 begin
-
if ("com.android.documentsui".equals(app.info.packageName)) {
-
return false;
-
}
-
//Redmine128288 wuxuhua modified for hide files apk 2018-4-2 end return app != null && UserHandle.isApp(app.info.uid);
}