diff options
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 3 | ||||
| -rw-r--r-- | cmds/incidentd/src/IncidentService.cpp | 10 | ||||
| -rw-r--r-- | cmds/sm/src/com/android/commands/sm/Sm.java | 14 |
3 files changed, 11 insertions, 16 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 50c8e933d25f..33739f39aaa4 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -510,7 +510,8 @@ status_t BootAnimation::readyToRun() { resolution = limitSurfaceSize(resolution.width, resolution.height); // create the native surface sp<SurfaceControl> control = session()->createSurface(String8("BootAnimation"), - resolution.getWidth(), resolution.getHeight(), PIXEL_FORMAT_RGB_565); + resolution.getWidth(), resolution.getHeight(), PIXEL_FORMAT_RGB_565, + ISurfaceComposerClient::eOpaque); SurfaceComposerClient::Transaction t; diff --git a/cmds/incidentd/src/IncidentService.cpp b/cmds/incidentd/src/IncidentService.cpp index fbb99d2aea89..836801deaa08 100644 --- a/cmds/incidentd/src/IncidentService.cpp +++ b/cmds/incidentd/src/IncidentService.cpp @@ -47,10 +47,16 @@ enum { #define DEFAULT_REFACTORY_PERIOD_MS (24 * 60 * 60 * 1000) // 1 Day // Skip these sections (for dumpstate only) -// Skip logs (1100 - 1108) and traces (1200 - 1202) because they are already in the bug report. +// Skip logs (1100 - 1108), traces (1200 - 1202), dumpsys (3000 - 3024, 3027 - 3056, 4000 - 4001) +// because they are already in the bug report. #define SKIPPED_DUMPSTATE_SECTIONS { \ 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, /* Logs */ \ - 1200, 1201, 1202, /* Native, hal, java traces */ } + 1200, 1201, 1202, /* Native, hal, java traces */ \ + 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, \ + 3014, 3015, 3016, 3017, 3018, 3019, 3020, 3021, 3022, 3023, 3024, 3027, 3028, 3029, \ + 3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, 3042, 3043, \ + 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, 3056, 4000, \ + 4001, /* Dumpsys */ } namespace android { namespace os { diff --git a/cmds/sm/src/com/android/commands/sm/Sm.java b/cmds/sm/src/com/android/commands/sm/Sm.java index b384e702ac4e..07c407933dc5 100644 --- a/cmds/sm/src/com/android/commands/sm/Sm.java +++ b/cmds/sm/src/com/android/commands/sm/Sm.java @@ -94,8 +94,6 @@ public final class Sm { runBenchmark(); } else if ("forget".equals(op)) { runForget(); - } else if ("set-emulate-fbe".equals(op)) { - runSetEmulateFbe(); } else if ("get-fbe-mode".equals(op)) { runGetFbeMode(); } else if ("idle-maint".equals(op)) { @@ -191,17 +189,9 @@ public final class Sm { } } - public void runSetEmulateFbe() throws RemoteException { - final boolean emulateFbe = Boolean.parseBoolean(nextArg()); - mSm.setDebugFlags(emulateFbe ? StorageManager.DEBUG_EMULATE_FBE : 0, - StorageManager.DEBUG_EMULATE_FBE); - } - public void runGetFbeMode() { - if (StorageManager.isFileEncryptedNativeOnly()) { + if (StorageManager.isFileEncrypted()) { System.out.println("native"); - } else if (StorageManager.isFileEncryptedEmulatedOnly()) { - System.out.println("emulated"); } else { System.out.println("none"); } @@ -358,8 +348,6 @@ public final class Sm { System.err.println(""); System.err.println(" sm forget [UUID|all]"); System.err.println(""); - System.err.println(" sm set-emulate-fbe [true|false]"); - System.err.println(""); System.err.println(" sm start-checkpoint <num-retries>"); System.err.println(""); System.err.println(" sm supports-checkpoint"); |