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

Merge "Print the package name and creator UID in dump()."

Browse Source 
am: cf7f9dd6a1

Change-Id: Ifd7812ff0acba03544a05a3fcea7721da8fe7d0f
This commit is contained in:
Jeremy Joslin
2017-02-01 02:50:25 +00:00
committed by android-build-merger
parent 4ed5fe8191 cf7f9dd6a1
commit ba4bc08dae
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wifi/java/android/net/wifi/WifiNetworkScoreCache.java
View File

@@ -19,16 +19,16 @@ package android.net.wifi;
import android.Manifest.permission; import android.Manifest.permission;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.content.Context; import android.content.Context;
import android.os.Handler;
import android.net.INetworkScoreCache; import android.net.INetworkScoreCache;
import android.net.NetworkKey; import android.net.NetworkKey;
import android.net.ScoredNetwork; import android.net.ScoredNetwork;
import android.os.Handler;
import android.os.Process;
import android.util.Log; import android.util.Log;
import com.android.internal.util.Preconditions;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.Preconditions;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
@@ -76,7 +76,7 @@ public class WifiNetworkScoreCache extends INetworkScoreCache.Stub {
public WifiNetworkScoreCache(Context context, @Nullable CacheListener listener) { public WifiNetworkScoreCache(Context context, @Nullable CacheListener listener) {
mContext = context.getApplicationContext(); mContext = context.getApplicationContext();
mListener = listener; mListener = listener;
mNetworkCache = new HashMap<String, ScoredNetwork>(); mNetworkCache = new HashMap<>();
} }
@Override public final void updateScores(List<ScoredNetwork> networks) { @Override public final void updateScores(List<ScoredNetwork> networks) {
@@ -210,7 +210,9 @@ public class WifiNetworkScoreCache extends INetworkScoreCache.Stub {
@Override protected final void dump(FileDescriptor fd, PrintWriter writer, String[] args) { @Override protected final void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
mContext.enforceCallingOrSelfPermission(permission.DUMP, TAG); mContext.enforceCallingOrSelfPermission(permission.DUMP, TAG);
writer.println("WifiNetworkScoreCache"); String header = String.format("WifiNetworkScoreCache (%s/%d)",
mContext.getPackageName(), Process.myUid());
writer.println(header);
writer.println(" All score curves:"); writer.println(" All score curves:");
for (Map.Entry<String, ScoredNetwork> entry : mNetworkCache.entrySet()) { for (Map.Entry<String, ScoredNetwork> entry : mNetworkCache.entrySet()) {
ScoredNetwork scoredNetwork = entry.getValue(); ScoredNetwork scoredNetwork = entry.getValue();