Skip to content

Commit 83b7924

Browse files
drcmdadrcmda
committed
Revert "Track change to JSSE provider"
This reverts commit 12e7522. Conflicts: Android.mk preloaded-classes Change-Id: I98dcf8fd361a5e689b468cdcf7009c96defb28c8
1 parent 347f983 commit 83b7924

23 files changed

+140
-180
lines changed

‎Android.mk

+1-2
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ LOCAL_INTERMEDIATE_SOURCES := \
247247
$(framework_res_source_path)/com/android/internal/R.java
248248

249249
LOCAL_NO_STANDARD_LIBRARIES := true
250-
LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt core core-junit ext okhttp
250+
LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext okhttp
251251

252252
LOCAL_MODULE := framework
253253
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
@@ -415,7 +415,6 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \
415415

416416
framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \
417417
bouncycastle \
418-
conscrypt \
419418
core \
420419
okhttp \
421420
ext \

‎core/java/android/app/ActivityThread.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@
9696
import com.android.internal.os.RuntimeInit;
9797
import com.android.internal.os.SamplingProfilerIntegration;
9898
import com.android.internal.util.Objects;
99-
import com.android.org.conscrypt.OpenSSLSocketImpl;
99+
100+
import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl;
100101

101102
import java.io.File;
102103
import java.io.FileDescriptor;

‎core/java/android/net/SSLCertificateSocketFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818

1919
import android.os.SystemProperties;
2020
import android.util.Log;
21-
import com.android.org.conscrypt.OpenSSLContextImpl;
22-
import com.android.org.conscrypt.OpenSSLSocketImpl;
23-
import com.android.org.conscrypt.SSLClientSessionCache;
2421
import java.io.IOException;
2522
import java.net.InetAddress;
2623
import java.net.Socket;
@@ -39,6 +36,9 @@
3936
import javax.net.ssl.SSLSocketFactory;
4037
import javax.net.ssl.TrustManager;
4138
import javax.net.ssl.X509TrustManager;
39+
import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;
40+
import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl;
41+
import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
4242

4343
/**
4444
* SSLSocketFactory implementation with several extra features:

‎core/java/android/net/SSLSessionCache.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
package android.net;
1818

19+
import org.apache.harmony.xnet.provider.jsse.FileClientSessionCache;
20+
import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
21+
1922
import android.content.Context;
2023
import android.util.Log;
2124

22-
import com.android.org.conscrypt.FileClientSessionCache;
23-
import com.android.org.conscrypt.SSLClientSessionCache;
24-
2525
import java.io.File;
2626
import java.io.IOException;
2727

‎core/java/android/net/http/CertificateChainValidator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package android.net.http;
1818

19-
import com.android.org.conscrypt.SSLParametersImpl;
20-
import com.android.org.conscrypt.TrustManagerImpl;
2119

2220
import java.io.ByteArrayInputStream;
2321
import java.io.IOException;
@@ -32,6 +30,8 @@
3230
import javax.net.ssl.SSLSession;
3331
import javax.net.ssl.SSLSocket;
3432
import javax.net.ssl.X509TrustManager;
33+
import org.apache.harmony.xnet.provider.jsse.SSLParametersImpl;
34+
import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;
3535

3636
/**
3737
* Class responsible for all server certificate validation functionality

‎core/java/android/net/http/HttpsConnection.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import android.content.Context;
2020
import android.util.Log;
21-
import com.android.org.conscrypt.FileClientSessionCache;
22-
import com.android.org.conscrypt.OpenSSLContextImpl;
23-
import com.android.org.conscrypt.SSLClientSessionCache;
21+
import org.apache.harmony.xnet.provider.jsse.FileClientSessionCache;
22+
import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;
23+
import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
2424
import org.apache.http.Header;
2525
import org.apache.http.HttpException;
2626
import org.apache.http.HttpHost;

‎core/java/android/net/http/X509TrustManagerExtensions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package android.net.http;
1818

19-
import com.android.org.conscrypt.TrustManagerImpl;
19+
import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;
2020

2121
import java.security.cert.CertificateException;
2222
import java.security.cert.X509Certificate;

‎core/java/android/webkit/BrowserFrame.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
import java.util.Map;
5858
import java.util.Set;
5959

60-
import com.android.org.conscrypt.OpenSSLKey;
61-
import com.android.org.conscrypt.OpenSSLKeyHolder;
60+
import org.apache.harmony.xnet.provider.jsse.OpenSSLKey;
61+
import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder;
6262

6363
class BrowserFrame extends Handler {
6464

‎core/java/android/webkit/ClientCertRequestHandler.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import java.security.PrivateKey;
2121
import java.security.cert.CertificateEncodingException;
2222
import java.security.cert.X509Certificate;
23-
import com.android.org.conscrypt.NativeCrypto;
24-
import com.android.org.conscrypt.OpenSSLKey;
25-
import com.android.org.conscrypt.OpenSSLKeyHolder;
23+
import org.apache.harmony.xnet.provider.jsse.NativeCrypto;
24+
import org.apache.harmony.xnet.provider.jsse.OpenSSLKey;
25+
import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder;
2626

2727
/**
2828
* ClientCertRequestHandler: class responsible for handling client

‎core/jni/android/graphics/BitmapFactory.cpp

-11
Original file line numberDiff line numberDiff line change
@@ -360,17 +360,6 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding,
360360
SkCanvas canvas(*bitmap);
361361
canvas.scale(sx, sy);
362362
canvas.drawBitmap(*decoded, 0.0f, 0.0f, &paint);
363-
364-
// Save off the unscaled version of bitmap to be used in later
365-
// transformations if it would reduce memory pressure. Only do
366-
// so if it is being upscaled more than 50%, is bigger than
367-
// 256x256, and not too big to be keeping a copy of (<1MB).
368-
const int numUnscaledPixels = decoded->width() * decoded->height();
369-
if (sx > 1.5 && numUnscaledPixels > 65536 && numUnscaledPixels < 262144) {
370-
bitmap->setUnscaledBitmap(decoded);
371-
adb2.detach(); //responsibility for freeing decoded's memory is
372-
//transferred to bitmap's destructor
373-
}
374363
}
375364

376365
if (padding) {

‎core/jni/android/graphics/Canvas.cpp

+1-19
Original file line numberDiff line numberDiff line change
@@ -530,25 +530,7 @@ class SkCanvasGlue {
530530
if (paint) {
531531
filteredPaint = *paint;
532532
}
533-
filteredPaint.setFilterBitmap(true);
534-
paint = &filteredPaint;
535-
}
536-
537-
//If we're doing downscaling and we have an unscaled bitmap, convert
538-
//this to an upscaling operation, or at least less of a downscale
539-
SkBitmap* unscaled = bitmap->unscaledBitmap();
540-
if (NULL != srcPtr && NULL != unscaled) {
541-
//use new bitmap and adapt the coordinates of the src rect to this new bitmap
542-
SkScalar dx, dy;
543-
SkRect srcF;
544-
dx = SkScalarDiv(SkIntToScalar(unscaled->width()), SkIntToScalar(bitmap->width()));
545-
dy = SkScalarDiv(SkIntToScalar(unscaled->height()), SkIntToScalar(bitmap->height()));
546-
srcF.set(SkScalarMul(SkIntToScalar(src.left()), dx),
547-
SkScalarMul(SkIntToScalar(src.top()), dy),
548-
SkScalarMul(SkIntToScalar(src.right()), dx),
549-
SkScalarMul(SkIntToScalar(src.bottom()), dy));
550-
551-
canvas->drawBitmapScalarRect(*unscaled, &srcF, dst, paint);
533+
canvas->drawBitmapRect(*bitmap, srcPtr, dst, &filteredPaint);
552534
} else {
553535
canvas->drawBitmapRect(*bitmap, srcPtr, dst, paint);
554536
}

‎core/res/res/values/config.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -552,16 +552,14 @@
552552
This needs to match the constants in
553553
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
554554
-->
555-
<integer name="config_longPressOnHomeBehavior">1</integer>
555+
<integer name="config_longPressOnHomeBehavior">0</integer>
556556

557557
<!-- Control the behavior when the user double-taps the home button.
558558
0 - Nothing
559559
1 - Recent apps view in SystemUI
560560
This needs to match the constants in
561561
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
562562
-->
563-
564-
<integer name="config_longPressOnHomeBehavior">0</integer>
565563
<integer name="config_doubleTapOnHomeBehavior">0</integer>
566564

567565
<!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.

‎core/res/res/values/donottranslate-cldr.xml

+45
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,49 @@
66
<string name="time_of_day">%-l:%M:%S %p</string>
77
<string name="date_and_time">%b %-e, %Y, %-l:%M:%S %p</string>
88
<string name="date_time">%1$s, %2$s</string>
9+
<string name="time_date">%1$s, %3$s</string>
10+
<string name="abbrev_month_day_year">%b %-e, %Y</string>
11+
<string name="month_day">%B %-e</string>
12+
<string name="month">%-B</string>
13+
<string name="month_year">%B %Y</string>
14+
<string name="abbrev_month_day">%b %-e</string>
15+
<string name="abbrev_month">%-b</string>
16+
<string name="abbrev_month_year">%b %Y</string>
17+
<string name="time1_time2">%1$s – %2$s</string>
18+
<string name="date1_date2">%2$s – %5$s</string>
19+
<string name="numeric_md1_md2">%2$s/%3$s – %7$s/%8$s</string>
20+
<string name="numeric_wday1_md1_wday2_md2">%1$s, %2$s/%3$s – %6$s, %7$s/%8$s</string>
21+
<string name="numeric_mdy1_mdy2">%2$s/%3$s/%4$s – %7$s/%8$s/%9$s</string>
22+
<string name="numeric_wday1_mdy1_wday2_mdy2">%1$s, %2$s/%3$s/%4$s – %6$s, %7$s/%8$s/%9$s</string>
23+
<string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s/%3$s/%4$s, %5$s – %6$s, %7$s/%8$s/%9$s, %10$s</string>
24+
<string name="numeric_md1_time1_md2_time2">%2$s/%3$s, %5$s – %7$s/%8$s, %10$s</string>
25+
<string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s/%3$s, %5$s – %6$s, %7$s/%8$s, %10$s</string>
26+
<string name="numeric_mdy1_time1_mdy2_time2">%2$s/%3$s/%4$s, %5$s – %7$s/%8$s/%9$s, %10$s</string>
27+
<string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s – %4$s, %5$s, %6$s</string>
28+
<string name="wday1_date1_wday2_date2">%1$s, %2$s – %4$s, %5$s</string>
29+
<string name="date1_time1_date2_time2">%2$s, %3$s – %5$s, %6$s</string>
30+
<string name="time_wday_date">%1$s, %2$s, %3$s</string>
31+
<string name="wday_date">%2$s, %3$s</string>
32+
<string name="time_wday">%1$s, %2$s</string>
33+
<string name="same_year_md1_md2">%2$s %3$s – %7$s %8$s</string>
34+
<string name="same_year_wday1_md1_wday2_md2">%1$s, %2$s %3$s – %6$s, %7$s %8$s</string>
35+
<string name="same_year_md1_time1_md2_time2">%2$s %3$s, %5$s – %7$s %8$s, %10$s</string>
36+
<string name="same_month_md1_time1_md2_time2">%2$s %3$s, %5$s – %7$s %8$s, %10$s</string>
37+
<string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s – %6$s, %7$s %8$s, %10$s</string>
38+
<string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s – %6$s, %7$s %8$s, %10$s</string>
39+
<string name="same_year_mdy1_time1_mdy2_time2">%2$s %3$s, %4$s, %5$s – %7$s %8$s, %9$s, %10$s</string>
40+
<string name="same_month_mdy1_time1_mdy2_time2">%2$s %3$s, %4$s, %5$s – %7$s %8$s, %9$s, %10$s</string>
41+
<string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s – %6$s, %7$s %8$s, %9$s, %10$s</string>
42+
<string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s – %6$s, %7$s %8$s, %9$s, %10$s</string>
43+
<string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s – %6$s, %7$s %8$s, %9$s</string>
44+
<string name="same_month_md1_md2">%2$s %3$s – %8$s</string>
45+
<string name="same_month_wday1_md1_wday2_md2">%1$s, %2$s %3$s – %6$s, %7$s %8$s</string>
46+
<string name="same_year_mdy1_mdy2">%2$s %3$s – %7$s %8$s, %9$s</string>
47+
<string name="same_month_mdy1_mdy2">%2$s %3$s – %8$s, %9$s</string>
48+
<string name="same_year_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s – %6$s, %7$s %8$s, %9$s</string>
49+
<string name="short_format_month">%b</string>
50+
<string name="full_wday_month_day_no_year">EEEE, MMMM d</string>
51+
<string name="abbrev_wday_month_day_no_year">EEE, MMMM d</string>
52+
<string name="abbrev_wday_month_day_year">EEE, MMM d, yyyy</string>
53+
<string name="full_wday_month_day_no_year_split">EEEE\nMMMM d</string>
954
</resources>

‎core/tests/coretests/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ LOCAL_SRC_FILES := \
2323

2424
LOCAL_DX_FLAGS := --core-library
2525
LOCAL_STATIC_JAVA_LIBRARIES := core-tests android-common frameworks-core-util-lib mockwebserver guava littlemock
26-
LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common
26+
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
2727
LOCAL_PACKAGE_NAME := FrameworksCoreTests
2828

2929
LOCAL_CERTIFICATE := platform

‎core/tests/coretests/src/android/net/http/X509TrustManagerExtensionsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import junit.framework.TestCase;
2727

28-
import com.android.org.conscrypt.TrustManagerImpl;
28+
import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;
2929

3030
public class X509TrustManagerExtensionsTest extends TestCase {
3131

‎keystore/java/android/security/AndroidKeyPairGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.android.org.bouncycastle.x509.X509V3CertificateGenerator;
2020

21-
import com.android.org.conscrypt.OpenSSLEngine;
21+
import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine;
2222

2323
import java.security.InvalidAlgorithmParameterException;
2424
import java.security.InvalidKeyException;

‎keystore/java/android/security/AndroidKeyStore.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package android.security;
1818

19-
import com.android.org.conscrypt.OpenSSLEngine;
20-
import com.android.org.conscrypt.OpenSSLKeyHolder;
19+
import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine;
20+
import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder;
2121

2222
import android.util.Log;
2323

‎keystore/java/android/security/KeyChain.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import java.util.concurrent.BlockingQueue;
3838
import java.util.concurrent.LinkedBlockingQueue;
3939

40-
import com.android.org.conscrypt.OpenSSLEngine;
41-
import com.android.org.conscrypt.TrustedCertificateStore;
40+
import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine;
41+
import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore;
4242

4343
/**
4444
* The {@code KeyChain} class provides access to private keys and

‎keystore/tests/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
55
LOCAL_MODULE_TAGS := tests
66
LOCAL_CERTIFICATE := platform
77

8-
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt
8+
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
99

1010
# Include all test java files.
1111
LOCAL_SRC_FILES := $(call all-java-files-under, src)

‎keystore/tests/src/android/security/AndroidKeyStoreTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.android.org.bouncycastle.x509.X509V3CertificateGenerator;
2020

21-
import com.android.org.conscrypt.OpenSSLEngine;
21+
import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine;
2222

2323
import android.test.AndroidTestCase;
2424

0 commit comments

Comments
 (0)