Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

sgt7 · Nov 11, 2013 · c4a37bb · c4a37bb
2 parents 356e10b + 9231058
commit c4a37bb
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 0 deletions.
diff --git a/core/jni/android/graphics/BitmapRegionDecoder.cpp b/core/jni/android/graphics/BitmapRegionDecoder.cpp
@@ -158,6 +158,11 @@ static jobject nativeNewInstanceFromStream(JNIEnv* env, jobject clazz,
         // for now we don't allow shareable with java inputstreams
         SkMemoryStream *mStream = buildSkMemoryStream(stream);
         largeBitmap = doBuildTileIndex(env, mStream);
+        // release the resources when decoding fails
+        if (largeBitmap == NULL) {
+            delete(mStream);
+            mStream = NULL;
+        }
         stream->unref();
     }
     return largeBitmap;

diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java
@@ -97,6 +97,9 @@ public void onPause() {
         //        R.anim.recents_return_to_launcher_enter,
         //        R.anim.recents_return_to_launcher_exit);
         mForeground = false;
+        if (mRecentsPanel != null) {
+            mRecentsPanel.dismissContextMenuIfAny();
+        }
         super.onPause();
     }
 

diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
@@ -310,6 +310,11 @@ public boolean isInContentArea(int x, int y) {
         }
     }
 
+    public void dismissContextMenuIfAny() {
+        if(mPopup != null) {
+            mPopup.dismiss();
+        }
+    }
     public void show(boolean show) {
         show(show, null, false, false);
     }
@@ -834,6 +839,9 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
 
     public void handleLongPress(
             final View selectedView, final View anchorView, final View thumbnailView) {
+        if(mPopup != null) {
+            mPopup.dismiss();
+        }
         thumbnailView.setSelected(true);
         final PopupMenu popup =
             new PopupMenu(mContext, anchorView == null ? selectedView : anchorView);

diff --git a/services/java/com/android/server/am/NativeCrashListener.java b/services/java/com/android/server/am/NativeCrashListener.java
@@ -152,6 +152,14 @@ public void run() {
                                 Slog.d(TAG, "Exception writing ack: " + e.getMessage());
                             }
                         }
+                        finally {
+                            try {
+                                Slog.d(TAG, "Closing socket connection: " + peerFd);
+                                Libcore.os.close(peerFd);
+                            } catch (ErrnoException e) {
+                                Slog.w(TAG, "Error closing socket connection", e);
+                            }
+                        }
                     }
                 }
             }

diff --git a/services/java/com/android/server/power/DisplayPowerController.java b/services/java/com/android/server/power/DisplayPowerController.java
@@ -803,6 +803,7 @@ private void updatePowerState() {
                     if (!mElectronBeamOffAnimator.isStarted()) {
                         if (mPowerState.getElectronBeamLevel() == 0.0f) {
                             setScreenOn(false);
+                            unblockScreenOn();
                         } else if (mPowerState.prepareElectronBeam(
                                 mElectronBeamFadesConfig ?
                                         ElectronBeam.MODE_FADE :

diff --git a/services/java/com/android/server/power/ShutdownThread.java b/services/java/com/android/server/power/ShutdownThread.java
@@ -55,6 +55,7 @@
 import android.util.Log;
 import android.view.WindowManager;
 import android.view.KeyEvent;
+import java.lang.reflect.Method;
 
 public final class ShutdownThread extends Thread {
     // constants
@@ -602,6 +603,9 @@ public void run() {
      * @param reason reason for reboot
      */
     public static void rebootOrShutdown(boolean reboot, String reason) {
+        // Oem specific shutdown
+        deviceRebootOrShutdown(reboot, reason);
+
         if (reboot) {
             Log.i(TAG, "Rebooting, reason: " + reason);
             try {
@@ -630,4 +634,28 @@ public static void rebootOrShutdown(boolean reboot, String reason) {
         Log.i(TAG, "Performing low-level shutdown...");
         PowerManagerService.lowLevelShutdown();
     }
+
+    private static void deviceRebootOrShutdown(boolean reboot, String reason) {
+
+        Class<?> cl;
+        String deviceShutdownClassName = "com.android.server.power.ShutdownOem";
+
+        try{
+            cl = Class.forName(deviceShutdownClassName);
+            Method m;
+            try {
+                m = cl.getMethod("rebootOrShutdown", new Class[]{boolean.class, String.class});
+                m.invoke(cl.newInstance(), reboot, reason);
+
+            } catch (NoSuchMethodException ex) {
+                //Method not found.
+            } catch (Exception ex) {
+                //Unknown exception
+            }
+        }catch(ClassNotFoundException e){
+        //Classnotfound!
+        }catch(Exception e){
+        //Unknown exception
+        }
+     }
 }