invisiblek

diff --git a/luni/src/test/java/libcore/java/net/DatagramSocketTest.java b/luni/src/test/java/libcore/java/net/DatagramSocketTest.java
index 2e091ab..067291a 100644
--- a/luni/src/test/java/libcore/java/net/DatagramSocketTest.java
+++ b/luni/src/test/java/libcore/java/net/DatagramSocketTest.java
@@ -19,12 +19,10 @@ package libcore.java.net;
 import junit.framework.TestCase;
 
 import java.lang.reflect.Field;
-import java.net.DatagramPacket;
 import java.net.DatagramSocket;

invisiblek

diff --git a/jni/com_android_bluetooth_a2dp.cpp b/jni/com_android_bluetooth_a2dp.cpp
index bd6e584..deb1861 100644
--- a/jni/com_android_bluetooth_a2dp.cpp
+++ b/jni/com_android_bluetooth_a2dp.cpp
@@ -257,6 +257,7 @@ static void initNative(JNIEnv *env, jobject object, jint maxA2dpConnections,
          env->DeleteGlobalRef(mCallbacksObj);
          mCallbacksObj = NULL;
     }
+    mCallbacksObj = env->NewGlobalRef(object);
     pthread_mutex_unlock(&mMutex);

invisiblek

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 4a9272e..381513d 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -72,9 +72,6 @@ import com.android.internal.telephony.uicc.IccIoResult;
 import com.android.internal.telephony.uicc.IccRefreshResponse;
 import com.android.internal.telephony.uicc.IccUtils;
 import com.android.internal.telephony.uicc.SimPhoneBookAdnRecord;
-import com.android.internal.telephony.RadioCapability;
-import com.android.internal.telephony.TelephonyDevController;

invisiblek

diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h
index 7c50638..090ca51 100644
--- a/include/media/stagefright/MetaData.h
+++ b/include/media/stagefright/MetaData.h
@@ -283,6 +283,14 @@ public:
         TYPE_RECT     = 'rect',
     };
 
+    static const size_t kSharedMemThreshold = 10 * 1024;
+

invisiblek

diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py
index 4de81d0..1764238 100644
--- a/tools/releasetools/blockimgdiff.py
+++ b/tools/releasetools/blockimgdiff.py
@@ -697,16 +697,17 @@ class BlockImageDiff(object):
       for xf in self.transfers:
         if xf.style == "zero":
           tgt_size = xf.tgt_ranges.size() * self.tgt.blocksize
-          print("%10d %10d (%6.2f%%) %7s %s" % (
-              tgt_size, tgt_size, 100.0, xf.style, xf.tgt_name))

invisiblek

#!/bin/bash

rm -f ~/diffs/*

while read l; do
  mod=`echo $l | awk '{print $2}'`
  if [[ ! $mod == "" ]] && [[ ! $mod == "forcepush" ]]; then
    dir=`echo $l | awk '{print $1}'`
    cd $dir
    r=`cat .git/config | grep "url = [email protected]:invisiblek" | sed 's/	url = [email protected]:invisiblek\///g'`

invisiblek

#!/bin/bash

rm -f ~/diffs/*

while read l; do
  mod=`echo $l | awk '{print $2}'`
  if [[ ! $mod == "" ]] && [[ ! $mod == "forcepush" ]]; then
    dir=`echo $l | awk '{print $1}'`
    cd $dir
    r=`cat .git/config | grep "url = [email protected]:invisiblek" | sed 's/	url = [email protected]:invisiblek\///g'`

invisiblek

#!/bin/bash

rm -f ~/diffs/*

while read l; do
  mod=`echo $l | awk '{print $2}'`
  if [[ ! $mod == "" ]] && [[ ! $mod == "forcepush" ]]; then
    dir=`echo $l | awk '{print $1}'`
    cd $dir
    r=`cat .git/config | grep "url = [email protected]:invisiblek" | sed 's/	url = [email protected]:invisiblek\///g'`

invisiblek

asdf

invisiblek

build/kati
dalvik
external/android-clat
external/aac
external/apache-http
bootable/recovery
development
bionic
external/bzip2
build									conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch)