OSDN Git Service
Yi Kong [Mon, 13 Jun 2016 20:14:35 +0000 (21:14 +0100)]
Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
Joachim Sauer [Thu, 16 Jun 2016 12:38:29 +0000 (12:38 +0000)]
Merge "API updated for ICU4J 57.1"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:26:51 +0000 (12:26 +0000)]
Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:07:31 +0000 (13:07 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Bug:
28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20
David Gross [Wed, 15 Jun 2016 18:44:03 +0000 (18:44 +0000)]
Merge "Delete simple reduction implementation."
David Gross [Thu, 2 Jun 2016 21:46:55 +0000 (14:46 -0700)]
Delete simple reduction implementation.
Bug:
27298560
Change-Id: I8a89c9df753d12ee8af06008d424e77bb916cd8f
(cherry picked from commit
4a4578530a1a5fb751ea5a7bfbff83f3ab669895)
Fredrik Roubert [Mon, 13 Jun 2016 12:00:14 +0000 (14:00 +0200)]
API updated for ICU4J 57.1
Bug:
27819846
Change-Id: I891853397ac1f4de58fd0687e7cab27bd270ac64
Treehugger Robot [Thu, 9 Jun 2016 21:10:28 +0000 (21:10 +0000)]
Merge "Unlock mBluetoothLock.readLock() instead of double-locking it"
Pavlin Radoslavov [Thu, 9 Jun 2016 19:58:07 +0000 (12:58 -0700)]
Unlock mBluetoothLock.readLock() instead of double-locking it
Bug:
29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
(cherry picked from commit
7ee53be300573c9bdc71607d32d4a642e4ad3dc8)
Treehugger Robot [Tue, 7 Jun 2016 21:14:21 +0000 (21:14 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF"
Pavlin Radoslavov [Thu, 2 Jun 2016 05:25:18 +0000 (22:25 -0700)]
Delay handleEnable() until Bluetooth state is OFF
During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.
Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.
Bug:
17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
(cherry picked from commit
e47ec14318f64c29bf16b5a6bb662bc19206d6b0)
Eric Laurent [Tue, 7 Jun 2016 18:00:28 +0000 (18:00 +0000)]
Merge "Delete Visualizer before lpJniStorage"
ganxiaolin [Mon, 6 Jun 2016 03:09:05 +0000 (11:09 +0800)]
Delete Visualizer before lpJniStorage
It is related to Change: Id17bea8a6ca7132042b9bfefed398a715c139be7
Fix ANR because of bug of Visualizer.
If lpJniStorage was delete first, callback_data_lock become a invalid value.
At mReceiver.periodicCapture() in CaptureThread, it will lock callback_data_lock.
Thus, CaptureThread will wait a invalid memory forever and visualizer wait CaptureThread exiting and causing ANR.
Signed-off-by: ganxiaolin <ganxiaolin@xiaomi.com>
Treehugger Robot [Fri, 3 Jun 2016 21:28:33 +0000 (21:28 +0000)]
Merge "Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService."
Treehugger Robot [Fri, 3 Jun 2016 17:42:38 +0000 (17:42 +0000)]
Merge "While turning OFF do not honor ON requests."
Sanket Agarwal [Thu, 21 Apr 2016 21:10:55 +0000 (14:10 -0700)]
While turning OFF do not honor ON requests.
Native stack does not handle being put from OFF -> ON state without
doing a complete cleanup. Hence instead of going from start -> ON -> OFF
-> cleanup it goes start -> ON -> OFF ->ON -> ... usually leads to race
conditions down the road in native.
This patch is a workaround so that we can throw away the requests if we
are in currently "turning off" phase. The side-effect would be that user
will need to turn it ON again. The race happens when the turn OFF time
is longer but usually it is found to be close to order of seconds hence
the wait should be bounded.
Bug: b/
28318203
Change-Id: I14f6633f31311e5b561e1dcbc8a9d6d2a5dd6fdc
songjinshi [Wed, 18 May 2016 11:55:32 +0000 (19:55 +0800)]
Fixes the system server crash issues caused by null pointer in
NetworkPolicyManagerService.
if the multi user occurs switch and remove then to getPackagesForUid
the return value will got null,because the user remove is not synced
with the getPackagesForUid,so we must check the return value for
getPackagesForUid to avoid the crash.
https://code.google.com/p/android/issues/detail?id=211972
Change-Id: If921582da86dbe862f2dad337b0a8d1f20593c99
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Shubham Ajmera [Thu, 2 Jun 2016 10:35:40 +0000 (10:35 +0000)]
Robert Greenwalt [Wed, 1 Jun 2016 18:15:15 +0000 (18:15 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
Vasco Brito [Wed, 1 Jun 2016 09:50:57 +0000 (10:50 +0100)]
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
This reverts commit
9a769a482861496686a4138a0a9b612a08fce8f8, reversing
changes made to
6fb921a61b0ca6bac8002e0fdbeb521453dce408.
Treehugger Robot [Tue, 31 May 2016 18:06:29 +0000 (18:06 +0000)]
Merge "Add 900 for Russia - Short code used by Sberbank."
Vasco Brito [Tue, 24 May 2016 18:23:20 +0000 (19:23 +0100)]
Add 900 for Russia - Short code used by Sberbank.
Sberbank SMS banking solution uses 900 short code.
They have requested this shortcode to be listed has premium to reduce banking fraud.
bug:
28423611
Change-Id: I82dfe012a1e55b2d025c24e50149fa01551a92ed
Signed-off-by: Vasco Brito <vascob@google.com>
Treehugger Robot [Sat, 28 May 2016 16:19:03 +0000 (16:19 +0000)]
Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support""
Greg Hackmann [Sat, 28 May 2016 13:07:22 +0000 (13:07 +0000)]
Revert "AlarmManagerService: remove legacy /dev/alarm support"
This reverts commit
f68cdb9cb4841765d9d55d4a95259e9c3bb3ecc1.
Change-Id: I13e954656771f32c6156b4c4adb52922bcd0717a
Treehugger Robot [Fri, 27 May 2016 21:12:15 +0000 (21:12 +0000)]
Merge "AlarmManagerService: remove legacy /dev/alarm support"
Greg Hackmann [Mon, 25 Apr 2016 20:30:34 +0000 (13:30 -0700)]
AlarmManagerService: remove legacy /dev/alarm support
We've removed the Android alarm driver from our supported kernels. It's
time to remove the userspace callers too: they make the native side of
AlarmManagerService more complex, and send the wrong signal about
/dev/alarm still being supported.
Bug:
28357356
Change-Id: I225d76c3f4e695a831d4419e050e8e178e1224b5
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Chih-hung Hsieh [Fri, 27 May 2016 17:56:46 +0000 (17:56 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator."
Alan Viverette [Fri, 27 May 2016 14:18:20 +0000 (14:18 +0000)]
Merge "Chronometer: Update the value only if displayed on screen"
Miao Wang [Wed, 25 May 2016 22:28:34 +0000 (22:28 +0000)]
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation."
Miao Wang [Wed, 25 May 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Update documentation about copyTo and copyFrom."
Miao Wang [Wed, 13 Apr 2016 23:43:10 +0000 (16:43 -0700)]
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Bug:
28177406
Change-Id: Icccf35857cf29f827a78704e7751c8791cda0d7b
(cherry picked from commit
c242fa6b5d7b8624b5ce710c1e2740c5bb9679dd)
Miao Wang [Fri, 1 Apr 2016 22:10:47 +0000 (15:10 -0700)]
Update documentation about copyTo and copyFrom.
Bug:
23159764
Bug:
26862970
- Add detailed description of AutoPadding
- Add comments to all the copy related APIs.
- Fix typos in the comments.
Change-Id: I2d045e0d90efd94f1407f88d3e35bcd42ea93fb9
(cherry picked from commit
3231e8e0220614f7b1628493da5f276f19faab7c)
Treehugger Robot [Wed, 25 May 2016 01:07:47 +0000 (01:07 +0000)]
Merge "Add missing "try ... finally" safeguards"
Pavlin Radoslavov [Tue, 24 May 2016 22:28:41 +0000 (15:28 -0700)]
Add missing "try ... finally" safeguards
Safeguards for code protected by ReentrantReadWriteLock.
Bug:
28734075
Bug:
28799467
Change-Id: Ib7f598a92e8df6bd855ca48cdd094c1c73a935f2
(cherry picked from commit
e957a8a0b4100d001f79c866e7904d2426ac8da0)
Treehugger Robot [Tue, 24 May 2016 23:17:36 +0000 (23:17 +0000)]
Merge "Reduced the impact of "synchronized" statements"
Pavlin Radoslavov [Mon, 23 May 2016 05:16:41 +0000 (22:16 -0700)]
Reduced the impact of "synchronized" statements
* Removed "synchronized" statements that are not needed
* Replaced "synchronized" statements with Read/Write lock as
appropriate. The lock protects the access to and the setting of
BluetoothAdapter.mService and BluetoothManagerService.mBluetooth and
associated state.
Bug:
28734075
Bug:
28799467
Change-Id: I8f8281c505f0a1ae0add1e14a3caba1f5b2a98e4
(cherry picked from commit
eb50a39e98acb78d16465041bb5c172aa1637e97)
Treehugger Robot [Tue, 24 May 2016 19:39:17 +0000 (19:39 +0000)]
Merge "Fix misc-macro-parentheses warnings in common_time."
Treehugger Robot [Tue, 24 May 2016 18:33:48 +0000 (18:33 +0000)]
Merge "Fix misc-macro-parentheses warnings in audio media jni."
Robert Greenwalt [Tue, 24 May 2016 15:57:09 +0000 (15:57 +0000)]
Merge "Add free short codes for Direct Carrier Billing."
Sergio Giro [Tue, 24 May 2016 11:56:50 +0000 (11:56 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
Sergio Giro [Tue, 17 May 2016 15:52:33 +0000 (16:52 +0100)]
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Instead of in activity thread. That way, we can warm up (ie,
precompute cached values) this provider and AndroidBCWorkaroundProvider
(which are installed together) so that the computation doesn't
happen in the app. As a result, the time spent in the first call to
SSLSocketFactory.getDefault() decreases by ~5ms in angler userdebug.
Measured with an app calling SSLSocketFactory.getDefault in onCreate
and timed it with System.currentTimeMillis() .
(cherry picked from commit
69de32071c8ca7fa2277e4340a320b7df6fe963d)
Bug:
28545496
Change-Id: Ic4e11d058fb404eaa92db925a3e765fc3bef7ae2
Vasco Brito [Thu, 19 May 2016 16:30:43 +0000 (17:30 +0100)]
Add free short codes for Direct Carrier Billing.
All short codes are used by DCB on Google Play. Fixed default pattern for countries added recently.
Internal bug b/
27911552.
Change-Id: I9b4a2bb30f2c6de058cc2adb75b67c4f69182198
Signed-off-by: Vasco Brito <vascob@google.com>
Adam Lesinski [Thu, 19 May 2016 23:25:09 +0000 (23:25 +0000)]
Merge "Fix misc-macro-parentheses warnings in aapt and androidfw."
Treehugger Robot [Thu, 19 May 2016 23:24:03 +0000 (23:24 +0000)]
Merge "Fix misc-macro-parentheses warnings in services jni."
Treehugger Robot [Thu, 19 May 2016 23:02:55 +0000 (23:02 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui and graphic jni."
Chih-Hung Hsieh [Thu, 19 May 2016 22:29:38 +0000 (15:29 -0700)]
Fix misc-macro-parentheses warnings in services jni.
Bug:
28705665
Change-Id: Iaf965875b667e45e1557e447de7988f729adfd52
Chih-Hung Hsieh [Thu, 19 May 2016 22:25:50 +0000 (15:25 -0700)]
Fix misc-macro-parentheses warnings in hwui and graphic jni.
Bug:
28705665
Change-Id: I7d1eb38a713fe6cc7f41a3cc3f2f9d0aa0114b2c
Chih-Hung Hsieh [Thu, 19 May 2016 22:21:42 +0000 (15:21 -0700)]
Fix misc-macro-parentheses warnings in common_time.
Bug:
28705665
Change-Id: Ibdab4631f0e692b8a291faecdeb4a6062f906ea5
Chih-Hung Hsieh [Thu, 19 May 2016 22:19:22 +0000 (15:19 -0700)]
Fix misc-macro-parentheses warnings in aapt and androidfw.
Bug:
28705665
Change-Id: Iac353e66718aadad384183cf300330695df25909
Chih-Hung Hsieh [Thu, 19 May 2016 22:14:54 +0000 (15:14 -0700)]
Fix misc-macro-parentheses warnings in audio media jni.
Bug:
28705665
Change-Id: Iff476943a0a2c2ae68778d1f4bca5d3e9e04bd26
Chih-Hung Hsieh [Thu, 19 May 2016 22:10:07 +0000 (15:10 -0700)]
Fix misc-macro-parentheses warnings in DngCreator.
Bug:
28705665
Change-Id: Ia9b513411456b34b3e508793166ddb17e34dec13
Andre Eisenbach [Thu, 19 May 2016 21:59:25 +0000 (21:59 +0000)]
Merge "Fix GATT autoConnect race condition"
Sungki Kim [Thu, 19 May 2016 17:18:07 +0000 (10:18 -0700)]
Fix GATT autoConnect race condition
As pointed out here:
https://code.google.com/p/android/issues/detail?id=69834
registerApp() causes onClientRegistered() to happen before autoConnect
is set. This patch fixes that.
Bug:
28861330
Change-Id: Ie1174c0f224f5084178439420b383164d22d542c
Shubham Ajmera [Thu, 19 May 2016 09:22:34 +0000 (10:22 +0100)]
Track lilbcore change
3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5
Bug:
27331465
Change-Id: I1a3dd1a550b081535eb8bf79b43edff46da58d6b
Alex Light [Wed, 18 May 2016 21:05:41 +0000 (21:05 +0000)]
Merge "Make fake libart for misbehaving apps be loaded."
Alex Light [Wed, 20 Apr 2016 21:07:43 +0000 (14:07 -0700)]
Make fake libart for misbehaving apps be loaded.
Bug:
27775991
Change-Id: Ie4eba211e876ec0643ce6ecf6a110f3cb5e0f57e
(cherry picked from commit
20ed24fc0cbbada36e84dc1f1e86946db6e6c5a4)
Neil Fuller [Wed, 18 May 2016 11:45:35 +0000 (11:45 +0000)]
Merge "Add support for ICU data pinning in the Zygote"
Neil Fuller [Mon, 9 May 2016 15:55:36 +0000 (16:55 +0100)]
Add support for ICU data pinning in the Zygote
Upstream ICU caches use SoftReferences. On Android this means
that useful cached data initialized in the Zygote are "lost" when
the Zygote GCs and cannot be shared with apps. This change makes use
of an Android patch to ICU to ensure References created during
Zygote initialization are "strong". i.e. they are never collected.
This prevents them being GCd and ensures they can be shared between
applications.
After switching ICU to use strong references, this change
also creates DecimalFormatSymbols objects for common ULocales
(ROOT, US and the user's default, if different). DecimalFormatSymbols
makes use of an ICU Reference cache and this alone has been shown to
improve the construction time of java.text.DecimalFormat by 1-1.5
milliseconds on a Seed device. This saving applies the first time one
is created in each app for each locale, and again if SoftReferences
have been cleared.
The cost to the heap size of the Zygote has been measured at ~107k.
This value will change as more caches are switched to use the new
CacheValue class.
Formatting is typically performed on the UI thread and the intention
of this change is to reduce app start up time and jank in apps like
the Dialer which do a lot of formatting when scrolling lists. The
change may also enable more virtual memory page-sharing between
apps, though this is not the specific goal.
Bug:
28326526
Change-Id: Ia2c73f6525f05b1aa81e57a31eed1616decf6bb5
Sergio Giro [Tue, 17 May 2016 15:50:50 +0000 (15:50 +0000)]
Merge "ZygoteInit: warm up JCA providers during preload"
Treehugger Robot [Tue, 17 May 2016 14:07:14 +0000 (14:07 +0000)]
Merge "Synchronize access of mSubscriptions"
Sergio Giro [Fri, 13 May 2016 15:34:46 +0000 (16:34 +0100)]
ZygoteInit: warm up JCA providers during preload
This makes the time spent in the first call of an app to
SSLSocketFactory.getDefault() drop from ~240 ms to ~50 ms. In M
it was around ~6ms. This is due to the fact that, while instantiating
the default factory, all providers are initialized.
In order to obtain the timings above, I created an app calling
SSLSocketFactory.getDefault in onCreate and timed it
with System.currentTimeMillis() .
(cherry picked from commit
6cb7b1c4765e9bc5175056826523dbd88426e9aa)
Bug:
28545496
Change-Id: Ic5aab3ece609d9fef06fee4ccb83d8371af075b2
Andre Eisenbach [Sat, 14 May 2016 00:11:42 +0000 (00:11 +0000)]
Merge "Fix GATT Characteristic write type serialization"
Treehugger Robot [Fri, 13 May 2016 17:46:41 +0000 (17:46 +0000)]
Merge "Fix "TelephonyRegistry notifies wrong data status""
Elliott Hughes [Fri, 13 May 2016 15:04:18 +0000 (15:04 +0000)]
Merge "Make android_net_NetUtils include what it actually uses."
Shibin George [Sat, 7 May 2016 10:46:50 +0000 (16:16 +0530)]
Synchronize access of mSubscriptions
Introduction of setConfigAsync to set Zen mode config
asynchronously leads to synchronization issues like
ArrayIndexOutOfBoundsException while accessing mSubscriptions.
Change-Id: I6f72d894605498e0a4b48eb58af19851be53b9dc
xu.peng [Tue, 22 Mar 2016 10:21:28 +0000 (18:21 +0800)]
Fix "TelephonyRegistry notifies wrong data status"
TelephonyRegistry should notify data status by correct subId,
otherwise in some case, SIM1 data status will be overried
by SIM2 data status.
Such as screen on/off action.If in fact SIM1 is data connected
to download something, but SIM2 is not,then sreen off,
both SIM1 and SIM2 will be notified to update data status.
Then SIM1 data status will be overried by SIM2 to be "no data
connected", before SIM1 data downloading is finished,SIM1
will not be able to show "data conneced" status.
Change-Id: Ia7d0767b3b4520294ee0d024903f7522cb0a0110
Treehugger Robot [Thu, 12 May 2016 22:25:20 +0000 (22:25 +0000)]
Merge "Fix documentation bug in SQLiteDatabase"
Treehugger Robot [Thu, 12 May 2016 22:17:32 +0000 (22:17 +0000)]
Merge "ContentValues: improve documentation"
Steve Pomeroy [Tue, 9 Oct 2012 19:37:34 +0000 (15:37 -0400)]
ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.
Change-Id: Iddf54da093e97c32da2568eab8802b1b2715303b
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
Steve Pomeroy [Thu, 14 Mar 2013 04:42:10 +0000 (00:42 -0400)]
Fix documentation bug in SQLiteDatabase
The documentation incorrectly states that, "[insertWithOnConflict
returns] the primary key of the existing row if the input param
'conflictAlgorithm' = CONFLICT_IGNORE". Unfortunately, SQLite does
not provide such functionality.
Close: https://code.google.com/p/android/issues/detail?id=13045
Change-Id: Ife919c4dcf7bf703b692d338d1fb5844a532dd39
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
Chad Brubaker [Thu, 12 May 2016 19:18:47 +0000 (19:18 +0000)]
Merge "Support TrustedCertificateStore.findAllIssuers"
Chad Brubaker [Fri, 18 Dec 2015 21:43:28 +0000 (13:43 -0800)]
Support TrustedCertificateStore.findAllIssuers
(cherry-picked from commit
aa6c3c3e252252b80c3900bd4c1ff27d37265c6d)
Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
Elliott Hughes [Wed, 11 May 2016 22:18:13 +0000 (15:18 -0700)]
Make android_net_NetUtils include what it actually uses.
Bug: http://b/
28519060
Change-Id: I49dcd358d3fc8e0ba5c5e0b50a0f5dcc63281d22
Miao Wang [Wed, 11 May 2016 19:13:00 +0000 (19:13 +0000)]
Merge "[RenderScript] Interrupt mMessageThread when tearing down context."
Joachim Sauer [Wed, 11 May 2016 13:47:08 +0000 (13:47 +0000)]
Merge "Fix AbstractStringBuilder gaining extra APIs."
Joachim Sauer [Tue, 10 May 2016 14:09:08 +0000 (15:09 +0100)]
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
Jakub Pawlowski [Fri, 1 Apr 2016 14:17:15 +0000 (07:17 -0700)]
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
Miao Wang [Tue, 10 May 2016 23:44:11 +0000 (16:44 -0700)]
[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
Hans Boehm [Tue, 10 May 2016 23:41:30 +0000 (23:41 +0000)]
Merge "Clear more native pointers in finalizers"
Hans Boehm [Tue, 10 May 2016 20:01:22 +0000 (13:01 -0700)]
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
Yi Kong [Mon, 9 May 2016 16:40:38 +0000 (16:40 +0000)]
Yi Kong [Thu, 5 May 2016 10:32:54 +0000 (11:32 +0100)]
Track libcore change
e2f147b9b14c7645f29e92758f811a18258feef4
Bug:
28582540
Change-Id: Ic944995957aa1a5ec65ecab2a8d4b8587094ccc8
Calin Juravle [Mon, 9 May 2016 15:43:41 +0000 (15:43 +0000)]
Merge "Read -Xjittransitionweight from system properties."
Treehugger Robot [Fri, 6 May 2016 23:20:01 +0000 (23:20 +0000)]
Merge "Fix divergent equals and hashCode behavior"
Ajay Panicker [Fri, 6 May 2016 23:18:51 +0000 (23:18 +0000)]
Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected"
Ajay Panicker [Fri, 6 May 2016 23:18:32 +0000 (23:18 +0000)]
Merge "Protect TRANSFER_COMPLETE broadcast"
Pavlin Radoslavov [Fri, 6 May 2016 19:05:47 +0000 (12:05 -0700)]
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
Hans Boehm [Fri, 6 May 2016 17:25:47 +0000 (17:25 +0000)]
Merge "Improve grammar in startService() documentation."
Ajay Panicker [Fri, 6 May 2016 01:59:44 +0000 (18:59 -0700)]
Protect TRANSFER_COMPLETE broadcast
Bug:
28621801
Change-Id: Ia90abd00694ae80000f59ee0a17826592fd2159b
Hans Boehm [Thu, 5 May 2016 20:09:28 +0000 (13:09 -0700)]
Improve grammar in startService() documentation.
Change-Id: If72f710caa2e85512636d6f7ddacff2426cfb835
Amith Yamasani [Thu, 5 May 2016 17:45:53 +0000 (17:45 +0000)]
Merge "Fix the issue that App crash on startForeground."
Neil Fuller [Thu, 5 May 2016 15:06:47 +0000 (15:06 +0000)]
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
Wang Le [Wed, 4 May 2016 11:24:35 +0000 (19:24 +0800)]
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>
Neil Fuller [Wed, 4 May 2016 17:46:45 +0000 (18:46 +0100)]
Track external/icu API changes for factory registration
Bug:
28583844
(cherry picked from commit
e7fda97fff236afa5597da7df69b1462390c5a14)
Change-Id: I4a411184fe002ea812349e49d07d17c62c66d842
Paul Duffin [Thu, 31 Mar 2016 12:15:03 +0000 (13:15 +0100)]
ICU4J: Hide constants that can change between releases
Bug:
27830659
(cherry picked from commit
71498f107ce41a1c3f2bc612fa214579aab19db1)
Change-Id: I007ed563d78cdf36ddd0e36ae72f118189772e5c
Paul Duffin [Tue, 22 Mar 2016 16:53:41 +0000 (16:53 +0000)]
Remove RawCollationKey/ByteArrayWrapper from the public API
Bug:
22023363
(cherry picked from commit
baa72515f60af798ea9a03e53a78a7d95834ceff)
Change-Id: If81d9a67ba9edf15688f4369390a6734d92a8f3c
Vikas Marwaha [Tue, 3 May 2016 20:50:39 +0000 (20:50 +0000)]
Merge "Fix issue #
25727069: Top sleeping activity overrides foreground service"
Ajay Panicker [Tue, 3 May 2016 18:14:07 +0000 (11:14 -0700)]
List the CONNECTION_STATE_CHANGED broadcast for MAP as protected
Bug:
28527879
Change-Id: Ifb2db87677e92022814bb9704c26009d249ac6ce
Ajay Panicker [Tue, 3 May 2016 17:22:57 +0000 (17:22 +0000)]
Merge "List the SDP_RECORD broadcast as protected"
Ajay Panicker [Tue, 19 Apr 2016 17:16:54 +0000 (10:16 -0700)]
List the SDP_RECORD broadcast as protected
Bug:
28257589
Change-Id: I97ef91fa3a7f7ef62fd96ca079e0a6d5a957bc71