Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reduce visibility on PackageDexUsage methods."

Browse Source
This commit is contained in:
Treehugger Robot
2018-09-25 11:55:51 +00:00
committed by Gerrit Code Review
parent 08b2412696 58aea515af
commit d7fe73d3b3
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/pm/dex/PackageDexUsage.java
View File

@@ -93,7 +93,7 @@ public class PackageDexUsage extends AbstractStatsBase<Void> {
@GuardedBy("mPackageUseInfoMap") @GuardedBy("mPackageUseInfoMap")
private final Map<String, PackageUseInfo> mPackageUseInfoMap; private final Map<String, PackageUseInfo> mPackageUseInfoMap;
public PackageDexUsage() { /* package */ PackageDexUsage() {
super("package-dex-usage.list", "PackageDexUsage_DiskWriter", /*lock*/ false); super("package-dex-usage.list", "PackageDexUsage_DiskWriter", /*lock*/ false);
mPackageUseInfoMap = new HashMap<>(); mPackageUseInfoMap = new HashMap<>();
} }
@@ -116,7 +116,7 @@ public class PackageDexUsage extends AbstractStatsBase<Void> {
* @return true if the dex load constitutes new information, or false if this information * @return true if the dex load constitutes new information, or false if this information
* has been seen before. * has been seen before.
*/ */
public boolean record(String owningPackageName, String dexPath, int ownerUserId, /* package */ boolean record(String owningPackageName, String dexPath, int ownerUserId,
String loaderIsa, boolean isUsedByOtherApps, boolean primaryOrSplit, String loaderIsa, boolean isUsedByOtherApps, boolean primaryOrSplit,
String loadingPackageName, String classLoaderContext) { String loadingPackageName, String classLoaderContext) {
if (!PackageManagerServiceUtils.checkISA(loaderIsa)) { if (!PackageManagerServiceUtils.checkISA(loaderIsa)) {
@@ -193,7 +193,7 @@ public class PackageDexUsage extends AbstractStatsBase<Void> {
* Convenience method for sync reads which does not force the user to pass a useless * Convenience method for sync reads which does not force the user to pass a useless
* (Void) null. * (Void) null.
*/ */
public void read() { /* package */ void read() {
read((Void) null); read((Void) null);
} }
@@ -558,7 +558,7 @@ public class PackageDexUsage extends AbstractStatsBase<Void> {
* Remove the usage data associated with package {@code packageName}. * Remove the usage data associated with package {@code packageName}.
* @return true if the package usage was found and removed successfully. * @return true if the package usage was found and removed successfully.
*/ */
public boolean removePackage(String packageName) { /* package */ boolean removePackage(String packageName) {
synchronized (mPackageUseInfoMap) { synchronized (mPackageUseInfoMap) {
return mPackageUseInfoMap.remove(packageName) != null; return mPackageUseInfoMap.remove(packageName) != null;
} }
@@ -653,11 +653,12 @@ public class PackageDexUsage extends AbstractStatsBase<Void> {
return packages; return packages;
} }
public void clear() { /* package */ void clear() {
synchronized (mPackageUseInfoMap) { synchronized (mPackageUseInfoMap) {
mPackageUseInfoMap.clear(); mPackageUseInfoMap.clear();
} }
} }
// Creates a deep copy of the class' mPackageUseInfoMap. // Creates a deep copy of the class' mPackageUseInfoMap.
private Map<String, PackageUseInfo> clonePackageUseInfoMap() { private Map<String, PackageUseInfo> clonePackageUseInfoMap() {
Map<String, PackageUseInfo> clone = new HashMap<>(); Map<String, PackageUseInfo> clone = new HashMap<>();
@@ -679,7 +680,7 @@ public class PackageDexUsage extends AbstractStatsBase<Void> {
throw new IllegalArgumentException("Unknown bool encoding: " + bool); throw new IllegalArgumentException("Unknown bool encoding: " + bool);
} }
public String dump() { /* package */ String dump() {
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
write(sw); write(sw);
return sw.toString(); return sw.toString();