Skip to content

Commit 568aa28

Browse files
Comprehensive cleanup of imports and includes across NDK samples
* Optimized C++ includes and modernized headers across multiple modules (camera, gles, teapots, vectorization). * Cleaned up unused and redundant Java/Kotlin imports in all sample applications. * Standardized header guards and include patterns for better compilation performance and consistency. * Removed deprecated annotations and unused resource references.
1 parent 71981dd commit 568aa28

62 files changed

Lines changed: 96 additions & 204 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

base/src/main/cpp/logging_splitters.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
#pragma once
1818

19-
#include <inttypes.h>
20-
#include <time.h>
19+
#include <cinttypes>
20+
#include <ctime>
2121

2222
#include <format>
2323

bitmap-plasma/app/src/main/cpp/plasma.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
#include <android/bitmap.h>
1818
#include <android/log.h>
1919
#include <jni.h>
20-
#include <math.h>
21-
#include <stdio.h>
22-
#include <stdlib.h>
23-
#include <time.h>
20+
#include <cmath>
21+
#include <cstdio>
22+
#include <cstdlib>
23+
#include <ctime>
2424

2525
#define LOG_TAG "libplasma"
2626
#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)

bitmap-plasma/app/src/main/java/com/example/plasma/Plasma.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717

1818
import android.annotation.SuppressLint;
1919
import android.app.Activity;
20-
import android.graphics.Point;
21-
import android.os.Bundle;
2220
import android.content.Context;
23-
import android.view.View;
2421
import android.graphics.Bitmap;
2522
import android.graphics.Canvas;
23+
import android.graphics.Point;
24+
import android.os.Bundle;
2625
import android.view.Display;
27-
import android.view.WindowManager;
26+
import android.view.View;
2827

2928
public class Plasma extends Activity
3029
{

camera/basic/src/main/cpp/camera_engine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class CameraEngine {
6363
int GetDisplayRotation(void);
6464

6565
struct android_app* app_;
66-
ImageFormat savedNativeWinRes_;
66+
ImageFormat savedNativeWinRes_{};
6767
bool cameraGranted_;
6868
int rotation_;
6969
volatile bool cameraReady_;

camera/basic/src/main/cpp/camera_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static const int64_t kMaxExposureTime = 250000000;
3535

3636
NDKCamera::NDKCamera()
3737
: cameraMgr_(nullptr),
38-
activeCameraId_(""),
38+
activeCameraId_(),
3939
cameraFacing_(ACAMERA_LENS_FACING_BACK),
4040
cameraOrientation_(0),
4141
outputContainer_(nullptr),

camera/basic/src/main/cpp/camera_manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class NDKCamera {
7777
std::vector<CaptureRequestInfo> requests_;
7878

7979
ACaptureSessionOutputContainer* outputContainer_;
80-
ACameraCaptureSession* captureSession_;
80+
ACameraCaptureSession* captureSession_{};
8181
CaptureSessionState captureSessionState_;
8282

8383
// set up exposure control

camera/texture-view/src/main/cpp/camera_engine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ class CameraAppEngine {
4848
int32_t requestHeight_;
4949
jobject surface_;
5050
NDKCamera* camera_;
51-
ImageFormat compatibleCameraRes_;
51+
ImageFormat compatibleCameraRes_{};
5252
};
5353
#endif // __CAMERA_ENGINE_H__

camera/texture-view/src/main/cpp/camera_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static const uint64_t kMaxExposureTime = static_cast<uint64_t>(250000000);
3737

3838
NDKCamera::NDKCamera()
3939
: cameraMgr_(nullptr),
40-
activeCameraId_(""),
40+
activeCameraId_(),
4141
cameraFacing_(ACAMERA_LENS_FACING_BACK),
4242
cameraOrientation_(0),
4343
outputContainer_(nullptr),

camera/texture-view/src/main/cpp/camera_manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class NDKCamera {
8787
std::vector<CaptureRequestInfo> requests_;
8888

8989
ACaptureSessionOutputContainer* outputContainer_;
90-
ACameraCaptureSession* captureSession_;
90+
ACameraCaptureSession* captureSession_{};
9191
CaptureSessionState captureSessionState_;
9292

9393
// set up exposure control

exceptions/app/src/main/java/com/example/exceptions/MainActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.example.exceptions
22

33
import androidx.appcompat.app.AppCompatActivity
44
import android.os.Bundle
5-
import android.widget.TextView
65
import com.example.exceptions.databinding.ActivityMainBinding
76

87
class MainActivity : AppCompatActivity() {

0 commit comments

Comments
 (0)