[MultiDisplay] Inline fixed and duplicate variables
Test: build succeed and emulator adds and deletes additional display
successfully.
Merged-In: I5d2852709320ee59df75b67fe5c88eedef8094f4
Signed-off-by: utzcoz <utzcoz@gmail.com>
Change-Id: Ie3aead9270fb875649a3d416dc7daa82513c9356
Bug: 154346346
diff --git a/MultiDisplayProvider/src/com/android/emulator/multidisplay/MultiDisplayService.java b/MultiDisplayProvider/src/com/android/emulator/multidisplay/MultiDisplayService.java
index 923b94b..67c73d0 100644
--- a/MultiDisplayProvider/src/com/android/emulator/multidisplay/MultiDisplayService.java
+++ b/MultiDisplayProvider/src/com/android/emulator/multidisplay/MultiDisplayService.java
@@ -22,13 +22,10 @@
import android.os.Handler;
import android.os.IBinder;
import android.util.Log;
-import android.view.Display;
-import android.graphics.PixelFormat;
import android.hardware.display.DisplayManager;
import android.hardware.display.VirtualDisplay;
import android.view.Surface;
import android.os.Messenger;
-import android.os.Message;
public class MultiDisplayService extends Service {
@@ -128,53 +125,50 @@
}
private void deleteVirtualDisplay(int displayId) {
- int i = displayId;
- if (mMultiDisplay[i].enabled == false) {
+ if (!mMultiDisplay[displayId].enabled) {
return;
}
- if (mMultiDisplay[i].virtualDisplay != null) {
- mMultiDisplay[i].virtualDisplay.release();
+ if (mMultiDisplay[displayId].virtualDisplay != null) {
+ mMultiDisplay[displayId].virtualDisplay.release();
}
- if (mMultiDisplay[i].surface != null) {
- mMultiDisplay[i].surface.release();
+ if (mMultiDisplay[displayId].surface != null) {
+ mMultiDisplay[displayId].surface.release();
}
- mMultiDisplay[i].clear();
- nativeReleaseListener(i);
+ mMultiDisplay[displayId].clear();
+ nativeReleaseListener(displayId);
}
private void createVirtualDisplay(int displayId, int w, int h, int dpi, int flag) {
- int i = displayId;
- mMultiDisplay[i].surface = nativeCreateSurface(i, w, h);
- mMultiDisplay[i].virtualDisplay = mDisplayManager.createVirtualDisplay(
+ mMultiDisplay[displayId].surface = nativeCreateSurface(displayId, w, h);
+ mMultiDisplay[displayId].virtualDisplay = mDisplayManager.createVirtualDisplay(
null /* projection */,
DISPLAY_NAME, w, h, dpi,
- mMultiDisplay[i].surface, flag,
+ mMultiDisplay[displayId].surface, flag,
null /* callback */,
null /* handler */,
- UNIQUE_DISPLAY_ID[i]);
- mMultiDisplay[i].set(w, h, dpi, flag);
+ UNIQUE_DISPLAY_ID[displayId]);
+ mMultiDisplay[displayId].set(w, h, dpi, flag);
}
private void addVirtualDisplay(int displayId, int w, int h, int dpi, int flag) {
- int i = displayId;
- if (mMultiDisplay[i].match(w, h, dpi, flag)) {
+ if (mMultiDisplay[displayId].match(w, h, dpi, flag)) {
return;
}
- if (mMultiDisplay[i].virtualDisplay == null) {
- createVirtualDisplay(i, w, h, dpi, flag);
+ if (mMultiDisplay[displayId].virtualDisplay == null) {
+ createVirtualDisplay(displayId, w, h, dpi, flag);
return;
}
- if (mMultiDisplay[i].flag != flag) {
- deleteVirtualDisplay(i);
- createVirtualDisplay(i, w, h, dpi, flag);
+ if (mMultiDisplay[displayId].flag != flag) {
+ deleteVirtualDisplay(displayId);
+ createVirtualDisplay(displayId, w, h, dpi, flag);
return;
}
- if (mMultiDisplay[i].width != w || mMultiDisplay[i].height != h) {
- nativeResizeListener(i, w, h);
+ if (mMultiDisplay[displayId].width != w || mMultiDisplay[displayId].height != h) {
+ nativeResizeListener(displayId, w, h);
}
// only dpi changes
- mMultiDisplay[i].virtualDisplay.resize(w, h, dpi);
- mMultiDisplay[i].set(w, h, dpi, flag);
+ mMultiDisplay[displayId].virtualDisplay.resize(w, h, dpi);
+ mMultiDisplay[displayId].set(w, h, dpi, flag);
}
@Override
diff --git a/MultiDisplayProvider/src/com/android/emulator/multidisplay/MultiDisplayServiceReceiver.java b/MultiDisplayProvider/src/com/android/emulator/multidisplay/MultiDisplayServiceReceiver.java
index c84c43a..c29a29c 100644
--- a/MultiDisplayProvider/src/com/android/emulator/multidisplay/MultiDisplayServiceReceiver.java
+++ b/MultiDisplayProvider/src/com/android/emulator/multidisplay/MultiDisplayServiceReceiver.java
@@ -28,16 +28,16 @@
@Override
public void onReceive(Context context, Intent intent) {
- if (isMyServiceRunning(MultiDisplayService.class, context) == false) {
+ if (!isMyServiceRunning(context)) {
Log.v(TAG, "startService");
context.startService(new Intent(context, MultiDisplayService.class));
}
}
- private boolean isMyServiceRunning(Class<?> serviceClass, Context context) {
+ private boolean isMyServiceRunning(Context context) {
ActivityManager manager = (ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE);
for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
- if (serviceClass.getName().equals(service.service.getClassName())) {
+ if (MultiDisplayService.class.getName().equals(service.service.getClassName())) {
return true;
}
}
