koush

commit 667914386d177bf8eb71fdaef688a75b361ee9c9
Merge: a08c6d2 507c4a2
Author: Koushik Dutta <[email protected]>
Date:   Sun Jun 29 11:36:10 2014 -0700

    WIP on master: a08c6d2 DO NOT SUBMIT: Various fixes in OpenSSLEngineImpl.

diff --cc src/main/java/org/conscrypt/NativeCrypto.java
index a6dfd34,a6dfd34..5e728fa
--- a/src/main/java/org/conscrypt/NativeCrypto.java

koush

diff --git a/src/main/java/org/conscrypt/OpenSSLEngineImpl.java b/src/main/java/org/conscrypt/OpenSSLEngineImpl.java
index 01966c8..ae3c26d 100644
--- a/src/main/java/org/conscrypt/OpenSSLEngineImpl.java
+++ b/src/main/java/org/conscrypt/OpenSSLEngineImpl.java
@@ -413,7 +413,10 @@ public class OpenSSLEngineImpl extends SSLEngine implements NativeCrypto.SSLHand
                         source.getContext(), handshakeSink.getContext(), this, getUseClientMode(),
                         sslParameters.npnProtocols, sslParameters.alpnProtocols);
                 if (sslSessionCtx != 0) {
-                    sslSession = sslParameters.setupSession(sslSessionCtx, sslNativePointer, null,
+                    if (sslSession != null && engineState == EngineState.HANDSHAKE_STARTED) {

koush

diff --git a/src/main/java/org/conscrypt/OpenSSLEngineImpl.java b/src/main/java/org/conscrypt/OpenSSLEngineImpl.java
index 01966c8..e6716d5 100644
--- a/src/main/java/org/conscrypt/OpenSSLEngineImpl.java
+++ b/src/main/java/org/conscrypt/OpenSSLEngineImpl.java
@@ -415,6 +415,9 @@ public class OpenSSLEngineImpl extends SSLEngine implements NativeCrypto.SSLHand
                 if (sslSessionCtx != 0) {
                     sslSession = sslParameters.setupSession(sslSessionCtx, sslNativePointer, null,
                             getPeerHost(), getPeerPort(), true);
+                    if (engineState == EngineState.HANDSHAKE_STARTED) {
+                        engineState = EngineState.READY_HANDSHAKE_CUT_THROUGH;

koush

diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index f134854..409c88e 100644
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -368,6 +368,8 @@ public class PackageManagerService extends IPackageManager.Stub {
     final ActivityIntentResolver mReceivers =
             new ActivityIntentResolver();
 
+    final HashSet<String> mAllowances = new HashSet<String>();
+

koush

#!/bin/bash

curl http://romshare.deployfu.com/lastupload > /tmp/curupload
diff /tmp/lastupload /tmp/curupload
if [ "$?" = "0" ]
then
	echo Already up to date.
	exit 0
fi

koush

diff -urdN -x .git /extra/git/koush/android_bootable_recovery//minui/Android.mk bootable/recovery//minui/Android.mk
--- /extra/git/koush/android_bootable_recovery//minui/Android.mk	2011-07-09 23:39:10.549892000 +0100
+++ bootable/recovery//minui/Android.mk	2011-07-09 23:06:38.016647002 +0100
@@ -19,6 +19,10 @@
     LOCAL_CFLAGS += -DBOARD_HAS_FLIPPED_SCREEN
 endif
 
+ifeq ($(BOARD_USE_GR_FLIP_32), true)
+    LOCAL_CFLAGS += -DBOARD_USE_GR_FLIP_32
+endif