OSDN Git Service
Jason Monk [Wed, 8 Mar 2017 14:39:21 +0000 (09:39 -0500)]
Fix random clicks in QS
The entire header was getting set as clickable because of old code
which would eat the clicks of the brightness slider (and other things)
when expanded.
Fixes:
35628944
Test: Trigger expandable update (like clear user_setup and set it)
then click on brightness in QS
Change-Id: I2d23aabf6b8a5b05f3b2b93ee723ec145514ce5e
Tobias Thierer [Wed, 8 Mar 2017 12:18:25 +0000 (12:18 +0000)]
Merge "Don't allow MapCollections to iterate past the end."
TreeHugger Robot [Wed, 8 Mar 2017 06:28:06 +0000 (06:28 +0000)]
Merge "Revert "Modify SurfaceView to use SurfaceFlinger child surfaces.""
TreeHugger Robot [Wed, 8 Mar 2017 06:03:02 +0000 (06:03 +0000)]
Merge "Removed deprecated setSavableids()."
TreeHugger Robot [Wed, 8 Mar 2017 05:30:45 +0000 (05:30 +0000)]
Merge "Throw at getPackageSizeInfoAsUser() callers."
Jeff Sharkey [Wed, 8 Mar 2017 04:03:18 +0000 (21:03 -0700)]
Throw at getPackageSizeInfoAsUser() callers.
But only when targeting O; if they're old apps then log and pass
a soft failure message to their callback.
Test: builds, boots
Bug:
35749102
Change-Id: Ifecf7108397444e88763f404a4b5f3fdc48443bb
TreeHugger Robot [Wed, 8 Mar 2017 03:52:29 +0000 (03:52 +0000)]
Merge "Add logging constant for hardware info dialog"
TreeHugger Robot [Wed, 8 Mar 2017 03:26:10 +0000 (03:26 +0000)]
Merge "Skip the MTP notification when the system has the default app."
TreeHugger Robot [Wed, 8 Mar 2017 03:12:53 +0000 (03:12 +0000)]
Merge "Sensor direct report HardwareBuffer implementation"
TreeHugger Robot [Wed, 8 Mar 2017 03:11:10 +0000 (03:11 +0000)]
Merge "Fix ApfTest"
Felipe Leme [Wed, 8 Mar 2017 03:07:21 +0000 (19:07 -0800)]
Removed deprecated setSavableids().
Bug:
35727295
Test: LoginActivityTest#testAutoFillOneDatasetAndSave passes
Change-Id: I33a33bf438fe258685025118a3dfa8a59bd456da
TreeHugger Robot [Wed, 8 Mar 2017 02:49:08 +0000 (02:49 +0000)]
Merge "AOD: Invert color spans for ambient display view"
Eugene Susla [Wed, 8 Mar 2017 02:16:08 +0000 (02:16 +0000)]
Merge "Record app<->device association to xml file"
Srinivas Visvanathan [Wed, 8 Mar 2017 02:14:17 +0000 (02:14 +0000)]
Merge "Adding handle extra in unread-message broadcast"
TreeHugger Robot [Wed, 8 Mar 2017 02:06:43 +0000 (02:06 +0000)]
Merge "Write Bitmap's color space in parcel"
Wonsik Kim [Wed, 8 Mar 2017 01:15:50 +0000 (17:15 -0800)]
Revert "Modify SurfaceView to use SurfaceFlinger child surfaces."
This reverts commit
cd4aeef88052571365d4e193a2c41e2e6d145491.
Bug:
36027342
Bug:
36015884
Change-Id: Ifd5b69caf64d65a8cd6570b7fe1fb6abe90e30b8
Hugo Benichi [Wed, 8 Mar 2017 01:10:28 +0000 (10:10 +0900)]
Fix ApfTest
By adding missing native libraries to frameworks-net make file. The list
of missing libraries was found by adding libhidlbase and then resolving
new linkage errors iteratively until ApfTest worked.
This is a temporary fix. Ideally only adding libhidlbase should be
enough.
Test: $ runtest -x frameworks/base/tests/net/java/android/net/apf/ApfTest.java
Bug:
36012053
Change-Id: I0eff8b3adbf788ddbfc6ddbf9f74b8da01cdfce4
TreeHugger Robot [Wed, 8 Mar 2017 01:30:59 +0000 (01:30 +0000)]
Merge "Parameter checks for sensor NDK APIs, fix map file"
Jakub Pawlowski [Tue, 10 Jan 2017 14:15:54 +0000 (06:15 -0800)]
Bluetooth 5 Advertising API
Test: manual
Bug:
30622771
Change-Id: Id6856e6110872ec50ff1af54ddc75c0104a6459c
Jakub Pawlowski [Thu, 2 Feb 2017 16:07:12 +0000 (08:07 -0800)]
Bluetooth 5 PHY selection API
Bug:
30622771
Test: manual
Change-Id: I50262a56a70466439f9700549c3c0e7bd49e2e8d
Jakub Pawlowski [Mon, 16 Jan 2017 15:21:01 +0000 (07:21 -0800)]
Bluetooth 5 periodc scan API (1/2)
Bug:
30622771
Test: manual
Change-Id: I61853bc71f6013e9406d1d151bb51ea4484bb92c
Jakub Pawlowski [Tue, 17 Jan 2017 15:50:46 +0000 (07:50 -0800)]
Bluetooth 5 enhanced scanning API
Bug:
30622771
Test: manual
Change-Id: I2c8065fbcedf48777ce18c7d8fe621e568b3fd75
Jakub Pawlowski [Wed, 8 Mar 2017 01:02:09 +0000 (01:02 +0000)]
Merge "Bluetooth 5 feature check API (1/2)"
Adrian Roos [Mon, 6 Mar 2017 19:54:05 +0000 (11:54 -0800)]
AOD: Invert color spans for ambient display view
Fixes a bug where notifications with color spans would not show
the text properly because we inverted the background. Now we invert
the color spans the app put on the text for the ambient view.
Fixes:
35705172
Bug:
30876804
Test: receive gmail notification, observe that subject is visible on ambient display
Change-Id: I602335562346759d62d2a69a55f3ac9d1be735a9
Hemant Gupta [Wed, 8 Mar 2017 00:48:54 +0000 (00:48 +0000)]
Merge "Bluetooth: Expose L2CAP API to support OPP 1.2" am:
79eb213a98 am:
12358b4057
am:
31428b1e6d
Change-Id: Ic2ff9eb34ebc8aada030f5e3e8d040c29f9b7186
TreeHugger Robot [Wed, 8 Mar 2017 00:46:09 +0000 (00:46 +0000)]
Merge "Don't call InstantAppRegistry with a null package"
Hemant Gupta [Wed, 8 Mar 2017 00:43:12 +0000 (00:43 +0000)]
Merge "Bluetooth: Expose L2CAP API to support OPP 1.2" am:
79eb213a98
am:
12358b4057
Change-Id: Iab52bbff82ee0189d2d8ba1458a3d844e399864c
TreeHugger Robot [Wed, 8 Mar 2017 00:42:57 +0000 (00:42 +0000)]
Merge "Reinstate codes to enable RRO on system server"
Hemant Gupta [Wed, 8 Mar 2017 00:38:14 +0000 (00:38 +0000)]
Merge "Bluetooth: Expose L2CAP API to support OPP 1.2"
am:
79eb213a98
Change-Id: I5f82a0c40c64fca0701abba44693b2892209acf3
Treehugger Robot [Wed, 8 Mar 2017 00:28:30 +0000 (00:28 +0000)]
Merge "Bluetooth: Expose L2CAP API to support OPP 1.2"
TreeHugger Robot [Wed, 8 Mar 2017 00:02:40 +0000 (00:02 +0000)]
Merge "AdaptiveIconDrawable should handle all usage cases of setBounds Test: runtest --path=frameworks/base/core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java"
Jakub Pawlowski [Wed, 8 Feb 2017 02:05:39 +0000 (18:05 -0800)]
Bluetooth 5 feature check API (1/2)
Bug:
30622771
Test: manual
Change-Id: I90e2efe989745c07c2f2fb8f4ea5bc3b718382f6
Peng Xu [Sun, 5 Mar 2017 00:15:45 +0000 (16:15 -0800)]
Sensor direct report HardwareBuffer implementation
Implemented API for sensor direct channel creating with HardwareBuffer
shared memory. Also, simplified jni code for ashmem shared memory direct
channel.
Bug:
30985702
Test: cts-tradefed run cts --module CtsSensorTestCases
--test android.hardware.cts.SensorDirectReportTest
Test: cts-tradefed run cts --module CtsSensorTestCases
--test android.hardware.cts.SensorNativeTest
Change-Id: I067fe21808cf370e4a659fc762131ed3007334a8
Peng Xu [Wed, 1 Mar 2017 01:00:16 +0000 (17:00 -0800)]
Parameter checks for sensor NDK APIs, fix map file
* Add parameter check for all sensor NDK APIs.
* Added a previously added API (from AOSP contribution) to
libandroid.map.txt file.
Test: SensorNativeTest pass
Change-Id: I6482a684767034f2a31d806a4cba0d6648dcabff
Romain Guy [Tue, 7 Mar 2017 23:29:27 +0000 (15:29 -0800)]
Write Bitmap's color space in parcel
This change also resets the cached color space field in Bitmap.java
when reconfigure() is called or when a bitmap is reused by the
bitmap factory.
Bug:
32072280
Test: CtsGraphicsTestCases.BitmapColorSpaceTest
Change-Id: I232b729b7a29e65bfff21dc749570c3c80adf855
Dianne Hackborn [Tue, 7 Mar 2017 23:30:27 +0000 (23:30 +0000)]
Merge "Fix issue #
35813125: API Review: android.os > Bundle"
Dianne Hackborn [Tue, 7 Mar 2017 23:30:00 +0000 (23:30 +0000)]
Merge "Fix issue #
35813031: API Review: RemoteCallbackList"
TreeHugger Robot [Tue, 7 Mar 2017 23:20:48 +0000 (23:20 +0000)]
Merge "Expose Instant App API defined in MR1"
TreeHugger Robot [Tue, 7 Mar 2017 23:02:21 +0000 (23:02 +0000)]
Merge "Allow disk writes on main thread in SharedPrefs"
TreeHugger Robot [Tue, 7 Mar 2017 23:01:46 +0000 (23:01 +0000)]
Merge "Keep Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED updated."
Daniel Nishi [Tue, 7 Mar 2017 22:55:16 +0000 (22:55 +0000)]
Merge "Use the fast track for the AppCollector."
TreeHugger Robot [Tue, 7 Mar 2017 22:47:17 +0000 (22:47 +0000)]
Merge "Revert "Start locking down /data/media access.""
Fyodor Kupolov [Tue, 7 Mar 2017 22:42:25 +0000 (22:42 +0000)]
Merge "Throw exception if slot has invalid offset"
Amith Yamasani [Tue, 7 Mar 2017 22:40:45 +0000 (22:40 +0000)]
Merge "Collect background network data stats in BatteryStats"
Fan Zhang [Tue, 7 Mar 2017 22:32:38 +0000 (14:32 -0800)]
Add logging constant for hardware info dialog
Bug:
35851000
Test: builds
Change-Id: I3083c2cbd43ee04cb01c418962408cf00646d4b5
TreeHugger Robot [Tue, 7 Mar 2017 22:19:47 +0000 (22:19 +0000)]
Merge changes from topic 'b/
34853980'
* changes:
Camera: Add createCustomCameraSession to system API.
CameraDevice: Add hidden createCustomCaptureSession
Hall Liu [Tue, 7 Mar 2017 22:05:00 +0000 (22:05 +0000)]
Merge "Add further Connection-side APIs for RTT (part 2)" am:
6bb5110f2c am:
033972b5b2
am:
3a2c5f3f06
Change-Id: Ib400c621c0fa9f241af711bedd7d36f0fc95f7c4
Hall Liu [Tue, 7 Mar 2017 21:57:15 +0000 (21:57 +0000)]
Merge "Add further Connection-side APIs for RTT (part 2)" am:
6bb5110f2c
am:
033972b5b2
Change-Id: If2e4cd4eb08e15750886454102adf0b807852509
Hall Liu [Tue, 7 Mar 2017 21:52:52 +0000 (21:52 +0000)]
Merge "Add further Connection-side APIs for RTT (part 2)"
am:
6bb5110f2c
Change-Id: Idfe092393301fb47e6a635eb150103cb928a2696
Hall Liu [Tue, 7 Mar 2017 21:44:42 +0000 (21:44 +0000)]
Merge "Add further Connection-side APIs for RTT (part 2)"
Calin Juravle [Tue, 7 Mar 2017 21:35:15 +0000 (21:35 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use" am:
eef66fd0c7 am:
b1818b8a36
am:
d89f0f7c44 -s ours
Change-Id: I1a31c374c1ed665b0bdae6c4169e50fa40f70906
TreeHugger Robot [Tue, 7 Mar 2017 21:31:01 +0000 (21:31 +0000)]
Merge "fallout of splitting libsensor out of libgui"
Calin Juravle [Tue, 7 Mar 2017 21:27:14 +0000 (21:27 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use" am:
eef66fd0c7
am:
b1818b8a36
Change-Id: I41008c4e95cef971702120be285c2a8821168591
Julia Reynolds [Fri, 3 Mar 2017 13:59:53 +0000 (08:59 -0500)]
Allow channels to be renamed.
Because string resource ids aren't stable.
Test: runtest systemui-notification
Change-Id: Iaaa07b8c8cc1c8c321c7fedbfe1e252b4c1153dd
Calin Juravle [Tue, 7 Mar 2017 21:23:03 +0000 (21:23 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use"
am:
eef66fd0c7
Change-Id: I443f001c15daddd63a17685c2e82fc9a619c45ee
Jeff Sharkey [Tue, 7 Mar 2017 21:20:03 +0000 (14:20 -0700)]
Revert "Start locking down /data/media access."
Caused b/
35926593 because ExternalStorageProvider needs raw
access to underlying devices that aren't mounted visibly, like
USB mass storage devices.
This reverts commit
53d64fc839ad79be28d783f0f14082310a647dd9.
TreeHugger Robot [Tue, 7 Mar 2017 21:18:14 +0000 (21:18 +0000)]
Merge "Throw SecurityException in sendVisualVoicemailSms()"
Calin Juravle [Tue, 7 Mar 2017 21:13:14 +0000 (21:13 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use"
Doris Liu [Tue, 7 Mar 2017 21:01:43 +0000 (21:01 +0000)]
Merge "Ensure behavior consistency for 0 duration scale"
Adrian Roos [Tue, 7 Mar 2017 20:53:21 +0000 (20:53 +0000)]
Merge "Revert "AOD: Refactor always on configuration""
TreeHugger Robot [Tue, 7 Mar 2017 20:42:26 +0000 (20:42 +0000)]
Merge "AAPT2: Add --package-id flag for feature-split suppport"
Stephen Chen [Tue, 7 Mar 2017 20:41:14 +0000 (20:41 +0000)]
Merge "Create a Tron event for opening the network scorer settings page."
Adrian Roos [Tue, 7 Mar 2017 20:20:35 +0000 (20:20 +0000)]
Revert "AOD: Refactor always on configuration"
This reverts commit
28d26a821f5fa078af756ceb3e94090a10f73175.
Bug:
36027947
Change-Id: I3d4c2e58b753120ff668a4594f60692abc6a3426
TreeHugger Robot [Tue, 7 Mar 2017 20:21:23 +0000 (20:21 +0000)]
Merge "Retry SECURITY_LOGS_AVAILABLE if DO doesn't request the logs"
Hyunyoung Song [Fri, 3 Mar 2017 22:28:51 +0000 (14:28 -0800)]
AdaptiveIconDrawable should handle all usage cases of setBounds
Test: runtest --path=frameworks/base/core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java
b/
35950873
b/
35673169
b/
34902453
adb shell am instrument -e class 'android.graphics.drawable.AdaptiveIconDrawableTest' -w 'com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner'
android.graphics.drawable.AdaptiveIconDrawableTest:..
Time: 1.241
OK (2 tests)
Change-Id: I6498f6acc782a30188fc2afc50781cef83e4747b
Todd Kennedy [Mon, 6 Mar 2017 18:09:30 +0000 (10:09 -0800)]
Don't call InstantAppRegistry with a null package
Change-Id: I40e3a6529cf6b77857ea67c9a83029cc57696227
Fixes:
35970992
Test: Manual
Todd Kennedy [Mon, 6 Mar 2017 18:58:27 +0000 (10:58 -0800)]
Expose Instant App API defined in MR1
These were created in MR1 but couldn't be submitted because
they were defined too late [after API freeze].
Change-Id: Ie6884236776bd26e9d0b557fd125b8c77b0ad93b
Fixes:
34890162
Fixes:
35193180
Fixes:
35193418
Test: manual
Calin Juravle [Sat, 4 Mar 2017 01:04:55 +0000 (17:04 -0800)]
PackageManager: Clean up code related to foreign dex use
We simplified the way we track whether or not a dex file is used by
other apps. DexManager in the framework keeps track of the data and we
no longer need file markers on disk.
Test: device boots, foreign dex markers are not created anymore
Bug:
32871170
(cherry picked from commit
74f0a3450cd598f52b2c68c43531b1a27fb4e1ce)
Change-Id: I2a9daca15e5120518852584fa17aa94012af8f1a
Merged-In: I3660e2f3913a73904181449c2d910af0a0477950
TreeHugger Robot [Tue, 7 Mar 2017 19:14:50 +0000 (19:14 +0000)]
Merge "Enable escrow tokens on automotive builds."
Filip Pavlis [Tue, 7 Mar 2017 19:09:46 +0000 (19:09 +0000)]
Merge "Fix home/back buttons flow in PreferenceActivity."
Adam Lesinski [Sat, 4 Mar 2017 00:33:26 +0000 (16:33 -0800)]
AAPT2: Add --package-id flag for feature-split suppport
Bug:
35928935
Change-Id: Ia8496505e61cfcfdb8f9f62366d2f36e453db111
Test: make aapt2_tests
Filip Pavlis [Wed, 1 Mar 2017 13:48:33 +0000 (13:48 +0000)]
Fix home/back buttons flow in PreferenceActivity.
Bug: b/
35977048
Test: Done manually. Automated test will be added later.
After recent changes in PreferenceActivity finishing the activity on
pressing back is not correct anymore. Instead onBackButton method should
be called to deal with it (we have fragments transactions for instance).
There can be multiple buttons:
1. The native default one - calls onBackPressed by default so no extra work
needed.
2. PreferenceActivity has buttons that can de displayed when settting
EXTRA_PREFS_SHOW_BUTTON_BAR to true. But it is a private API and I
didn't find any usage of it, so there is no need to change that. Also
it looks like something very specific used in WiFi wizards.
3. Apps often use a toolbar that has a home button which essentialy
emulates back button. The issue is that this Activity never had support
for this. So apps had to override onOptionsItemSelected and some of
those are unfortunately calling finish() which worked previously when
PreferenceActivity wasn't using fragments in single pane. This CL adds
support so app will no longer need to override that method and some
apps need to be instructed to use that override in O.
Change-Id: I94f557edb2e03f89fbf02e800beb390b2ad0544f
Doris Liu [Tue, 7 Mar 2017 00:44:38 +0000 (16:44 -0800)]
Ensure behavior consistency for 0 duration scale
BUG:
35590176
Test: cts in the same topic branch
Change-Id: Ia0a2518a1376d3f82ee6c5a7b27e3cb24ed54cbf
Calin Juravle [Tue, 7 Mar 2017 18:48:13 +0000 (18:48 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use"
Pavel Grafov [Tue, 7 Mar 2017 12:48:00 +0000 (12:48 +0000)]
Retry SECURITY_LOGS_AVAILABLE if DO doesn't request the logs
Test: manually, with TestDPC.
Bug:
34186771
Change-Id: I99ec406b05f7b072c2c729f6336d1a5cf0f7c3d4
Stephen Chen [Mon, 6 Mar 2017 20:20:48 +0000 (12:20 -0800)]
Create a Tron event for opening the network scorer settings page.
Bug:
35854268
Test: n/a
Change-Id: I0a021dcc9016f163f75b8077678f54df1c4f2bf6
TreeHugger Robot [Tue, 7 Mar 2017 18:37:09 +0000 (18:37 +0000)]
Merge "Add ColorSpace information on Bitmap"
Alan Viverette [Tue, 7 Mar 2017 18:29:25 +0000 (18:29 +0000)]
Merge "Add "since" annotations for Support Lib in framework docs build"
Chris Wren [Tue, 7 Mar 2017 18:28:22 +0000 (18:28 +0000)]
Merge "delete obsolete tests"
Scott Main [Tue, 7 Mar 2017 18:25:35 +0000 (18:25 +0000)]
Merge "Mark @ symbols in code snippet as literal so javadoc doesn't choke on them. Which for some reason only starts to happen when we start processing the annotation methods in this CL: https://googleplex-android-review.git.corp.google.com/#/c/
1892771/"
Chris Wren [Tue, 7 Mar 2017 18:22:40 +0000 (13:22 -0500)]
delete obsolete tests
this code was removed in I94732c84564e4cb25d77b63be8beb4aab4c38985
Test: tests are deleted
Change-Id: I1dd466ec8c91de3e39d8019882a92f03aba4f357
Srinivas Visvanathan [Tue, 7 Mar 2017 18:22:53 +0000 (10:22 -0800)]
Adding handle extra in unread-message broadcast
- Handle will be useful for messaging apps.
Bug:
33280056
Test: Manually
Change-Id: Id4b1bf2d90d9eaea1504cc270a922a1d6f1c468b
TreeHugger Robot [Tue, 7 Mar 2017 18:17:12 +0000 (18:17 +0000)]
Merge "Support non-system Font Providers"
Jeremy Joslin [Mon, 6 Mar 2017 18:39:35 +0000 (10:39 -0800)]
Keep Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED updated.
Make sure Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED reflects
the current active scorer state. When valid the setting will have a
value of 1, when invalid it will be 0 (or more
accurately not 1, see below).
Introduced a new valid setting value, -1, which indicates the feature
has been forced off.
Test: runtest frameworks-services -c com.android.server.NetworkScorerAppManagerTest
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
35896421
Change-Id: I271725f798e5d0acc7c08c79678dba5115f8faad
Eino-Ville Talvala [Wed, 1 Mar 2017 01:57:28 +0000 (17:57 -0800)]
Camera: Add createCustomCameraSession to system API.
This has been requested by various Android implementers as
a way to simplify building new device-specific features for
default camera applications.
Test: The added system API tests pass.
Bug:
34853980
Change-Id: I3190f59394af97c0b0c8e520696d096235d596b9
Eino-Ville Talvala [Wed, 1 Mar 2017 01:49:41 +0000 (17:49 -0800)]
CameraDevice: Add hidden createCustomCaptureSession
This exposes a direct route to selecting the operating mode, instead
of only allowing normal and high-speed modes.
Test: Compiles
Bug:
34853980
Change-Id: Ib4f833399834c9bacb9de666560e909109aa5af9
Chris Wren [Tue, 7 Mar 2017 17:54:49 +0000 (17:54 +0000)]
Merge "add clear methods to LogMaker"
Chris Craik [Tue, 7 Mar 2017 17:53:19 +0000 (17:53 +0000)]
Merge "Workaround arc textures drawing outside of bounds"
Chris Wren [Tue, 7 Mar 2017 17:50:11 +0000 (17:50 +0000)]
Merge "remove the last of the legacy log helpers"
TreeHugger Robot [Tue, 7 Mar 2017 17:44:04 +0000 (17:44 +0000)]
Merge "Fixing issue with wrong stack being brought forward."
TreeHugger Robot [Tue, 7 Mar 2017 17:41:45 +0000 (17:41 +0000)]
Merge "Log notification channels and groups."
Jerome Gaillard [Tue, 7 Mar 2017 17:11:11 +0000 (17:11 +0000)]
Merge "Update layoutlib following Change Ia12d448a"
Andreas Gampe [Tue, 7 Mar 2017 17:08:43 +0000 (17:08 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns" am:
d0f092af84 am:
838851364b
am:
5fe3eb7696
Change-Id: Ia0bf25c740eedee436436e573241a59685db2fbd
Andreas Gampe [Tue, 7 Mar 2017 17:03:51 +0000 (17:03 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns" am:
d0f092af84
am:
838851364b
Change-Id: I0b19a98ca157d87c41a3a305b9ae59bb65a9cffe
Etan Cohen [Tue, 7 Mar 2017 17:02:05 +0000 (17:02 +0000)]
Merge "[CM] Allow timeout in request network" am:
8328f27a87 am:
645b48c8af
am:
ac879cbcaf
Change-Id: If42250966d619073d45d608aab454589213b1756
Andreas Gampe [Tue, 7 Mar 2017 16:59:12 +0000 (16:59 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns"
am:
d0f092af84
Change-Id: I69886924b3aca6c050239069c00e166142e2e522
Tobias Thierer [Tue, 7 Mar 2017 16:55:59 +0000 (16:55 +0000)]
Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" am:
aa4877e295 am:
b96d428e40
am:
6779441da0
Change-Id: Ib6b611e88dc342d5ce28e5594db142d54b840c20
Etan Cohen [Tue, 7 Mar 2017 16:55:59 +0000 (16:55 +0000)]
Merge "[CM] Allow timeout in request network" am:
8328f27a87
am:
645b48c8af
Change-Id: Ie3438ba967887ab7776eefaf05a6cf915e866f82
Treehugger Robot [Tue, 7 Mar 2017 16:50:58 +0000 (16:50 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns"
Etan Cohen [Tue, 7 Mar 2017 16:49:53 +0000 (16:49 +0000)]
Merge "[CM] Allow timeout in request network"
am:
8328f27a87
Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0