streamlined some code.

tpkarras · Sep 17, 2023 · 7fb0623 · 7fb0623
1 parent 6a8be27
commit 7fb0623
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 19 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdk 30
         targetSdk 31
         versionCode 1
-        versionName "1.0.4.2-1"
+        versionName "1.0.4.2-2"
         signingConfig signingConfigs.debug
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/tpkarras/mirror2rearultra/DisplayActivity.java b/app/src/main/java/com/tpkarras/mirror2rearultra/DisplayActivity.java
@@ -48,7 +48,12 @@ public void onActivityResult(ActivityResult result) {
                        mediaProjection = mediaProjectionManager.getMediaProjection(result.getResultCode(), result.getData());
                        displayManager = (DisplayManager) getSystemService(DISPLAY_SERVICE);
                        Display[] displays = displayManager.getDisplays();
-                       rearDisplayId.set(displays[1].getDisplayId());
+                       for (Display display : displays) {
+                          if(display.getName().equals("Built-in Screen") && display.getDisplayId() != 0) {
+                             rearDisplayId.set(display.getDisplayId());
+                             break;
+                          }
+                       }
                        rearDisplay = createDisplayContext(displayManager.getDisplay(rearDisplayId.get()));
                        activityOptions = activityOptions.makeBasic();
                        activityOptions.setLaunchDisplayId(rearDisplayId.get());

diff --git a/app/src/main/java/com/tpkarras/mirror2rearultra/Mirror.java b/app/src/main/java/com/tpkarras/mirror2rearultra/Mirror.java
@@ -23,7 +23,6 @@
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.provider.Settings;
-import android.util.Log;
 import android.view.IWindowManager;
 import android.view.OrientationEventListener;
 import android.view.Surface;
@@ -61,17 +60,9 @@ public static void rearScreenSwitch(boolean z){
             parcel.writeInt(1);
             parcel.writeString("CAMERA_CALL");
         } else {
-            if(subscreenSwitch == 1) {
                 code = 16777211;
                 parcel.writeLong(SystemClock.uptimeMillis());
                 parcel.writeString("CAMERA_CALL");
-            } else {
-                code = 16777208;
-                if (sBinder != null) {
-                    parcel.writeStrongBinder(sBinder);
-                }
-                parcel.writeInt(1);
-            }
         }
         try {
             Method serviceMethod = Class.forName("android.os.ServiceManager").getMethod("getService", String.class);
@@ -93,8 +84,6 @@ protected void onCreate(Bundle savedInstanceState){
             serviceMethod = Class.forName("android.os.ServiceManager").getMethod("getService", String.class);
             windowBinder = (IBinder) serviceMethod.invoke(null, "window");
             wm = IWindowManager.Stub.asInterface(windowBinder);
-            Log.d("wm", wm.toString());
-            Log.d("wm", String.valueOf(wm.getDefaultDisplayRotation()));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         } catch (ClassNotFoundException e) {
@@ -103,8 +92,6 @@ protected void onCreate(Bundle savedInstanceState){
             e.printStackTrace();
         } catch (IllegalAccessException e) {
             e.printStackTrace();
-        } catch (RemoteException e) {
-            e.printStackTrace();
         }
         orientationEventListener = new OrientationEventListener(getApplicationContext(), SensorManager.SENSOR_DELAY_NORMAL) {
             @Override