diff options
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 3 | ||||
| -rw-r--r-- | cmds/sm/src/com/android/commands/sm/Sm.java | 14 |
2 files changed, 3 insertions, 14 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/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"); |