Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6b0d0e3 authored by ctso's avatar ctso
Browse files

Merge branch 'eclair' of git://github.com/cyanogen/android_frameworks_base into eclair

parents 993ae77d da416ba8

core/java/android/database/CursorToBulkCursorAdaptor.java

+1 −2
Original line number Diff line number Diff line
@@ -143,8 +143,7 @@ public final class CursorToBulkCursorAdaptor extends BulkCursorNative 


    public void close() {

        maybeUnregisterObserverProxy();

        mCursor.deactivate();       

        

        mCursor.close();       

    }



    public int requery(IContentObserver observer, CursorWindow window) {

core/java/android/provider/Settings.java

+7 −1
Original line number Diff line number Diff line
@@ -2003,6 +2003,12 @@ public final class Settings { 
         */

        public static final String ADB_ENABLED = "adb_enabled";



        /**

         * Whether to show ADB notifications.

         * @hide

         */

        public static final String ADB_NOTIFY = "adb_notify";

            

        /**

         * Weather Compcache is eanbled.

         * @hide

graphics/java/android/graphics/drawable/GradientDrawable.java

+2 −2
Original line number Diff line number Diff line
@@ -778,8 +778,8 @@ public class GradientDrawable extends Drawable { 
                        com.android.internal.R.styleable.DrawableCorners_bottomLeftRadius, radius);

                int bottomRightRadius = a.getDimensionPixelSize(

                        com.android.internal.R.styleable.DrawableCorners_bottomRightRadius, radius);

                if (topLeftRadius != radius && topRightRadius != radius &&

                        bottomLeftRadius != radius && bottomRightRadius != radius) {

                if (topLeftRadius != radius || topRightRadius != radius ||

                        bottomLeftRadius != radius || bottomRightRadius != radius) {

                    setCornerRadii(new float[] {

                            topLeftRadius, topLeftRadius,

                            topRightRadius, topRightRadius,

services/java/com/android/server/NotificationManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -1087,7 +1087,9 @@ class NotificationManagerService extends INotificationManager.Stub 
    // to accidentally lose.

    private void updateAdbNotification() {

        if (mAdbEnabled && mUsbConnected) {

            if ("0".equals(SystemProperties.get("persist.adb.notify"))) {

            if ("0".equals(SystemProperties.get("persist.adb.notify")) ||

                   Settings.Secure.getInt(mContext.getContentResolver(),

                           Settings.Secure.ADB_NOTIFY, 1) == 0) {

                return;

            }

            if (!mAdbNotificationShown) {