OSDN Git Service
Geoff Mendal [Mon, 1 Feb 2016 20:31:03 +0000 (20:31 +0000)]
Import translations. DO NOT MERGE am:
9ff5be7674 -s ours
am:
4889505304 -s ours
* commit '
4889505304b7763e23bd847f833029f3d379ffe7':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 20:26:24 +0000 (20:26 +0000)]
Import translations. DO NOT MERGE
am:
9ff5be7674 -s ours
* commit '
9ff5be7674e3a925dc371bc812b220f3c476c501':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 20:21:06 +0000 (12:21 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26887782
Change-Id: If6bc1bd3f277f0289aecb7c063f899363079c248
Narayan Kamath [Mon, 1 Feb 2016 11:38:27 +0000 (11:38 +0000)]
Merge "close file in PersistentDataBlockService jni"
am:
c71c44a524
* commit '
c71c44a524e3b5f1f6a9864a0f03b20acd153a6d':
close file in PersistentDataBlockService jni
Narayan Kamath [Mon, 1 Feb 2016 11:31:22 +0000 (11:31 +0000)]
Merge "close file in PersistentDataBlockService jni"
Lianwei Wang [Thu, 14 Jan 2016 02:42:35 +0000 (18:42 -0800)]
close file in PersistentDataBlockService jni
The opened file should be closed.
Change-Id: I8a43b338c5c9eb0a5b1b5329eec767c6395bc7eb
Signed-off-by: Lianwei Wang <lianwei.wang@gmail.com>
Kenny Root [Mon, 1 Feb 2016 11:05:01 +0000 (11:05 +0000)]
Merge changes from topic \'sni\'
am:
c76789d35a
* commit '
c76789d35a7ca92c0b334cc6cf4a44a0044b2a44':
Track libcore change
Track libcore change
Kenny Root [Mon, 1 Feb 2016 10:58:14 +0000 (10:58 +0000)]
Merge changes from topic 'sni'
* changes:
Track libcore change
Track libcore change
Kenny Root [Fri, 15 Jan 2016 23:10:02 +0000 (15:10 -0800)]
Track libcore change
This tracks libcore change I5972095a2b51da50249016fda11ed4c046af4211
which adds honor-cipher-suite-ordering API.
Change-Id: I7f17e42561c76b4c0a3f451d1126458480c90273
Kenny Root [Fri, 15 Jan 2016 23:10:02 +0000 (15:10 -0800)]
Track libcore change
This tracks libcore change I23b85308ac25fd00307d37cff1d93ee6c2bfba98
which adds SNI support.
Change-Id: I93d8a4b07cc1f599123565a5c0672dd7848f05bf
Stephen Hines [Sat, 30 Jan 2016 17:52:28 +0000 (17:52 +0000)]
Merge "Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API."
am:
49aee686d8
* commit '
49aee686d8c1c888fd0dd2778c19d5968dae0252':
Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API.
Stephen Hines [Sat, 30 Jan 2016 17:44:52 +0000 (17:44 +0000)]
Merge "Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API."
Neil Fuller [Fri, 29 Jan 2016 16:28:22 +0000 (16:28 +0000)]
Merge "Unhide @Repeatable"
am:
31312ecfd2
* commit '
31312ecfd2b701c6b9fdc34156e8a12df3022c25':
Unhide @Repeatable
Neil Fuller [Fri, 29 Jan 2016 16:19:36 +0000 (16:19 +0000)]
Merge "Unhide @Repeatable"
Neil Fuller [Fri, 29 Jan 2016 16:18:32 +0000 (16:18 +0000)]
Merge "Unhide @FunctionalInterface"
am:
45a1ea33a4
* commit '
45a1ea33a4e0eb7f1204c03611caf4699ed91d47':
Unhide @FunctionalInterface
Neil Fuller [Tue, 19 Jan 2016 00:34:04 +0000 (16:34 -0800)]
Unhide @Repeatable
Bug:
26623636
(cherry-picked from commit
c98d6a4c19ab9d5620c05b0f5ccb3b91a9eaba15)
Change-Id: I6378d5780def3a26d340f213973a4094e97426f5
Neil Fuller [Fri, 29 Jan 2016 16:10:13 +0000 (16:10 +0000)]
Merge "Unhide @FunctionalInterface"
Neil Fuller [Tue, 19 Jan 2016 00:20:56 +0000 (16:20 -0800)]
Unhide @FunctionalInterface
Bug:
26623636
(cherry-picked from commit
c5064327eae625b67013736048e35388decce52b)
Change-Id: I05fc731356891c4fdba79701b1b87384841d56ca
Neil Fuller [Fri, 29 Jan 2016 15:40:21 +0000 (15:40 +0000)]
Merge "Unhide Method.isDefault"
am:
b05fa3e841
* commit '
b05fa3e841c37ae8089cf3cffc28439ced56884b':
Unhide Method.isDefault
Neil Fuller [Fri, 29 Jan 2016 15:31:38 +0000 (15:31 +0000)]
Merge "Unhide Method.isDefault"
Neil Fuller [Sat, 23 Jan 2016 21:29:36 +0000 (13:29 -0800)]
Unhide Method.isDefault
Bug:
26623636
(cherry-picked from commit
20a4d572263cc288af4bd99849d1acc9e956ff06)
Change-Id: I5fd46b521d5098c72585b2acf06beaea4b9fa93f
Adam Lesinski [Thu, 28 Jan 2016 19:30:10 +0000 (19:30 +0000)]
Merge "Don\'t change screen on time on time changes" into mnc-dr1.5-dev am:
c46f6db46e
am:
9548f85d9d
* commit '
9548f85d9dc4207c3d1a3eed51f98131f8210c5f':
Don't change screen on time on time changes
Adam Lesinski [Thu, 28 Jan 2016 19:24:44 +0000 (19:24 +0000)]
Merge "Don\'t change screen on time on time changes" into mnc-dr1.5-dev
am:
c46f6db46e
* commit '
c46f6db46ed5474fbe8312a1229b59debbbae994':
Don't change screen on time on time changes
Adam Lesinski [Thu, 28 Jan 2016 19:20:49 +0000 (19:20 +0000)]
Merge "Don't change screen on time on time changes" into mnc-dr1.5-dev
Pavlin Radoslavov [Thu, 28 Jan 2016 02:12:42 +0000 (02:12 +0000)]
Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user"
am:
26fdbc1833
* commit '
26fdbc18337a8e9d16e18255e39ce7a16e83d57b':
Grant CAP_WAKE_ALARM to the Bluetooth process for any user
Adam Lesinski [Wed, 27 Jan 2016 02:18:19 +0000 (18:18 -0800)]
Don't change screen on time on time changes
Screen on time should be measured in elapsed realtime, not wallclock.
Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).
When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/
22716352)
Bug:
26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7
Joe LaPenna [Thu, 28 Jan 2016 01:17:24 +0000 (01:17 +0000)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient. am:
7528f57c4d -s ours am:
2bccc45cec -s ours
am:
b47972df80 -s ours
* commit '
b47972df80ffa40c4ea8541f96275c25ed939d7b':
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
Joe LaPenna [Thu, 28 Jan 2016 01:12:36 +0000 (01:12 +0000)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient. am:
7528f57c4d -s ours
am:
2bccc45cec -s ours
* commit '
2bccc45cec5201c5b613134ebb0b398bc45483ef':
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
Joe LaPenna [Thu, 28 Jan 2016 01:06:28 +0000 (01:06 +0000)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
am:
7528f57c4d -s ours
* commit '
7528f57c4ddbde1c6d0a2a352bd8a1af43711013':
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
Pavlin Radoslavov [Thu, 28 Jan 2016 00:52:41 +0000 (00:52 +0000)]
Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user"
Pavlin Radoslavov [Thu, 28 Jan 2016 00:22:15 +0000 (16:22 -0800)]
Grant CAP_WAKE_ALARM to the Bluetooth process for any user
Use multiuser_get_app_id(uid) to check for AID_BLUETOOTH
and allow the CAP_WAKE_ALARM capability for any user.
Bug:
26784675
Change-Id: I11641e212b7c815e9137ae5620da6ad55f95a899
Joe LaPenna [Fri, 22 Jan 2016 15:11:49 +0000 (07:11 -0800)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
See thread: "key presses & Ambient"
BUG:
25964771
BUG:
26524301
Change-Id: I914edd447c38678a06d27677be4597c0ee384635
Miao Wang [Wed, 27 Jan 2016 21:43:27 +0000 (21:43 +0000)]
Merge "[RenderScript] Implement APIs for better multi-frame process support."
am:
6ebdbfa549
* commit '
6ebdbfa5498c486a96f2b8b07858eb1a25a6d08a':
[RenderScript] Implement APIs for better multi-frame process support.
Miao Wang [Wed, 27 Jan 2016 21:30:00 +0000 (21:30 +0000)]
Merge "[RenderScript] Implement APIs for better multi-frame process support."
Marie Janssen [Wed, 27 Jan 2016 20:49:55 +0000 (20:49 +0000)]
Merge "IBluetooth: remove dump(), support arguments"
am:
d63847a866
* commit '
d63847a86680df271cc518a6baaac30a7e07c9f5':
IBluetooth: remove dump(), support arguments
Marie Janssen [Wed, 27 Jan 2016 20:42:07 +0000 (20:42 +0000)]
Merge "IBluetooth: remove dump(), support arguments"
Przemyslaw Szczepaniak [Wed, 27 Jan 2016 15:11:51 +0000 (15:11 +0000)]
Merge "Remove java.nio.file package"
am:
804e1e8c15
* commit '
804e1e8c152e46e7c3b47a0e73b4dabd83ba7dcf':
Remove java.nio.file package
Przemyslaw Szczepaniak [Wed, 27 Jan 2016 15:03:39 +0000 (15:03 +0000)]
Merge "Remove java.nio.file package"
Przemyslaw Szczepaniak [Wed, 27 Jan 2016 11:14:53 +0000 (11:14 +0000)]
Remove java.nio.file package
This package has no test coverage, and we don't
know if it was ported properly. This package will
be added in future, with a test suite.
Bug:
26786186
Change-Id: I1bd7989837040da06cd914d366e9674d6b36fe86
Miao Wang [Tue, 27 Oct 2015 00:44:10 +0000 (17:44 -0700)]
[RenderScript] Implement APIs for better multi-frame process support.
Bug:
23535524
Two APIs added for multiframe processing:
- createAllocations(...): To create an array of Allocations sharing the
same Type and Usage. For USAGE_IO_INPUT Allocations, they also share
the same BufferQueue.
- getTimeStamp(): API to retrieve the time stamp associated with the
most recent buffer.
Change-Id: I6b7b35d7dca5e87ee2f3db2ee17cb9cf824bcfe1
Nick Vaccaro [Tue, 26 Jan 2016 20:34:20 +0000 (20:34 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
907108ca0f -s ours am:
3e413dfcdd -s ours
am:
f5958497d3 -s ours
* commit '
f5958497d36ac64ed1f2bbbd80cb0a3a24e94f13':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:21:37 +0000 (20:21 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
907108ca0f -s ours
am:
3e413dfcdd -s ours
* commit '
3e413dfcddf27f1a44012e4c1d2b80bdcacd1e26':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:16:15 +0000 (20:16 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
am:
907108ca0f -s ours
* commit '
907108ca0f4e69dd170a507c5830591712ec5967':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:13:26 +0000 (20:13 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
Peng Xu [Fri, 22 Jan 2016 08:44:28 +0000 (00:44 -0800)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Bug:
26481493
Bug:
26447970
Change-Id: Ibeaf5a5e39f0dc552cf115d2834a1ec28ecef5ab
Przemyslaw Szczepaniak [Tue, 26 Jan 2016 10:47:44 +0000 (10:47 +0000)]
Merge "Fix incorrect @hide usage in libcore"
am:
1f3aaf82cb
* commit '
1f3aaf82cba11c55abc25b551e28344f04a1524a':
Fix incorrect @hide usage in libcore
Przemyslaw Szczepaniak [Tue, 26 Jan 2016 10:37:47 +0000 (10:37 +0000)]
Merge "Fix incorrect @hide usage in libcore"
Przemyslaw Szczepaniak [Fri, 22 Jan 2016 10:21:29 +0000 (10:21 +0000)]
Fix incorrect @hide usage in libcore
@hide annotation is only effective in Javadoc.
Bug:
26689841
Change-Id: I6e924b7452423b25d7258bb174e5b1601302c907
(cherry picked from commit
a0dda9ca9d69fdeff620c7986375589e2a4d8c42)
Wei Liu [Tue, 26 Jan 2016 03:06:09 +0000 (03:06 +0000)]
Add a null check before reference networkInfo. am:
b8eaf45e1d am:
dca8f10031
am:
a12d383117
* commit '
a12d3831178616a171382f1546812c26245af2d0':
Add a null check before reference networkInfo.
Wei Liu [Tue, 26 Jan 2016 01:57:31 +0000 (01:57 +0000)]
Add a null check before reference networkInfo. am:
b8eaf45e1d
am:
dca8f10031
* commit '
dca8f10031f33c7c85577fa1abcc26d560c90388':
Add a null check before reference networkInfo.
Wei Liu [Tue, 26 Jan 2016 01:52:12 +0000 (01:52 +0000)]
Add a null check before reference networkInfo.
am:
b8eaf45e1d
* commit '
b8eaf45e1df007fc4f5a11bb58491abaef39cd57':
Add a null check before reference networkInfo.
Miao Wang [Tue, 26 Jan 2016 01:21:51 +0000 (01:21 +0000)]
Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer"
am:
ed50f333fb
* commit '
ed50f333fb28905f085473d3150f906f0106295a':
[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer
Miao Wang [Tue, 26 Jan 2016 01:11:41 +0000 (01:11 +0000)]
Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer"
Miao Wang [Wed, 25 Nov 2015 19:21:13 +0000 (11:21 -0800)]
[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer
Bug:
25926361
Bug:
23535524
- Construct the ByteBuffer using the AllocationGetPointer.
- Add an API to query the stride of the allocation.
- Both ByteBuffer and Stride will be cached for normal Allocations.
if using USAGE_IO, since after each ioReceive, the mallocPtr will
change, getByteBuffer will always create a new one using the most
up-to-date mallocPtr.
Change-Id: I5e84b6690e83bb062c383043275524d0e51e46eb
Wei Liu [Mon, 25 Jan 2016 18:32:27 +0000 (10:32 -0800)]
Add a null check before reference networkInfo.
b/
26758858
Change-Id: If335ece223114dbfb6b08391f18a09467f377cf1
Dimitry Ivanov [Mon, 25 Jan 2016 18:16:44 +0000 (18:16 +0000)]
Merge "Remove path to the apk from the permittedPath"
am:
5194d217b8
* commit '
5194d217b81f7375f4d60c35b604bac8bffc51e7':
Remove path to the apk from the permittedPath
Chad Brubaker [Mon, 25 Jan 2016 18:14:39 +0000 (18:14 +0000)]
Merge "Add getApplicationConfigForPackage"
am:
7519dce8c2
* commit '
7519dce8c2742b8abcc884a930552c8372b777fd':
Add getApplicationConfigForPackage
Dimitry Ivanov [Mon, 25 Jan 2016 18:04:18 +0000 (18:04 +0000)]
Merge "Remove path to the apk from the permittedPath"
Chad Brubaker [Mon, 25 Jan 2016 18:03:13 +0000 (18:03 +0000)]
Merge "Add getApplicationConfigForPackage"
Martijn Coenen [Mon, 25 Jan 2016 09:56:20 +0000 (09:56 +0000)]
Merge "Implementation of HCE for NFC-F."
am:
e168012ff2
* commit '
e168012ff21408f8be85040bb4ac977061519f62':
Implementation of HCE for NFC-F.
Martijn Coenen [Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)]
Merge "Implementation of HCE for NFC-F."
Chad Brubaker [Sat, 23 Jan 2016 05:48:07 +0000 (21:48 -0800)]
Add getApplicationConfigForPackage
This allows services which make network connections on behalf of
applications to honor the application's network security policy.
Change-Id: I562b7bd0eb20f2f8c9f8342c211166d4e3397780
Jorim Jaggi [Sat, 23 Jan 2016 02:18:13 +0000 (02:18 +0000)]
Merge "NullPointerException when starting VoiceInteractionManagerService"
am:
b7fbe1104f
* commit '
b7fbe1104fd93b426dd6a6f2ed9dfc9cb12b4dd8':
NullPointerException when starting VoiceInteractionManagerService
Jorim Jaggi [Sat, 23 Jan 2016 02:09:36 +0000 (02:09 +0000)]
Merge "NullPointerException when starting VoiceInteractionManagerService"
Deepanshu Gupta [Sat, 23 Jan 2016 00:02:05 +0000 (00:02 +0000)]
Merge "Remove GregorianCalendar hack"
am:
187c022bf1
* commit '
187c022bf187f137d48d9031c43cfc233c9fc158':
Remove GregorianCalendar hack
Deepanshu Gupta [Fri, 22 Jan 2016 23:53:07 +0000 (23:53 +0000)]
Merge "Remove GregorianCalendar hack"
Thierry Strudel [Fri, 22 Jan 2016 22:28:41 +0000 (22:28 +0000)]
Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev am:
0064c4c793
am:
e8b476e8e8
* commit '
e8b476e8e81ee8bc4fe70fbc78db2f496b2aa023':
Don't assume kernel tick is 100Hz
Thierry Strudel [Fri, 22 Jan 2016 22:20:30 +0000 (22:20 +0000)]
Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev
am:
0064c4c793
* commit '
0064c4c79341bcb47bcb5b9ff568871f34f1dc63':
Don't assume kernel tick is 100Hz
Thierry Strudel [Fri, 22 Jan 2016 22:07:32 +0000 (22:07 +0000)]
Merge "Don't assume kernel tick is 100Hz" into mnc-dr1.5-dev
Dimitry Ivanov [Fri, 22 Jan 2016 21:20:29 +0000 (13:20 -0800)]
Remove path to the apk from the permittedPath
Bug: http://b/
26732624
Bug: http://b/
22548808
Change-Id: Idc63550f9ab67d30aaa0a1fd1b2d19545c07d1b9
Amith Yamasani [Fri, 22 Jan 2016 20:58:46 +0000 (20:58 +0000)]
Check apps idle states on time changes am:
c465e71cdc
am:
d4bd4cb4b1
* commit '
d4bd4cb4b1faa8663cc8dde4d9bab15a9ec764d3':
Check apps idle states on time changes
Amith Yamasani [Fri, 22 Jan 2016 20:51:34 +0000 (20:51 +0000)]
Check apps idle states on time changes
am:
c465e71cdc
* commit '
c465e71cdc401e1565c29a895a5c6d366ba5344c':
Check apps idle states on time changes
Deepanshu Gupta [Fri, 22 Jan 2016 19:11:57 +0000 (11:11 -0800)]
Remove GregorianCalendar hack
Bug: http://b.android.com/199424
Change-Id: I589d153e1f57b6302c6fe3c031c5c63e33ad9996
Amith Yamasani [Fri, 22 Jan 2016 19:27:16 +0000 (11:27 -0800)]
Check apps idle states on time changes
And ensure that the listeners are informed of app standby transitions
that might occur during time changes.
Fix for apps that sometimes don't have network access until reboot.
Bug:
26488100
Change-Id: Ic342c188a6cd19faee88f50b2c6a342a6968cb23
David Gross [Fri, 22 Jan 2016 17:07:59 +0000 (17:07 +0000)]
Merge "Add general reduction plumbing starting with Java Script::reduce()."
am:
fca558c549
* commit '
fca558c5490e319448ce69d1f526f5a446bb3045':
Add general reduction plumbing starting with Java Script::reduce().
David Gross [Fri, 22 Jan 2016 17:00:43 +0000 (17:00 +0000)]
Merge "Add general reduction plumbing starting with Java Script::reduce()."
Yoshinobu Ito [Fri, 22 Jan 2016 09:14:18 +0000 (18:14 +0900)]
Implementation of HCE for NFC-F.
This impementation includes HCE(Host-based Card Emulation) for NFC-F
which emulates NFC Forum Type 3 Tag on a smartphone.
Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com>
Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com>
Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
Thierry Strudel [Fri, 22 Jan 2016 00:31:21 +0000 (16:31 -0800)]
Don't assume kernel tick is 100Hz
Bug:
26729731
Change-Id: I094d5fd0e611349becb91d4460bc2e4af255d125
Lorenzo Colitti [Fri, 22 Jan 2016 00:14:27 +0000 (00:14 +0000)]
Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev am:
a6855a1faa
am:
d841d71593
* commit '
d841d71593c0c4a7c5beaf5196a22d9158c2d697':
Debug logging for when getActiveNetworkInfo returns BLOCKED.
Bryce Lee [Thu, 21 Jan 2016 23:55:53 +0000 (23:55 +0000)]
Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev am:
2e7ecddd5b -s ours am:
746ea1efe3 -s ours
am:
b2f0e7f6bc -s ours
* commit '
b2f0e7f6bc24914b90a2673b5e8527468de48071':
DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
Marie Janssen [Wed, 13 Jan 2016 00:05:15 +0000 (16:05 -0800)]
IBluetooth: remove dump(), support arguments
Because IBluetooth is a Binder service, we don't need dump() to
support dumpsys, just call the IBinder.dump().
Change-Id: Idcd48f758427b824e0b7eaafd091ba3fb2ff8993
Lorenzo Colitti [Thu, 21 Jan 2016 23:51:16 +0000 (23:51 +0000)]
Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev
am:
a6855a1faa
* commit '
a6855a1faa898da0f4a4fdc45485dc1f4182497b':
Debug logging for when getActiveNetworkInfo returns BLOCKED.
Lorenzo Colitti [Thu, 21 Jan 2016 23:31:50 +0000 (23:31 +0000)]
Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev
Bryce Lee [Thu, 21 Jan 2016 23:30:48 +0000 (23:30 +0000)]
Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev am:
2e7ecddd5b -s ours
am:
746ea1efe3 -s ours
* commit '
746ea1efe3e2acc13865f731f3b5a7cc88525c1d':
DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
Robert Greenwalt [Thu, 21 Jan 2016 23:20:02 +0000 (23:20 +0000)]
Merge "Add free short codes for Direct Carrier Billing and others."
am:
4d9ffdf952
* commit '
4d9ffdf95237c4ee59514c678fea6ff157e0eee3':
Add free short codes for Direct Carrier Billing and others.
Bryce Lee [Thu, 21 Jan 2016 23:19:06 +0000 (23:19 +0000)]
Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev
am:
2e7ecddd5b -s ours
* commit '
2e7ecddd5bb13721e5b3d55ee96b9dcf2e9148e6':
DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
Bryce Lee [Thu, 21 Jan 2016 23:01:06 +0000 (23:01 +0000)]
Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev
Bryce Lee [Thu, 21 Jan 2016 22:29:42 +0000 (14:29 -0800)]
DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
Change-Id: I3b1b3946ca21c0bbc902a2c521938239a486d98a
Robert Greenwalt [Thu, 21 Jan 2016 22:10:55 +0000 (22:10 +0000)]
Merge "Add free short codes for Direct Carrier Billing and others."
John Reck [Thu, 21 Jan 2016 22:08:44 +0000 (22:08 +0000)]
Merge "libhwui: fix texture memory leak"
am:
550d46d9da
* commit '
550d46d9dae8a4de5abd36a5e2d3c101135da696':
libhwui: fix texture memory leak
John Reck [Thu, 21 Jan 2016 21:48:24 +0000 (21:48 +0000)]
Merge "libhwui: fix texture memory leak"
Lorenzo Colitti [Thu, 21 Jan 2016 19:04:57 +0000 (04:04 +0900)]
Debug logging for when getActiveNetworkInfo returns BLOCKED.
Bug:
26488100
Change-Id: I991581732d35aed18392bed2f3d69ca8fb231f5e
Matthew Williams [Thu, 21 Jan 2016 19:25:51 +0000 (19:25 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e am:
c151cec56e am:
4831ef3872
am:
d877135d61
* commit '
d877135d616321b4b3013b302e8615a8f8b04ffa':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:20:31 +0000 (19:20 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e am:
c151cec56e
am:
4831ef3872
* commit '
4831ef3872f7f5c5d2ea0838f0958412e3833aeb':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:13:32 +0000 (19:13 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d am:
08d7e9608e
am:
c151cec56e
* commit '
c151cec56ec3666b5bb20e8cf7c3dca2500ea353':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:08:07 +0000 (19:08 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d
am:
08d7e9608e
* commit '
08d7e9608ea822815b15be15a66f26be664ce541':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:01:02 +0000 (19:01 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours
am:
5cb2597a9d
* commit '
5cb2597a9da3202229fdbc91c12b8e172b2b5667':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:54:44 +0000 (18:54 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2
am:
1f6dbd910b -s ours
* commit '
1f6dbd910bf9bf93df8a708209e92add61fbff44':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:48:55 +0000 (18:48 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4
am:
9e52b29fe2
* commit '
9e52b29fe27035df4720db582637157ce9ce268d':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:41:55 +0000 (18:41 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours
am:
a76208d4e4
* commit '
a76208d4e4f7f690f5fde4210a00a5c3022721bd':
DO NOT MERGE Redact Account info from getCurrentSyncs
OSDN Git Service
