214707 Commits

Author SHA1 Message Date
Chad Brubaker
d4b6c696e1 Support TrustedCertificateStore.findAllIssuers
(cherry-picked from commit aa6c3c3e252252b80c3900bd4c1ff27d37265c6d)
Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
2016-05-12 11:15:47 -07:00
Elliott Hughes
7691b78fbb Make android_net_NetUtils include what it actually uses.
Bug: http://b/28519060
Change-Id: I49dcd358d3fc8e0ba5c5e0b50a0f5dcc63281d22
2016-05-11 15:18:13 -07:00
Miao Wang
9f2a1979a7 Merge "[RenderScript] Interrupt mMessageThread when tearing down context." 2016-05-11 19:13:00 +00:00
Joachim Sauer
b64859d899 Merge "Fix AbstractStringBuilder gaining extra APIs." 2016-05-11 13:47:09 +00:00
Joachim Sauer
a305ee1027 Fix AbstractStringBuilder gaining extra APIs.
AbstractStringBuilder showed up in the API as gaining methods originally
belonging to StringBuffer/StringBuilder (mostly append(*) and
insert(*)).

Ideally it should not be in the API at all, but it's traditionally been
there and we'll keep it for now.

@hide the affected methods and move the "implements Appendable"
definition to StringBuffer/StringBuilder (as methods implementing an
interface can't be @hidden).

(cherry picked from commit 91f4aec3ccb4b2a2b66fbde095baa584b0862c11)

Bug: 27582395
Change-Id: I0b85c2c84f3e52ffe7864728d083f9c6ea7304ef
2016-05-11 14:19:44 +01:00
Jakub Pawlowski
2168fc29a2 Fix GATT Characteristic write type serialization
Default writeType for GATT characteristic was not being
serialized into Parcel. This cause errors when trying to
write into Characteristic.

Bug: 27910548
Change-Id: Ib2f88cf991123eaea244f16fa36deb0d773c5a33
2016-05-11 06:53:10 +00:00
Miao Wang
4a574806e6 [RenderScript] Interrupt mMessageThread when tearing down context.
- Interrupt mMessageThread, so it gets to see immediately
    that mRun is false and exit rightaway.

Change-Id: Ic586ef225a5c6f3a77f89de00b7fb3f3547c9838
2016-05-10 16:48:25 -07:00
Hans Boehm
a5ca0ca886 Merge "Clear more native pointers in finalizers" 2016-05-10 23:41:31 +00:00
Hans Boehm
ad3cc3c63c Clear more native pointers in finalizers
This hopefully handles the remaining finalizers in frameworks/base
that didn't guard against calls from other finalizers after being
finalized.

The goal here is to reduce the possible corruption causes we have
to think about by a few.

If any of theses are either very frequently used, or use large
Java (as opposed to native) objects, we should probably convert them
to NativeAllocationRegistry instead. But that's more work.

Bug: 18178237
Change-Id: I79bc0e8fa20af8f340418a6226022e0294d77f02
2016-05-10 15:33:53 -07:00
Yi Kong
4c7169fadf Merge "Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4" 2016-05-09 16:40:38 +00:00
Yi Kong
c2b4f49241 Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4
Bug: 28582540
Change-Id: Ic944995957aa1a5ec65ecab2a8d4b8587094ccc8
2016-05-09 16:04:55 +00:00
Calin Juravle
53ce983c22 Merge "Read -Xjittransitionweight from system properties." 2016-05-09 15:43:41 +00:00
Treehugger Robot
e8579b12a3 Merge "Fix divergent equals and hashCode behavior" 2016-05-06 23:20:02 +00:00
Ajay Panicker
04a7cfcf73 Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected" 2016-05-06 23:18:51 +00:00
Ajay Panicker
1be1934e81 Merge "Protect TRANSFER_COMPLETE broadcast" 2016-05-06 23:18:32 +00:00
Pavlin Radoslavov
f74b830e68 Fix divergent equals and hashCode behavior
Calling Objects.hash with a byte[] will call the identity hashCode on
the byte[] and this doesn't agree with the use of Objects.deepEquals
in equals.
Bug caught by error prone.

Also, replaced usage of Objects.deepEquals(mServiceDataUuid, ...) with
Objects.equals(mServiceDataUuid, ...), because mServiceDataUuid
is an Object of type ParcelUuid.

Bug: 28585195
Change-Id: Id92734874339985fedafe1a28286a6a4dcd88d3b
2016-05-06 12:05:47 -07:00
Hans Boehm
e3a25ad692 Merge "Improve grammar in startService() documentation." 2016-05-06 17:25:47 +00:00
Ajay Panicker
dde98961bb Protect TRANSFER_COMPLETE broadcast
Bug: 28621801
Change-Id: Ia90abd00694ae80000f59ee0a17826592fd2159b
2016-05-05 18:59:44 -07:00
Hans Boehm
fb9f6acd6f Improve grammar in startService() documentation.
Change-Id: If72f710caa2e85512636d6f7ddacff2426cfb835
2016-05-05 13:09:28 -07:00
Amith Yamasani
6f28d02bed Merge "Fix the issue that App crash on startForeground." 2016-05-05 17:45:53 +00:00
Neil Fuller
f6aabd95df Merge changes from topic 'icu_cp_catchup'
* changes:
  Track external/icu API changes for factory registration
  ICU4J: Hide constants that can change between releases
  Remove RawCollationKey/ByteArrayWrapper from the public API
2016-05-05 15:06:48 +00:00
Wang Le
179ebbe6c9 Fix the issue that App crash on startForeground.
Install single APP in any user space except Owner user, the APP
got crash when call startForeground in Service Component with
Notification which without SmallIcon.

bug:https://code.google.com/p/android/issues/detail?id=209043

Change-Id: I88a3b8afc213cafe0f280f9b44d6acd2ea0df207
Signed-off-by: Wang Le <wangle@xiaomi.com>
2016-05-05 21:04:57 +08:00
Neil Fuller
8bea855f75 Track external/icu API changes for factory registration
Bug: 28583844
(cherry picked from commit e7fda97fff236afa5597da7df69b1462390c5a14)

Change-Id: I4a411184fe002ea812349e49d07d17c62c66d842
2016-05-05 11:38:45 +01:00
Paul Duffin
bd63ae8c83 ICU4J: Hide constants that can change between releases
Bug: 27830659
(cherry picked from commit 71498f107ce41a1c3f2bc612fa214579aab19db1)

Change-Id: I007ed563d78cdf36ddd0e36ae72f118189772e5c
2016-05-05 11:34:01 +01:00
Paul Duffin
2391234242 Remove RawCollationKey/ByteArrayWrapper from the public API
Bug: 22023363
(cherry picked from commit baa72515f60af798ea9a03e53a78a7d95834ceff)

Change-Id: If81d9a67ba9edf15688f4369390a6734d92a8f3c
2016-05-05 11:33:15 +01:00
Vikas Marwaha
683168c10f Merge "Fix issue #25727069: Top sleeping activity overrides foreground service" 2016-05-03 20:50:39 +00:00
Ajay Panicker
8a9d642546 List the CONNECTION_STATE_CHANGED broadcast for MAP as protected
Bug: 28527879
Change-Id: Ifb2db87677e92022814bb9704c26009d249ac6ce
2016-05-03 18:21:34 +00:00
Ajay Panicker
0d14c01a3e Merge "List the SDP_RECORD broadcast as protected" 2016-05-03 17:22:57 +00:00
Ajay Panicker
4f86d76cf4 List the SDP_RECORD broadcast as protected
Bug: 28257589
Change-Id: I97ef91fa3a7f7ef62fd96ca079e0a6d5a957bc71
2016-05-03 00:28:47 +00:00
Dianne Hackborn
7064c019a7 Fix issue #25727069: Top sleeping activity overrides foreground service
Change-Id: I9a085cd650604f9d6277ad343bf3c3852324cafc
2016-05-02 14:09:53 -07:00
Treehugger Robot
daf6bdba0e Merge "FloatingToolbar: Fix javadoc for closeOverflow()." 2016-04-29 09:36:05 +00:00
Adam Lesinski
da66fa7526 Merge "AAPT: ProGuard config for components in main dex." 2016-04-28 20:06:19 +00:00
Chih-hung Hsieh
6e35557ad3 Merge "Fix google-explicit-constructor warnings." 2016-04-28 18:47:00 +00:00
Sebastian Kaspari
eb101a700c FloatingToolbar: Fix javadoc for closeOverflow().
Change-Id: I450fc603ae5fe49f08f580594352cc1120cc104d
2016-04-28 16:34:33 +00:00
Calin Juravle
7116e4b999 Read -Xjittransitionweight from system properties.
Bug: 27865109

(cherry picked from commit 8d74de55464c885b602b34252ee8721a9e810dcf)

Change-Id: Id4f0668ea212f0fd82d32437ea251118bfce1ae2
2016-04-28 16:34:40 +01:00
Narayan Kamath
3f0355f972 Merge "ZipUtils: Fix wrong timestamps when getEntryInfo" 2016-04-28 12:13:38 +00:00
Shammi Khattar
1ead474f61 ZipUtils: Fix wrong timestamps when getEntryInfo
"tm_mon" format should align with "ZipEntry::setModWhen" in aapt.
"tm_isdst" should be initialized, or it will because random value
and cause error in function mktime().

BUG:28021145
Change-Id: I1e8d5c14e5d7b875bf9cd940cb7f4c5b93a1bcd6
2016-04-28 12:13:16 +00:00
Chih-Hung Hsieh
c6baf563ba Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: Ibdd6a210bb7ff228e3624cc319169f77aca3b51e
2016-04-27 11:38:12 -07:00
Rohit Agrawal
6ba873faec AAPT: ProGuard config for components in main dex.
Create an analogue of "aapt -G" which outputs a proguard configuration
that keeps only components which need to be in the main dex.

BUG: 27383099

Change-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1
(cherry picked from commit 86229cb622fccde8ab8cbe85eead91a34313a708)
2016-04-27 11:26:55 -07:00
Dimitry Ivanov
4dd00e93f3 Merge "zygote: Remove NativeLoader initialization step" 2016-04-27 18:24:33 +00:00
Dimitry Ivanov
493576bc5d Merge changes from topic 'target-sdk-0-fix'
* changes:
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class
2016-04-27 18:24:04 +00:00
Dimitry Ivanov
6a850b3f11 zygote: Remove NativeLoader initialization step
This now done by art Runtime::Start()

Bug: http://b/28320913
Change-Id: Icf9b11954b732c9f953e02bba9ae52eb91117457
2016-04-27 10:22:09 -07:00
Dimitry Ivanov
eb5866d4b0 Create linker namespace for the system server classloader
Bug: http://b/27702070
Change-Id: I12c9448e877202937cf558de75042bcb46f6a933
2016-04-27 10:22:09 -07:00
Paul Duffin
cd4f7e1203 Merge changes from topic 'icu-cherry-pick-from-nyc-to-aosp'
* changes:
  Hide general utility methods in ICU4J.
  ICU4J: Removed a couple of useless or internal methods from API
  ICU4J: Update API for using civil version of IslamicCalendar
2016-04-27 13:26:39 +00:00
Shubham Ajmera
b0395386b5 Merge "Track libcore change 13331bc0dd87b029b194e5aca4487e38d18da188" 2016-04-27 09:45:03 +00:00
Dimitry Ivanov
5d7d777fa6 Extract pathclassloader initialization to a separate class
To be able to reuse this code when creating a classloader for
the system_server.

Bug: http://b/27245894
Bug: http://b/27702070
Change-Id: I928175a39a1beb0446d863a5b8f5edf94686e768
2016-04-26 13:16:54 -07:00
Treehugger Robot
b065cc7fa6 Merge "Alarm icon is not shown for secondary users" 2016-04-26 18:32:50 +00:00
Shubham Ajmera
002be4e7b0 Track libcore change 13331bc0dd87b029b194e5aca4487e38d18da188
Bug: 27214236
Change-Id: I3074436baaa16fe19a158aa3aafdb79b534f792b
2016-04-26 17:48:26 +01:00
Calin Juravle
028a23367c Merge "Handle dalvik.vm.usejitprofiles property" 2016-04-25 11:09:01 +00:00
Neil Fuller
94adc6ce96 Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" 2016-04-25 09:31:40 +00:00