Messaging: Fix C-style array declarations
Change-Id: Ie7381dc5280ab4d907000ef551df9ea80553ddb4
This commit is contained in:
@@ -91,7 +91,7 @@ public class PermissionCheckActivity extends Activity {
|
||||
|
||||
@Override
|
||||
public void onRequestPermissionsResult(final int requestCode,
|
||||
@NonNull final String permissions[],
|
||||
@NonNull final String[] permissions,
|
||||
@NonNull final int[] grantResults) {
|
||||
if (requestCode == REQUIRED_PERMISSIONS_REQUEST_CODE) {
|
||||
// We do not use grantResults as some of the granted permissions might have been
|
||||
|
||||
@@ -762,7 +762,7 @@ public class ConversationFragment extends Fragment implements ConversationDataLi
|
||||
final View targetView = getActivity().findViewById(R.id.action_call);
|
||||
Point centerPoint;
|
||||
if (targetView != null) {
|
||||
final int screenLocation[] = new int[2];
|
||||
final int[] screenLocation = new int[2];
|
||||
targetView.getLocationOnScreen(screenLocation);
|
||||
final int centerX = screenLocation[0] + targetView.getWidth() / 2;
|
||||
final int centerY = screenLocation[1] + targetView.getHeight() / 2;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (C) 2015 The Android Open Source Project
|
||||
* Copyright (C) 2024 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -120,7 +121,7 @@ class AudioMediaChooser extends MediaChooser implements
|
||||
|
||||
@Override
|
||||
protected void onRequestPermissionsResult(
|
||||
final int requestCode, final String permissions[], final int[] grantResults) {
|
||||
final int requestCode, final String[] permissions, final int[] grantResults) {
|
||||
if (requestCode == MediaPicker.RECORD_AUDIO_PERMISSION_REQUEST_CODE) {
|
||||
final boolean permissionGranted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
|
||||
// onRequestPermissionsResult can sometimes get called before createView().
|
||||
|
||||
@@ -257,7 +257,7 @@ class CameraMediaChooser extends MediaChooser implements
|
||||
|
||||
@Override
|
||||
protected void onRequestPermissionsResult(
|
||||
final int requestCode, final String permissions[], final int[] grantResults) {
|
||||
final int requestCode, final String[] permissions, final int[] grantResults) {
|
||||
if (requestCode == MediaPicker.CAMERA_PERMISSION_REQUEST_CODE) {
|
||||
final boolean permissionGranted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
|
||||
updateForPermissionState(permissionGranted);
|
||||
|
||||
@@ -97,7 +97,7 @@ class ContactMediaChooser extends MediaChooser {
|
||||
|
||||
@Override
|
||||
protected void onRequestPermissionsResult(
|
||||
final int requestCode, final String permissions[], final int[] grantResults) {
|
||||
final int requestCode, final String[] permissions, final int[] grantResults) {
|
||||
if (requestCode == MediaPicker.READ_CONTACT_PERMISSION_REQUEST_CODE) {
|
||||
final boolean permissionGranted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
|
||||
mEnabledView.setVisibility(permissionGranted ? View.VISIBLE : View.GONE);
|
||||
|
||||
@@ -224,7 +224,7 @@ class GalleryMediaChooser extends MediaChooser implements
|
||||
|
||||
@Override
|
||||
protected void onRequestPermissionsResult(
|
||||
final int requestCode, final String permissions[], final int[] grantResults) {
|
||||
final int requestCode, final String[] permissions, final int[] grantResults) {
|
||||
if (requestCode == MediaPicker.GALLERY_PERMISSION_REQUEST_CODE) {
|
||||
final boolean permissionGranted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
|
||||
if (permissionGranted) {
|
||||
|
||||
@@ -209,5 +209,5 @@ abstract class MediaChooser extends BasePagerViewHolder
|
||||
public void onPause() { }
|
||||
public void onResume() { }
|
||||
protected void onRequestPermissionsResult(
|
||||
final int requestCode, final String permissions[], final int[] grantResults) { }
|
||||
final int requestCode, final String[] permissions, final int[] grantResults) { }
|
||||
}
|
||||
|
||||
@@ -674,7 +674,7 @@ public class MediaPicker extends Fragment implements DraftMessageSubscriptionDat
|
||||
|
||||
@Override
|
||||
public void onRequestPermissionsResult(final int requestCode,
|
||||
@NonNull final String permissions[],
|
||||
@NonNull final String[] permissions,
|
||||
@NonNull final int[] grantResults) {
|
||||
if (mSelectedChooser != null) {
|
||||
mSelectedChooser.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||
|
||||
Reference in New Issue
Block a user