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

Merge "Adds adas setting in dumpsys." into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-22 03:24:08 +00:00
committed by Android (Google) Code Review
parent 1fd66a1e68 ec2c6adf08
commit 9d4aeecf92
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/location/LocationManagerService.java
View File

@@ -1428,6 +1428,7 @@ public class LocationManagerService extends ILocationManager.Stub implements
ipw.println("Location Settings:"); ipw.println("Location Settings:");
ipw.increaseIndent(); ipw.increaseIndent();
mInjector.getSettingsHelper().dump(fd, ipw, args); mInjector.getSettingsHelper().dump(fd, ipw, args);
mInjector.getLocationSettings().dump(fd, ipw, args);
ipw.decreaseIndent(); ipw.decreaseIndent();
synchronized (mLock) { synchronized (mLock) {

31
services/core/java/com/android/server/location/settings/LocationSettings.java
View File

@@ -18,8 +18,11 @@ package com.android.server.location.settings;
import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE; import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE;
import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.os.Environment; import android.os.Environment;
import android.os.RemoteException;
import android.util.IndentingPrintWriter;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
@@ -29,6 +32,7 @@ import com.android.server.FgThread;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataOutput; import java.io.DataOutput;
import java.io.File; import java.io.File;
import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Function; import java.util.function.Function;
@@ -104,6 +108,33 @@ public class LocationSettings {
getUserSettingsStore(userId).update(updater); getUserSettingsStore(userId).update(updater);
} }
/** Dumps info for debugging. */
public final void dump(FileDescriptor fd, IndentingPrintWriter ipw, String[] args) {
int[] userIds;
try {
userIds = ActivityManager.getService().getRunningUserIds();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
if (mContext.getPackageManager().hasSystemFeature(FEATURE_AUTOMOTIVE)) {
ipw.print("ADAS Location Setting: ");
ipw.increaseIndent();
if (userIds.length > 1) {
ipw.println();
for (int userId : userIds) {
ipw.print("[u");
ipw.print(userId);
ipw.print("] ");
ipw.println(getUserSettings(userId).isAdasGnssLocationEnabled());
}
} else {
ipw.println(getUserSettings(userIds[0]).isAdasGnssLocationEnabled());
}
ipw.decreaseIndent();
}
}
@VisibleForTesting @VisibleForTesting
final void flushFiles() throws InterruptedException { final void flushFiles() throws InterruptedException {
synchronized (mUserSettings) { synchronized (mUserSettings) {