214590 Commits

Author SHA1 Message Date
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
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
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
Tobias Thierer
823e05b2db Merge "Avoid instantiations of Boolean that are immediately unboxed." 2016-04-25 09:08:44 +00:00
Shubham Ajmera
f9446f77a2 Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7
Bug: 27426743
(cherry picked from commit 6c69351469b9da7b424e9726c0bf878115a389b2)
Change-Id: I7276e39951d721704726132281c316c77bdab515
2016-04-22 17:10:45 +01:00
Calin Juravle
e86e8a659e Handle dalvik.vm.usejitprofiles property
Bug: 26080105

Partial cherry picked from commit
db4a79a5d7d348e9d2286d95d4e5a59dd484456f

Change-Id: Ifef4ec0d153b8d30941a339d7f9052889631f84c
2016-04-22 16:40:50 +01:00
Tobias Thierer
1b33b45038 Merge "Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL)." 2016-04-22 14:43:52 +00:00
Joachim Sauer
29e835a515 Hide general utility methods in ICU4J.
Bug: 22023363
(cherry picked from commit d76fe896d444ee7bf625493e12c51ee28bcc82ef)

Change-Id: Ic923c558270b81fe48034c46bfcd9b1ac1d438f2
2016-04-22 14:59:25 +01:00
Paul Duffin
6d1f0b2afd ICU4J: Removed a couple of useless or internal methods from API
Bug: 22023363
(cherry picked from commit c108dea0bb0558f6d8462374775891005469097d)

Change-Id: I07c42b1124490daf502d1b3aff37b249d6118552
2016-04-22 14:55:08 +01:00
Paul Duffin
679fa0261c ICU4J: Update API for using civil version of IslamicCalendar
Bug: 22023363
(cherry picked from commit 74a8e08d59169865ecb5e0ae9ba6a57f0814a05a)

Change-Id: I0d7b756be123f806d035ee225960f27806785424
2016-04-22 14:35:17 +01:00
Tobias Thierer
ca01820735 Avoid instantiations of Boolean that are immediately unboxed.
Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).

Also fixed a couple of other valueOf()s in SyncStorageEngine.

Bug: 28289401
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc
2016-04-22 14:21:12 +01:00
Tobias Thierer
09ae4931a9 Merge "frameworks/base: Avoid Long object allocations in Long.valueOf()" 2016-04-22 10:27:27 +00:00
Tobias Thierer
a1adc6ff82 Fix needless value boxing/unboxing in Am.java
(except the Long unboxing covered by a separate CL).

Tested: Successfully built frameworks/base

Bug: 28289401
Change-Id: I40d09af9c003b7667cb96171747bd355d7a9dc4f
2016-04-21 18:51:25 +01:00
Tobias Thierer
4bd017d6a5 frameworks/base: Avoid Long object allocations in Long.valueOf()
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()

Tested: built frameworks/base successfully.

Bug: 28289401
Change-Id: I1fad536853a68c7b0707cbf02989aca155064843
2016-04-21 16:23:56 +01:00
Tobias Thierer
c027ae49f0 Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation." 2016-04-21 13:23:18 +00:00
Tobias Thierer
9bbbf2b15f Integer.valueOf() -> Integer.parseInt() to avoid allocation.
Bug: 28289401
Change-Id: If767f891644a06ba587f9bb55dccea4089a8c66d
2016-04-21 12:09:29 +01:00
Adam Lesinski
570a13f0cb Merge "Doze settings example not matching real keys" 2016-04-20 22:37:18 +00:00
Yang Ni
acd0061f90 Merge "Made Element accessors thread-safe" 2016-04-20 18:14:08 +00:00