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

Make locksettings commands go through "cmd lock_settings"

Browse Source 
This greatly improves the performance of locksettings commands, and it
eliminates the need for LockSettingsCmd.java.

Bug: 177985929
Test: locksettings command still works
Change-Id: I5881fa074681f6bf1ad2f5969a282d928121ddb2
Merged-In: I5881fa074681f6bf1ad2f5969a282d928121ddb2
(cherry picked from commit 4d38b0cdc4)
This commit is contained in:
Eric Biggers
2023-02-18 03:23:14 +00:00
parent 15258a4d76
commit 7d4a9fd502
3 changed files with 3 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/locksettings/Android.bp
View File

@@ -21,8 +21,7 @@ package {
default_applicable_licenses: ["frameworks_base_license"], default_applicable_licenses: ["frameworks_base_license"],
} }
java_binary { sh_binary {
name: "locksettings", name: "locksettings",
wrapper: "locksettings.sh", src: "locksettings.sh",
srcs: ["**/*.java"],
} }

6
cmds/locksettings/locksettings.sh
View File

@@ -1,6 +1,2 @@
#!/system/bin/sh #!/system/bin/sh
# Script to start "locksettings" on the device cmd lock_settings "$@"
#
base=/system
export CLASSPATH=$base/framework/locksettings.jar
exec app_process $base/bin com.android.commands.locksettings.LockSettingsCmd "$@"

47
cmds/locksettings/src/com/android/commands/locksettings/LockSettingsCmd.java
View File

@@ -1,47 +0,0 @@
/*
* Copyright (C) 2016 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.commands.locksettings;
import android.os.ResultReceiver;
import android.os.ServiceManager;
import android.os.ShellCallback;
import com.android.internal.os.BaseCommand;
import com.android.internal.widget.ILockSettings;
import java.io.FileDescriptor;
import java.io.PrintStream;
public final class LockSettingsCmd extends BaseCommand {
public static void main(String[] args) {
(new LockSettingsCmd()).run(args);
}
@Override
public void onShowUsage(PrintStream out) {
main(new String[] { "help" });
}
@Override
public void onRun() throws Exception {
ILockSettings lockSettings = ILockSettings.Stub.asInterface(
ServiceManager.getService("lock_settings"));
lockSettings.asBinder().shellCommand(FileDescriptor.in, FileDescriptor.out,
FileDescriptor.err, getRawArgs(), new ShellCallback(), new ResultReceiver(null) {});
}
}