Skip to content

Commit b7fdb66

Browse files
Remove unused camera plugin
To remove security error for implicit internal intent
1 parent 8c61ca0 commit b7fdb66

File tree

8 files changed

+0
-1427
lines changed

8 files changed

+0
-1427
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,6 @@
147147
android:label="Audio Recorder"
148148
android:launchMode="singleTask"
149149
android:screenOrientation="portrait"/>
150-
<activity
151-
android:name=".ui.activity.CameraActivity_OldAPI"
152-
android:label="Camera Microbit"
153-
android:launchMode="singleTask"
154-
android:screenOrientation="portrait"
155-
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"/>
156150
<activity
157151
android:name=".ui.activity.HelpWebView"
158152
android:configChanges="orientation|screenSize"
@@ -165,13 +159,6 @@
165159
android:label="MakeCode Webview"
166160
android:launchMode="singleTask"
167161
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
168-
169-
<activity
170-
android:name=".ui.activity.CameraActivityPermissionChecker"
171-
android:label="@string/title_activity_camera_activity_permission_checker"
172-
android:screenOrientation="portrait"
173-
android:theme="@style/AppTheme.NoActionBar"/>
174-
175162
<service
176163
android:name=".service.DfuService"
177164
android:enabled="true"/>

app/src/main/java/com/samsung/microbit/data/constants/EventCategories.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,4 @@ private EventCategories() {
9494
* @see EventSubCodes
9595
* @see com.samsung.microbit.utils.Utils#makeMicroBitValue(int, int) Utils.makeBicrobitValue(int, int)
9696
*/
97-
public static final int SAMSUNG_CAMERA_ID = 1002;//0x03EA
9897
}

app/src/main/java/com/samsung/microbit/data/constants/EventSubCodes.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,6 @@ private EventSubCodes() {
2323
public static final int SAMSUNG_REMOTE_CONTROL_EVT_VOLUMEUP = 8;
2424
public static final int SAMSUNG_REMOTE_CONTROL_EVT_VOLUMEDOWN = 9;
2525

26-
/**
27-
* Samsung remote control sub codes. Related to event Category {@link EventCategories#SAMSUNG_CAMERA_ID}
28-
*
29-
* @see com.samsung.microbit.utils.Utils#makeMicroBitValue(int, int) Utils.makeBicrobitValue(int, int)
30-
*/
31-
public static final int SAMSUNG_CAMERA_EVT_LAUNCH_PHOTO_MODE = 1;
32-
public static final int SAMSUNG_CAMERA_EVT_LAUNCH_VIDEO_MODE = 2;
33-
public static final int SAMSUNG_CAMERA_EVT_TAKE_PHOTO = 3;
34-
public static final int SAMSUNG_CAMERA_EVT_START_VIDEO_CAPTURE = 4;
35-
public static final int SAMSUNG_CAMERA_EVT_STOP_VIDEO_CAPTURE = 5;
36-
public static final int SAMSUNG_CAMERA_EVT_STOP_PHOTO_MODE = 6;
37-
public static final int SAMSUNG_CAMERA_EVT_STOP_VIDEO_MODE = 7;
38-
public static final int SAMSUNG_CAMERA_EVT_TOGGLE_FRONT_REAR = 8;
39-
4026
/**
4127
* Samsung remote control sub codes. Related to event Category {@link EventCategories#SAMSUNG_AUDIO_RECORDER_ID}
4228
*

app/src/main/java/com/samsung/microbit/plugin/CameraPlugin.java

Lines changed: 0 additions & 197 deletions
This file was deleted.

app/src/main/java/com/samsung/microbit/plugin/PluginsCreator.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ public AbstractPlugin createPlugin(int eventCategory, Handler serviceHandler) {
5252
abstractPlugin = new AudioRecordPlugin();
5353
break;
5454

55-
case EventCategories.SAMSUNG_CAMERA_ID:
56-
abstractPlugin = new CameraPlugin();
57-
break;
58-
5955
case EventCategories.SAMSUNG_SIGNAL_STRENGTH_ID:
6056
abstractPlugin = new InformationPlugin();
6157
break;

app/src/main/java/com/samsung/microbit/service/BLEService.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -629,8 +629,6 @@ private void register_AppRequirement(BluetoothGattService eventService, boolean
629629
*/
630630
writeCharacteristic(GattServiceUUIDs.EVENT_SERVICE.toString(), CharacteristicUUIDs.ES_CLIENT_REQUIREMENTS.toString(),
631631
EventCategories.SAMSUNG_REMOTE_CONTROL_ID, GattFormats.FORMAT_UINT32);
632-
writeCharacteristic(GattServiceUUIDs.EVENT_SERVICE.toString(), CharacteristicUUIDs.ES_CLIENT_REQUIREMENTS.toString(),
633-
EventCategories.SAMSUNG_CAMERA_ID, GattFormats.FORMAT_UINT32);
634632
writeCharacteristic(GattServiceUUIDs.EVENT_SERVICE.toString(), CharacteristicUUIDs.ES_CLIENT_REQUIREMENTS.toString(),
635633
EventCategories.SAMSUNG_ALERTS_ID, GattFormats.FORMAT_UINT32);
636634
writeCharacteristic(GattServiceUUIDs.EVENT_SERVICE.toString(), CharacteristicUUIDs.ES_CLIENT_REQUIREMENTS.toString(),
@@ -887,7 +885,6 @@ private void sendMessage(int eventSrc, int event) {
887885
case EventCategories.SAMSUNG_REMOTE_CONTROL_ID:
888886
case EventCategories.SAMSUNG_ALERTS_ID:
889887
case EventCategories.SAMSUNG_AUDIO_RECORDER_ID:
890-
case EventCategories.SAMSUNG_CAMERA_ID:
891888
msgService = eventSrc;
892889
cmd = new CmdArg(event, "1000");
893890
break;

0 commit comments

Comments
 (0)