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

Merge "Remove old code that isn't relevant anymore." am: 22e3e74e4b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354663

Change-Id: I2f2bf48cb9cc5264d62a9cd78dc28e0f392ad1fb
This commit is contained in:
Nicolas Geoffray
2020-07-07 08:48:35 +00:00
committed by Automerger Merge Worker
parent 93d64c8a1b 22e3e74e4b
commit 0642fc19f3
2 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
View File

@@ -49,11 +49,8 @@ import com.android.internal.util.DumpUtils;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.server.EventLogTags; import com.android.server.EventLogTags;
import com.android.server.SystemService; import com.android.server.SystemService;
import com.android.server.pm.InstructionSets;
import com.android.server.pm.PackageManagerService; import com.android.server.pm.PackageManagerService;
import dalvik.system.VMRuntime;
import java.io.File; import java.io.File;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
@@ -214,7 +211,7 @@ public class DeviceStorageMonitorService extends SystemService {
newLevel = State.LEVEL_FULL; newLevel = State.LEVEL_FULL;
} else if (usableBytes <= lowBytes) { } else if (usableBytes <= lowBytes) {
newLevel = State.LEVEL_LOW; newLevel = State.LEVEL_LOW;
} else if (StorageManager.UUID_DEFAULT.equals(uuid) && !isBootImageOnDisk() } else if (StorageManager.UUID_DEFAULT.equals(uuid)
&& usableBytes < BOOT_IMAGE_STORAGE_REQUIREMENT) { && usableBytes < BOOT_IMAGE_STORAGE_REQUIREMENT) {
newLevel = State.LEVEL_LOW; newLevel = State.LEVEL_LOW;
} else { } else {
@@ -261,15 +258,6 @@ public class DeviceStorageMonitorService extends SystemService {
}; };
} }
private static boolean isBootImageOnDisk() {
for (String instructionSet : InstructionSets.getAllDexCodeInstructionSets()) {
if (!VMRuntime.isBootClassPathOnDisk(instructionSet)) {
return false;
}
}
return true;
}
@Override @Override
public void onStart() { public void onStart() {
final Context context = getContext(); final Context context = getContext();
@@ -467,15 +455,8 @@ public class DeviceStorageMonitorService extends SystemService {
final CharSequence title = context.getText( final CharSequence title = context.getText(
com.android.internal.R.string.low_internal_storage_view_title); com.android.internal.R.string.low_internal_storage_view_title);
final CharSequence details; final CharSequence details = context.getText(
if (StorageManager.UUID_DEFAULT.equals(uuid)) {
details = context.getText(isBootImageOnDisk()
? com.android.internal.R.string.low_internal_storage_view_text
: com.android.internal.R.string.low_internal_storage_view_text_no_boot);
} else {
details = context.getText(
com.android.internal.R.string.low_internal_storage_view_text); com.android.internal.R.string.low_internal_storage_view_text);
}
PendingIntent intent = PendingIntent.getActivityAsUser(context, 0, lowMemIntent, 0, PendingIntent intent = PendingIntent.getActivityAsUser(context, 0, lowMemIntent, 0,
null, UserHandle.CURRENT); null, UserHandle.CURRENT);

6
services/java/com/android/server/SystemServer.java
View File

@@ -555,12 +555,6 @@ public final class SystemServer {
} }
} }
// Diagnostic to ensure that the system is in a base healthy state. Done here as a common
// non-zygote process.
if (!VMRuntime.hasBootImageSpaces()) {
Slog.wtf(TAG, "Runtime is not running with a boot image!");
}
// Loop forever. // Loop forever.
Looper.loop(); Looper.loop();
throw new RuntimeException("Main thread loop unexpectedly exited"); throw new RuntimeException("Main thread loop unexpectedly exited");