diff options
3 files changed, 8 insertions, 10 deletions
diff --git a/core/java/com/android/internal/os/SomeArgs.java b/core/java/com/android/internal/os/SomeArgs.java index d1b483b53efc..b12df6ed36ca 100644 --- a/core/java/com/android/internal/os/SomeArgs.java +++ b/core/java/com/android/internal/os/SomeArgs.java @@ -53,7 +53,6 @@ public final class SomeArgs { public Object arg5; public Object arg6; public Object arg7; - public Object arg8; public int argi1; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int argi2; @@ -122,7 +121,6 @@ public final class SomeArgs { arg5 = null; arg6 = null; arg7 = null; - arg8 = null; argi1 = 0; argi2 = 0; argi3 = 0; diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index f4b446b50c9e..5472d6b6c67f 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -566,8 +566,8 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, args.arg5 = requireConfirmation; args.argi1 = userId; args.arg6 = opPackageName; - args.arg7 = operationId; - args.arg8 = requestId; + args.argl1 = operationId; + args.argl2 = requestId; args.argi2 = multiSensorConfig; boolean skipAnimation = false; @@ -725,8 +725,8 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, final boolean requireConfirmation = (boolean) args.arg5; final int userId = args.argi1; final String opPackageName = (String) args.arg6; - final long operationId = (long) args.arg7; - final long requestId = (long) args.arg8; + final long operationId = args.argl1; + final long requestId = args.argl2; final @BiometricMultiSensorMode int multiSensorConfig = args.argi2; // Create a new dialog but do not replace the current one yet. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index c25bc84faedc..e189b262a8cf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -877,8 +877,8 @@ public class CommandQueue extends IStatusBar.Stub implements args.arg5 = requireConfirmation; args.argi1 = userId; args.arg6 = opPackageName; - args.arg7 = operationId; - args.arg8 = requestId; + args.argl1 = operationId; + args.argl2 = requestId; args.argi2 = multiSensorConfig; mHandler.obtainMessage(MSG_BIOMETRIC_SHOW, args) .sendToTarget(); @@ -1359,9 +1359,9 @@ public class CommandQueue extends IStatusBar.Stub implements (boolean) someArgs.arg4 /* credentialAllowed */, (boolean) someArgs.arg5 /* requireConfirmation */, someArgs.argi1 /* userId */, - (long) someArgs.arg7 /* operationId */, + someArgs.argl1 /* operationId */, (String) someArgs.arg6 /* opPackageName */, - (long) someArgs.arg8 /* requestId */, + someArgs.argl2 /* requestId */, someArgs.argi2 /* multiSensorConfig */); } someArgs.recycle(); |